diff --git a/apps/emqx_opentelemetry/rebar.config b/apps/emqx_opentelemetry/rebar.config index 7086a2f29..383ce1ba0 100644 --- a/apps/emqx_opentelemetry/rebar.config +++ b/apps/emqx_opentelemetry/rebar.config @@ -1,8 +1,16 @@ %% -*- mode: erlang -*- -{deps, [ - {emqx, {path, "../emqx"}} -]}. +{deps, + [{emqx, {path, "../emqx"}} + %% trace + , {opentelemetry_api, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.3-emqx"}, "apps/opentelemetry_api"}} + , {opentelemetry, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.3-emqx"}, "apps/opentelemetry"}} + %% log metrics + , {opentelemetry_experimental, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.3-emqx"}, "apps/opentelemetry_experimental"}} + , {opentelemetry_api_experimental, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.3-emqx"}, "apps/opentelemetry_api_experimental"}} + %% export + , {opentelemetry_exporter, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.3-emqx"}, "apps/opentelemetry_exporter"}} + ]}. {edoc_opts, [{preprocess, true}]}. {erl_opts, [ diff --git a/apps/emqx_opentelemetry/src/emqx_opentelemetry.app.src b/apps/emqx_opentelemetry/src/emqx_opentelemetry.app.src index 134ef2a44..13c4f73fa 100644 --- a/apps/emqx_opentelemetry/src/emqx_opentelemetry.app.src +++ b/apps/emqx_opentelemetry/src/emqx_opentelemetry.app.src @@ -10,6 +10,13 @@ %% otel metrics depend on emqx_mgmt_cache emqx_management ]}, + {included_applications, [ + opentelemetry, + opentelemetry_api, + opentelemetry_api_experimental, + opentelemetry_experimental, + opentelemetry_exporter + ]}, {env, []}, {modules, []}, {licenses, ["Apache 2.0"]}, diff --git a/mix.exs b/mix.exs index 159b105a5..dc512399c 100644 --- a/mix.exs +++ b/mix.exs @@ -98,37 +98,7 @@ defmodule EMQXUmbrella.MixProject do # set by hackney (dependency) {:ssl_verify_fun, "1.1.7", override: true}, {:uuid, github: "okeuday/uuid", tag: "v2.0.6", override: true}, - {:quickrand, github: "okeuday/quickrand", tag: "v2.0.6", override: true}, - {:opentelemetry_api, - github: "emqx/opentelemetry-erlang", - sparse: "apps/opentelemetry_api", - tag: "v1.4.2-emqx", - override: true, - runtime: false}, - {:opentelemetry, - github: "emqx/opentelemetry-erlang", - sparse: "apps/opentelemetry", - tag: "v1.4.2-emqx", - override: true, - runtime: false}, - {:opentelemetry_api_experimental, - github: "emqx/opentelemetry-erlang", - sparse: "apps/opentelemetry_api_experimental", - tag: "v1.4.2-emqx", - override: true, - runtime: false}, - {:opentelemetry_experimental, - github: "emqx/opentelemetry-erlang", - sparse: "apps/opentelemetry_experimental", - tag: "v1.4.2-emqx", - override: true, - runtime: false}, - {:opentelemetry_exporter, - github: "emqx/opentelemetry-erlang", - sparse: "apps/opentelemetry_exporter", - tag: "v1.4.2-emqx", - override: true, - runtime: false} + {:quickrand, github: "okeuday/quickrand", tag: "v2.0.6", override: true} ] ++ emqx_apps(profile_info, version) ++ enterprise_deps(profile_info) ++ bcrypt_dep() ++ jq_dep() ++ quicer_dep() diff --git a/rebar.config b/rebar.config index eec2d505a..2207f426d 100644 --- a/rebar.config +++ b/rebar.config @@ -84,14 +84,6 @@ %% in conflict by erlavro and rocketmq , {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, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.2-emqx"}, "apps/opentelemetry_api"}} - , {opentelemetry, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.2-emqx"}, "apps/opentelemetry"}} - %% log metrics - , {opentelemetry_experimental, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.2-emqx"}, "apps/opentelemetry_experimental"}} - , {opentelemetry_api_experimental, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.2-emqx"}, "apps/opentelemetry_api_experimental"}} - %% export - , {opentelemetry_exporter, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.2-emqx"}, "apps/opentelemetry_exporter"}} , {ssl_verify_fun, "1.1.7"} ]}.