From 3c499d0bc471a15837a6877c09b83de3938c35e2 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Fri, 22 Nov 2024 09:05:43 -0700 Subject: [PATCH 1/3] bump experimental api and sdk versions (0.5.2 and 0.6.0) --- CHANGELOG.md | 24 +++++++++++++++++++ apps/opentelemetry_api_experimental/mix.lock | 2 +- .../rebar.config | 2 +- .../opentelemetry_api_experimental.app.src | 2 +- apps/opentelemetry_experimental/rebar.config | 6 ++--- .../src/opentelemetry_experimental.app.src | 2 +- docs.sh | 4 ++-- 7 files changed, 33 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d6f0b22..ff619eac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## Experimental API 0.5.2 - 2024-11-22 + +### Added + +- [Hard code semconv values](https://github.com/open-telemetry/opentelemetry-erlang/pull/780) + +## Experimental SDK 0.6.0 - 2024-11-22 + +### Added + +- [move metrics and logs to separate exporter modules from + traces](https://github.com/open-telemetry/opentelemetry-erlang/pull/720) +- [make the console metric exporter handle all + values](https://github.com/open-telemetry/opentelemetry-erlang/pull/709) + +### Fixes + +- [metric exporter: nothing to do for an empty list of + metrics](https://github.com/open-telemetry/opentelemetry-erlang/pull/782) +- [Hard code semconv + values](https://github.com/open-telemetry/opentelemetry-erlang/pull/780) +- [removed old unused otel_metric_exporter + module](https://github.com/open-telemetry/opentelemetry-erlang/pull/715) + ## Exporter 1.8.0 - 2024-10-05 ### Fixes diff --git a/apps/opentelemetry_api_experimental/mix.lock b/apps/opentelemetry_api_experimental/mix.lock index 6bd1c083..66eabae0 100644 --- a/apps/opentelemetry_api_experimental/mix.lock +++ b/apps/opentelemetry_api_experimental/mix.lock @@ -11,6 +11,6 @@ "makeup_elixir": {:hex, :makeup_elixir, "1.0.0", "74bb8348c9b3a51d5c589bf5aebb0466a84b33274150e3b6ece1da45584afc82", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "49159b7d7d999e836bedaf09dcf35ca18b312230cf901b725a64f3f42e407983"}, "makeup_erlang": {:hex, :makeup_erlang, "1.0.1", "c7f58c120b2b5aa5fd80d540a89fdf866ed42f1f3994e4fe189abebeab610839", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "8a89a1eeccc2d798d6ea15496a6e4870b75e014d1af514b1b71fa33134f57814"}, "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"}, - "opentelemetry_api": {:hex, :opentelemetry_api, "1.3.0", "03e2177f28dd8d11aaa88e8522c81c2f6a788170fe52f7a65262340961e663f9", [:mix, :rebar3], [{:opentelemetry_semantic_conventions, "~> 0.2", [hex: :opentelemetry_semantic_conventions, repo: "hexpm", optional: false]}], "hexpm", "b9e5ff775fd064fa098dba3c398490b77649a352b40b0b730a6b7dc0bdd68858"}, + "opentelemetry_api": {:hex, :opentelemetry_api, "1.4.0", "63ca1742f92f00059298f478048dfb826f4b20d49534493d6919a0db39b6db04", [:mix, :rebar3], [], "hexpm", "3dfbbfaa2c2ed3121c5c483162836c4f9027def469c41578af5ef32589fcfc58"}, "opentelemetry_semantic_conventions": {:hex, :opentelemetry_semantic_conventions, "0.2.0", "b67fe459c2938fcab341cb0951c44860c62347c005ace1b50f8402576f241435", [:mix, :rebar3], [], "hexpm", "d61fa1f5639ee8668d74b527e6806e0503efc55a42db7b5f39939d84c07d6895"}, } diff --git a/apps/opentelemetry_api_experimental/rebar.config b/apps/opentelemetry_api_experimental/rebar.config index 0770c270..cbecf477 100644 --- a/apps/opentelemetry_api_experimental/rebar.config +++ b/apps/opentelemetry_api_experimental/rebar.config @@ -1,2 +1,2 @@ {erl_opts, [debug_info]}. -{deps, [{opentelemetry_api, "~> 1.3"}]}. +{deps, [{opentelemetry_api, "~> 1.4"}]}. diff --git a/apps/opentelemetry_api_experimental/src/opentelemetry_api_experimental.app.src b/apps/opentelemetry_api_experimental/src/opentelemetry_api_experimental.app.src index 3bc55694..7418e55e 100644 --- a/apps/opentelemetry_api_experimental/src/opentelemetry_api_experimental.app.src +++ b/apps/opentelemetry_api_experimental/src/opentelemetry_api_experimental.app.src @@ -1,6 +1,6 @@ {application, opentelemetry_api_experimental, [{description, "API for unstable OpenTelemetry signals"}, - {vsn, "0.5.1"}, + {vsn, "0.5.2"}, {registered, []}, {applications, [kernel, diff --git a/apps/opentelemetry_experimental/rebar.config b/apps/opentelemetry_experimental/rebar.config index f8dbc3a0..590bdec0 100644 --- a/apps/opentelemetry_experimental/rebar.config +++ b/apps/opentelemetry_experimental/rebar.config @@ -1,7 +1,7 @@ {erl_opts, [debug_info]}. -{deps, [{opentelemetry, "~> 1.4"}, - {opentelemetry_api, "~> 1.3"}, - {opentelemetry_api_experimental, "~> 0.5.1"}]}. +{deps, [{opentelemetry, "~> 1.5"}, + {opentelemetry_api, "~> 1.4"}, + {opentelemetry_api_experimental, "~> 0.5.2"}]}. {shell, [ % {config, "config/sys.config"}, diff --git a/apps/opentelemetry_experimental/src/opentelemetry_experimental.app.src b/apps/opentelemetry_experimental/src/opentelemetry_experimental.app.src index 8a7886a5..f23d7cc4 100644 --- a/apps/opentelemetry_experimental/src/opentelemetry_experimental.app.src +++ b/apps/opentelemetry_experimental/src/opentelemetry_experimental.app.src @@ -1,6 +1,6 @@ {application, opentelemetry_experimental, [{description, "Implementation of unstable OpenTelemetry signals"}, - {vsn, "0.5.1"}, + {vsn, "0.6.0"}, {registered, []}, {mod, {opentelemetry_experimental_app, []}}, {applications, diff --git a/docs.sh b/docs.sh index 81716862..9fc70f63 100755 --- a/docs.sh +++ b/docs.sh @@ -11,8 +11,8 @@ rebar3 compile rebar3 edoc sdk_version=1.5.0 api_version=1.4.0 -exp_sdk_version=0.5.1 -exp_api_version=0.5.1 +exp_sdk_version=0.6.0 +exp_api_version=0.5.2 otlp_version=1.8.0 zipkin_version=1.1.0 semconv_version=0.2.0 From c5a0602610b3b2d8fa586d4ccb949830617b050c Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 23 Nov 2024 11:03:54 -0700 Subject: [PATCH 2/3] remove unneeded eqwalizer-support rebar3 package --- rebar.config | 10 ++-------- rebar.lock | 12 ++++++------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/rebar.config b/rebar.config index 5727b53f..5f57d194 100644 --- a/rebar.config +++ b/rebar.config @@ -12,15 +12,9 @@ {project_plugins, [covertool, %% TODO: figure out why grpcbox_plugin fails to build in elixir github action %% it isn't needed often so fine to just leave it commented out for now - grpcbox_plugin, + grpcbox_plugin, {gradualizer, {git, "https://github.com/josefs/Gradualizer.git", - {branch, "master"}}}, - {eqwalizer_rebar3, - {git_subdir, - "https://github.com/whatsapp/eqwalizer.git", - {branch, "main"}, - "eqwalizer_rebar3"}} - ]}. + {branch, "master"}}}]}. {gradualizer_opts, [{exclude_modules, [opentelemetry_trace_service, opentelemetry_metrics_service, diff --git a/rebar.lock b/rebar.lock index f0c6aab0..8f41d5ca 100644 --- a/rebar.lock +++ b/rebar.lock @@ -10,9 +10,9 @@ {<<"gproc">>,{pkg,<<"gproc">>,<<"0.9.1">>},1}, {<<"grpcbox">>,{pkg,<<"grpcbox">>,<<"0.17.1">>},0}, {<<"hpack">>,{pkg,<<"hpack_erl">>,<<"0.3.0">>},2}, - {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},1}, + {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.7">>},1}, {<<"tls_certificate_check">>, - {pkg,<<"tls_certificate_check">>,<<"1.19.0">>}, + {pkg,<<"tls_certificate_check">>,<<"1.24.0">>}, 0}]}. [ {pkg_hash,[ @@ -22,8 +22,8 @@ {<<"gproc">>, <<"F1DF0364423539CF0B80E8201C8B1839E229E5F9B3CCB944C5834626998F5B8C">>}, {<<"grpcbox">>, <<"6E040AB3EF16FE699FFB513B0EF8E2E896DA7B18931A1EF817143037C454BCCE">>}, {<<"hpack">>, <<"2461899CC4AB6A0EF8E970C1661C5FC6A52D3C25580BC6DD204F84CE94669926">>}, - {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>}, - {<<"tls_certificate_check">>, <<"C76C4C5D79EE79A2B11C84F910C825D6F024A78427C854F515748E9BD025E987">>}]}, + {<<"ssl_verify_fun">>, <<"354C321CF377240C7B8716899E182CE4890C5938111A1296ADD3EC74CF1715DF">>}, + {<<"tls_certificate_check">>, <<"D00E2887551FF8CDAE4D0340D90D9FCBC4943C7B5F49D32ED4BC23AFF4DB9A44">>}]}, {pkg_hash_ext,[ {<<"acceptor_pool">>, <<"0CBCD83FDC8B9AD2EEE2067EF8B91A14858A5883CB7CD800E6FCD5803E158788">>}, {<<"chatterbox">>, <<"4F75B91451338BC0DA5F52F3480FA6EF6E3A2AEECFC33686D6B3D0A0948F31AA">>}, @@ -31,6 +31,6 @@ {<<"gproc">>, <<"905088E32E72127ED9466F0BAC0D8E65704CA5E73EE5A62CB073C3117916D507">>}, {<<"grpcbox">>, <<"4A3B5D7111DAABC569DC9CBD9B202A3237D81C80BF97212FBC676832CB0CEB17">>}, {<<"hpack">>, <<"D6137D7079169D8C485C6962DFE261AF5B9EF60FBC557344511C1E65E3D95FB0">>}, - {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>}, - {<<"tls_certificate_check">>, <<"4083B4A298ADD534C96125337CB01161C358BB32DD870D5A893AAE685FD91D70">>}]} + {<<"ssl_verify_fun">>, <<"FE4C190E8F37401D30167C8C405EDA19469F34577987C76DDE613E838BBC67F8">>}, + {<<"tls_certificate_check">>, <<"90B25A58EE433D91C17F036D4D354BF8859A089BFDA60E68A86F8EECAE45EF1B">>}]} ]. From 811740e7a133f6f85b2b8466c0dfdc50b9cdf2f6 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 23 Nov 2024 11:55:30 -0700 Subject: [PATCH 3/3] bump rebar3 version to 3.24.0 in CI --- .github/workflows/erlang.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml index b8c0162a..438d3f27 100644 --- a/.github/workflows/erlang.yml +++ b/.github/workflows/erlang.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: otp_version: ["27.1", "26.1.2", "25.3.2.7", "24.3.4.14"] - rebar3_version: ["3.22.1"] + rebar3_version: ["3.24.0"] os: [ubuntu-20.04] include: - otp_version: "23.3.4.19" @@ -94,7 +94,7 @@ jobs: strategy: matrix: otp_version: ["26.1.2"] - rebar3_version: ["3.22.1"] + rebar3_version: ["3.24.0"] os: [ubuntu-20.04] steps: - uses: actions/checkout@v4 @@ -122,7 +122,7 @@ jobs: strategy: matrix: otp_version: ["26.1.2"] - rebar3_version: ["3.22.1"] + rebar3_version: ["3.24.0"] os: [ubuntu-20.04] steps: - uses: actions/checkout@v4 @@ -155,7 +155,7 @@ jobs: strategy: matrix: otp_version: ["26.1.2", "24.3.4.14"] - rebar3_version: ["3.22.1"] + rebar3_version: ["3.24.0"] os: [ubuntu-20.04] defaults: run: