From ce571d892ec3dc572be14f083c55f07eba820e10 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Fri, 1 Sep 2023 17:50:32 +0800
Subject: [PATCH 1/2] 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,

From 0c3db3b9b1e306218d9a9b140c84aa156da3f012 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Mon, 4 Sep 2023 09:34:02 +0800
Subject: [PATCH 2/2] chore: ping opentelemetry in mix.exs

---
 mix.exs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mix.exs b/mix.exs
index 3aee37a3d..57322abdf 100644
--- a/mix.exs
+++ b/mix.exs
@@ -102,26 +102,31 @@ defmodule EMQXUmbrella.MixProject do
       {:opentelemetry_api,
        github: "emqx/opentelemetry-erlang",
        sparse: "apps/opentelemetry_api",
+       tag: "v1.3.0-emqx",
        override: true,
        runtime: false},
       {:opentelemetry,
        github: "emqx/opentelemetry-erlang",
        sparse: "apps/opentelemetry",
+       tag: "v1.3.0-emqx",
        override: true,
        runtime: false},
       {:opentelemetry_api_experimental,
        github: "emqx/opentelemetry-erlang",
        sparse: "apps/opentelemetry_api_experimental",
+       tag: "v1.3.0-emqx",
        override: true,
        runtime: false},
       {:opentelemetry_experimental,
        github: "emqx/opentelemetry-erlang",
        sparse: "apps/opentelemetry_experimental",
+       tag: "v1.3.0-emqx",
        override: true,
        runtime: false},
       {:opentelemetry_exporter,
        github: "emqx/opentelemetry-erlang",
        sparse: "apps/opentelemetry_exporter",
+       tag: "v1.3.0-emqx",
        override: true,
        runtime: false}
     ] ++