Merge pull request #11556 from zhongwencool/pin-opentelemetry-vsn

chore: ping opentelemetry v1.3.0-emqx
This commit is contained in:
Ivan Dyachkov 2023-09-04 13:21:40 +02:00 committed by GitHub
commit 6e4215037c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions

View File

@ -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),

View File

@ -102,26 +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.0-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.0-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.0-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.0-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.0-emqx",
override: true, override: true,
runtime: false} runtime: false}
] ++ ] ++

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, "http://github.com/emqx/opentelemetry-erlang", {branch, "main"}, "apps/opentelemetry_api"}} , {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", {branch, "main"}, "apps/opentelemetry"}} , {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_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", {branch, "main"}, "apps/opentelemetry_api_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,