yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11929 from SergeTupchiy/fix-opentelemetry-metrics-timestamps 

Fix opentelemetry metrics timestamps
This commit is contained in:
SergeTupchiy 2023-11-10 22:30:25 +02:00 committed by GitHub
parent cb7df8676c 6f3de7ae37
commit fe783788e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mix.exs
View File

@ -102,31 +102,31 @@ defmodule EMQXUmbrella.MixProject do
{:opentelemetry_api, {:opentelemetry_api,
github: "emqx/opentelemetry-erlang", github: "emqx/opentelemetry-erlang",
sparse: "apps/opentelemetry_api", sparse: "apps/opentelemetry_api",
tag: "v1.3.1-emqx", tag: "v1.3.2-emqx",
override: true, override: true,
runtime: false}, runtime: false},
{:opentelemetry, {:opentelemetry,
github: "emqx/opentelemetry-erlang", github: "emqx/opentelemetry-erlang",
sparse: "apps/opentelemetry", sparse: "apps/opentelemetry",
tag: "v1.3.1-emqx", tag: "v1.3.2-emqx",
override: true, override: true,
runtime: false}, runtime: false},
{:opentelemetry_api_experimental, {:opentelemetry_api_experimental,
github: "emqx/opentelemetry-erlang", github: "emqx/opentelemetry-erlang",
sparse: "apps/opentelemetry_api_experimental", sparse: "apps/opentelemetry_api_experimental",
tag: "v1.3.1-emqx", tag: "v1.3.2-emqx",
override: true, override: true,
runtime: false}, runtime: false},
{:opentelemetry_experimental, {:opentelemetry_experimental,
github: "emqx/opentelemetry-erlang", github: "emqx/opentelemetry-erlang",
sparse: "apps/opentelemetry_experimental", sparse: "apps/opentelemetry_experimental",
tag: "v1.3.1-emqx", tag: "v1.3.2-emqx",
override: true, override: true,
runtime: false}, runtime: false},
{:opentelemetry_exporter, {:opentelemetry_exporter,
github: "emqx/opentelemetry-erlang", github: "emqx/opentelemetry-erlang",
sparse: "apps/opentelemetry_exporter", sparse: "apps/opentelemetry_exporter",
tag: "v1.3.1-emqx", tag: "v1.3.2-emqx",
override: true, override: true,
runtime: false} runtime: false}
] ++ ] ++

10
rebar.config
View File

@ -85,13 +85,13 @@
, {jsone, {git, "https://github.com/emqx/jsone.git", {tag, "1.7.1"}}} , {jsone, {git, "https://github.com/emqx/jsone.git", {tag, "1.7.1"}}}
, {uuid, {git, "https://github.com/okeuday/uuid.git", {tag, "v2.0.6"}}} , {uuid, {git, "https://github.com/okeuday/uuid.git", {tag, "v2.0.6"}}}
%% trace %% trace
, {opentelemetry_api, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.1-emqx"}, "apps/opentelemetry_api"}} , {opentelemetry_api, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.2-emqx"}, "apps/opentelemetry_api"}}
, {opentelemetry, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.1-emqx"}, "apps/opentelemetry"}} , {opentelemetry, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.2-emqx"}, "apps/opentelemetry"}}
%% log metrics %% log metrics
, {opentelemetry_experimental, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.1-emqx"}, "apps/opentelemetry_experimental"}} , {opentelemetry_experimental, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.2-emqx"}, "apps/opentelemetry_experimental"}}
, {opentelemetry_api_experimental, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.1-emqx"}, "apps/opentelemetry_api_experimental"}} , {opentelemetry_api_experimental, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.2-emqx"}, "apps/opentelemetry_api_experimental"}}
%% export %% export
, {opentelemetry_exporter, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.1-emqx"}, "apps/opentelemetry_exporter"}} , {opentelemetry_exporter, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.2-emqx"}, "apps/opentelemetry_exporter"}}
]}. ]}.
{xref_ignores, {xref_ignores,