From ce571d892ec3dc572be14f083c55f07eba820e10 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Fri, 1 Sep 2023 17:50:32 +0800 Subject: [PATCH] chore: ping opentelemetry v1.3.0-emqx --- apps/emqx_opentelemetry/src/emqx_otel.erl | 2 ++ rebar.config | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/emqx_opentelemetry/src/emqx_otel.erl b/apps/emqx_opentelemetry/src/emqx_otel.erl index 141c8ff04..aa0c7d2d4 100644 --- a/apps/emqx_opentelemetry/src/emqx_otel.erl +++ b/apps/emqx_opentelemetry/src/emqx_otel.erl @@ -73,6 +73,7 @@ setup(_Conf) -> ensure_apps(Conf) -> #{exporter := #{interval := ExporterInterval}} = Conf, {ok, _} = application:ensure_all_started(opentelemetry_exporter), + {ok, _} = application:ensure_all_started(opentelemetry), _ = application:stop(opentelemetry_experimental), ok = application:set_env( opentelemetry_experimental, @@ -92,6 +93,7 @@ ensure_apps(Conf) -> ok. cleanup() -> + _ = application:stop(opentelemetry), _ = application:stop(opentelemetry_experimental), _ = application:stop(opentelemetry_experimental_api), _ = application:stop(opentelemetry_exporter), diff --git a/rebar.config b/rebar.config index 2d605c18f..a9d888261 100644 --- a/rebar.config +++ b/rebar.config @@ -85,13 +85,13 @@ , {jsone, {git, "https://github.com/emqx/jsone.git", {tag, "1.7.1"}}} , {uuid, {git, "https://github.com/okeuday/uuid.git", {tag, "v2.0.6"}}} %% trace - , {opentelemetry_api, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {branch, "main"}, "apps/opentelemetry_api"}} - , {opentelemetry, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {branch, "main"}, "apps/opentelemetry"}} + , {opentelemetry_api, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_api"}} + , {opentelemetry, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry"}} %% log metrics - , {opentelemetry_experimental, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {branch, "main"}, "apps/opentelemetry_experimental"}} - , {opentelemetry_api_experimental, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {branch, "main"}, "apps/opentelemetry_api_experimental"}} + , {opentelemetry_experimental, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_experimental"}} + , {opentelemetry_api_experimental, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_api_experimental"}} %% export - , {opentelemetry_exporter, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {branch, "main"}, "apps/opentelemetry_exporter"}} + , {opentelemetry_exporter, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_exporter"}} ]}. {xref_ignores,