Просмотр исходного кода

chore: ping opentelemetry v1.3.0-emqx

zhongwencool 2 лет назад
Родитель
Сommit
ce571d892e
2 измененных файлов с 7 добавлено и 5 удалено
  1. 2 0
      apps/emqx_opentelemetry/src/emqx_otel.erl
  2. 5 5
      rebar.config

+ 2 - 0
apps/emqx_opentelemetry/src/emqx_otel.erl

@@ -73,6 +73,7 @@ setup(_Conf) ->
 ensure_apps(Conf) ->
 ensure_apps(Conf) ->
     #{exporter := #{interval := ExporterInterval}} = Conf,
     #{exporter := #{interval := ExporterInterval}} = Conf,
     {ok, _} = application:ensure_all_started(opentelemetry_exporter),
     {ok, _} = application:ensure_all_started(opentelemetry_exporter),
+    {ok, _} = application:ensure_all_started(opentelemetry),
     _ = application:stop(opentelemetry_experimental),
     _ = application:stop(opentelemetry_experimental),
     ok = application:set_env(
     ok = application:set_env(
         opentelemetry_experimental,
         opentelemetry_experimental,
@@ -92,6 +93,7 @@ ensure_apps(Conf) ->
     ok.
     ok.
 
 
 cleanup() ->
 cleanup() ->
+    _ = application:stop(opentelemetry),
     _ = application:stop(opentelemetry_experimental),
     _ = application:stop(opentelemetry_experimental),
     _ = application:stop(opentelemetry_experimental_api),
     _ = application:stop(opentelemetry_experimental_api),
     _ = application:stop(opentelemetry_exporter),
     _ = application:stop(opentelemetry_exporter),

+ 5 - 5
rebar.config

@@ -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, "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
       %% 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
       %% 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,
 {xref_ignores,