From e856486e30c374911f4e1ee205888fc66bb884d0 Mon Sep 17 00:00:00 2001 From: Bryan Naegele Date: Wed, 13 Apr 2022 19:22:28 -0600 Subject: [PATCH] Publish otel telemetry 1.0.0 (#78) --- utilities/opentelemetry_telemetry/VERSION | 1 - .../lib/opentelemetry_telemetry.ex | 6 ------ utilities/opentelemetry_telemetry/mix.exs | 14 ++------------ utilities/opentelemetry_telemetry/rebar.lock | 12 ++++++------ .../src/opentelemetry_telemetry.app.src | 4 ++-- 5 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 utilities/opentelemetry_telemetry/VERSION diff --git a/utilities/opentelemetry_telemetry/VERSION b/utilities/opentelemetry_telemetry/VERSION deleted file mode 100644 index 284fe0b..0000000 --- a/utilities/opentelemetry_telemetry/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.0.0-beta.7 diff --git a/utilities/opentelemetry_telemetry/lib/opentelemetry_telemetry.ex b/utilities/opentelemetry_telemetry/lib/opentelemetry_telemetry.ex index be0b91a..9792082 100644 --- a/utilities/opentelemetry_telemetry/lib/opentelemetry_telemetry.ex +++ b/utilities/opentelemetry_telemetry/lib/opentelemetry_telemetry.ex @@ -112,10 +112,4 @@ defmodule OpentelemetryTelemetry do """ @spec end_telemetry_span(tracer_id(), :telemetry.event_metadata()) :: :ok defdelegate end_telemetry_span(tracer_id, event_metadata), to: :otel_telemetry - - @doc false - defdelegate trace_application(app), to: :otel_telemetry - - @doc false - defdelegate trace_application(app, opts), to: :otel_telemetry end diff --git a/utilities/opentelemetry_telemetry/mix.exs b/utilities/opentelemetry_telemetry/mix.exs index 9a4b92c..1065bb7 100644 --- a/utilities/opentelemetry_telemetry/mix.exs +++ b/utilities/opentelemetry_telemetry/mix.exs @@ -7,7 +7,7 @@ defmodule OpentelemetryTelemetry.MixProject do [ app: app, - version: version(Keyword.fetch!(desc, :vsn)), + version: to_string(Keyword.fetch!(desc, :vsn)), description: to_string(Keyword.fetch!(desc, :description)), elixir: "~> 1.10", start_permanent: Mix.env() == :prod, @@ -30,16 +30,6 @@ defmodule OpentelemetryTelemetry.MixProject do ] end - defp version(version) when is_list(version) do - List.to_string(version) - end - - defp version({:file, path}) do - path - |> File.read!() - |> String.trim() - end - # Run "mix help compile.app" to learn about applications. def application do [ @@ -65,7 +55,7 @@ defmodule OpentelemetryTelemetry.MixProject do [ description: "Bridge library between Telemetry events and OpenTelemetry Erlang", build_tools: ["rebar3", "mix"], - files: ~w(lib mix.exs README.md LICENSE rebar.config rebar.lock VERSION src), + files: ~w(lib mix.exs README.md LICENSE rebar.config rebar.lock src), licenses: ["Apache-2.0"], links: %{ "GitHub" => diff --git a/utilities/opentelemetry_telemetry/rebar.lock b/utilities/opentelemetry_telemetry/rebar.lock index 095ebab..76b89f4 100644 --- a/utilities/opentelemetry_telemetry/rebar.lock +++ b/utilities/opentelemetry_telemetry/rebar.lock @@ -1,14 +1,14 @@ {"1.2.0", -[{<<"opentelemetry_api">>,{pkg,<<"opentelemetry_api">>,<<"1.0.0">>},0}, - {<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.0.0">>},0}, +[{<<"opentelemetry_api">>,{pkg,<<"opentelemetry_api">>,<<"1.0.2">>},0}, + {<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.1.0">>},0}, {<<"telemetry_registry">>,{pkg,<<"telemetry_registry">>,<<"0.3.0">>},0}]}. [ {pkg_hash,[ - {<<"opentelemetry_api">>, <<"6E501F750EAD189F35AED07EB8023FA6655FCA12F913A196102F67DB4ED5172C">>}, - {<<"telemetry">>, <<"0F453A102CDF13D506B7C0AB158324C337C41F1CC7548F0BC0E130BBF0AE9452">>}, + {<<"opentelemetry_api">>, <<"91353EE40583B1D4F07D7B13ED62642ABFEC6AAA0D8A2114F07EDAFB2DF781C5">>}, + {<<"telemetry">>, <<"A589817034A27EAB11144AD24D5C0F9FAB1F58173274B1E9BAE7074AF9CBEE51">>}, {<<"telemetry_registry">>, <<"6768F151EA53FC0FBCA70DBFF5B20A8D663EE4E0C0B2AE589590E08658E76F1E">>}]}, {pkg_hash_ext,[ - {<<"opentelemetry_api">>, <<"AC51520BDE21FDEA7F82CEA9236CE4E88A21281C22BC23B0F1FA3B28B4352FCF">>}, - {<<"telemetry">>, <<"73BC09FA59B4A0284EFB4624335583C528E07EC9AE76ACA96EA0673850AEC57A">>}, + {<<"opentelemetry_api">>, <<"2A8247F85C44216B883900067478D59955D11E58E5CFCA7C884CD4F203ACE3AC">>}, + {<<"telemetry">>, <<"B727B2A1F75614774CFF2D7565B64D0DFA5BD52BA517F16543E6FC7EFCC0DF48">>}, {<<"telemetry_registry">>, <<"492E2ADBC609F3E79ECE7F29FEC363A97A2C484AC78A83098535D6564781E917">>}]} ]. diff --git a/utilities/opentelemetry_telemetry/src/opentelemetry_telemetry.app.src b/utilities/opentelemetry_telemetry/src/opentelemetry_telemetry.app.src index 5a16aac..5bfd5a8 100644 --- a/utilities/opentelemetry_telemetry/src/opentelemetry_telemetry.app.src +++ b/utilities/opentelemetry_telemetry/src/opentelemetry_telemetry.app.src @@ -1,6 +1,6 @@ {application, opentelemetry_telemetry, [{description, "Telemetry to OpenTelemetry Bridge"}, - {vsn, {file, "VERSION"}}, + {vsn, "1.0.0"}, {registered, []}, {applications, [kernel, @@ -14,5 +14,5 @@ {modules, []}, {licenses, ["Apache-2.0"]}, - {links, [{"GitHub", "https://github.com/opentelemetry-beam/opentelemetry_telemetry"}]} + {links, [{"GitHub", "https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/utilities/opentelemetry_telemetry"}]} ]}.