From aece932fafa6388817fd3b3b91a2d7d4408a07bf Mon Sep 17 00:00:00 2001 From: Bryan Naegele Date: Fri, 8 Oct 2021 16:27:42 -0600 Subject: [PATCH] Lock Otel versions and publish updates (#22) --- instrumentation/opentelemetry_ecto/CHANGELOG.md | 8 ++++++++ instrumentation/opentelemetry_ecto/README.md | 3 ++- instrumentation/opentelemetry_ecto/mix.exs | 2 +- instrumentation/opentelemetry_phoenix/CHANGELOG.md | 12 ++++++++++++ instrumentation/opentelemetry_phoenix/README.md | 12 +++++++++++- .../lib/opentelemetry_phoenix.ex | 3 --- instrumentation/opentelemetry_phoenix/mix.exs | 9 +++++---- 7 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 instrumentation/opentelemetry_ecto/CHANGELOG.md diff --git a/instrumentation/opentelemetry_ecto/CHANGELOG.md b/instrumentation/opentelemetry_ecto/CHANGELOG.md new file mode 100644 index 0000000..091686d --- /dev/null +++ b/instrumentation/opentelemetry_ecto/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +## 1.0.0-rc.2 + +### Changed + +* Update dependencies to allow telemetry 1.0.0 + diff --git a/instrumentation/opentelemetry_ecto/README.md b/instrumentation/opentelemetry_ecto/README.md index 3e79f69..5335bca 100644 --- a/instrumentation/opentelemetry_ecto/README.md +++ b/instrumentation/opentelemetry_ecto/README.md @@ -23,7 +23,7 @@ by adding `opentelemetry_ecto` to your list of dependencies in `mix.exs`: ```elixir def deps do [ - {:opentelemetry_ecto, "~> 1.0.0-rc"} + {:opentelemetry_ecto, "~> 1.0.0-rc.2"} ] end ``` @@ -35,6 +35,7 @@ end | | | | | v0.1.0 | <= v.0.5.0 | | | v1.0.0-rc.1 | v1.0.0-rc.1 | | +| v1.0.0-rc.2 | v1.0.0-rc.2 | | Documentation can be generated with [ExDoc](https://github.com/elixir-lang/ex_doc) and published on [HexDocs](https://hexdocs.pm). Once published, the docs can diff --git a/instrumentation/opentelemetry_ecto/mix.exs b/instrumentation/opentelemetry_ecto/mix.exs index d47d47c..8a09180 100644 --- a/instrumentation/opentelemetry_ecto/mix.exs +++ b/instrumentation/opentelemetry_ecto/mix.exs @@ -5,7 +5,7 @@ defmodule OpentelemetryEcto.MixProject do [ app: :opentelemetry_ecto, description: description(), - version: "1.0.0-rc.1", + version: "1.0.0-rc.2", elixir: "~> 1.10", start_permanent: Mix.env() == :prod, deps: deps(), diff --git a/instrumentation/opentelemetry_phoenix/CHANGELOG.md b/instrumentation/opentelemetry_phoenix/CHANGELOG.md index e924120..1f544c4 100644 --- a/instrumentation/opentelemetry_phoenix/CHANGELOG.md +++ b/instrumentation/opentelemetry_phoenix/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## 1.0.0-rc.4 + +### Changed + +* Opentelemetry dependency is locked to rc2 or lower in prep for breaking changes in rc3 + +## 1.0.0-rc.3 + +### Changed + +* Update dependencies to allow telemetry 1.0.0 + ## 0.2.0 ### Changed diff --git a/instrumentation/opentelemetry_phoenix/README.md b/instrumentation/opentelemetry_phoenix/README.md index dd39f0f..dc584a8 100644 --- a/instrumentation/opentelemetry_phoenix/README.md +++ b/instrumentation/opentelemetry_phoenix/README.md @@ -22,11 +22,21 @@ may be supplied. ```elixir def deps do [ - {:opentelemetry_phoenix, "~> 1.0.0-rc"} + {:opentelemetry_phoenix, "~> 1.0.0-rc.4"} ] end ``` +## Compatibility Matrix + +| OpentelemetryPhoenix Version | Otel Version | Notes | +| :--------------------------- | :----------- | :---- | +| | | | +| v0.1.0 | <= v.0.5.0 | | +| v1.0.0-rc.3 | v1.0.0-rc.1 | | +| | v1.0.0-rc.2 | | +| v1.0.0-rc.4 | v1.0.0-rc.2 | Otel rc.3 will be a breaking change | + ## Note on phoenix integration `OpentelemetryPhoenix` requires phoenix to use `Plug.Telemetry` in order to correctly trace endpoint calls. diff --git a/instrumentation/opentelemetry_phoenix/lib/opentelemetry_phoenix.ex b/instrumentation/opentelemetry_phoenix/lib/opentelemetry_phoenix.ex index 50baa09..4f123ea 100644 --- a/instrumentation/opentelemetry_phoenix/lib/opentelemetry_phoenix.ex +++ b/instrumentation/opentelemetry_phoenix/lib/opentelemetry_phoenix.ex @@ -43,9 +43,6 @@ defmodule OpentelemetryPhoenix do def setup(opts \\ []) do opts = ensure_opts(opts) - {:ok, otel_phx_vsn} = :application.get_key(@tracer_id, :vsn) - OpenTelemetry.register_tracer(@tracer_id, otel_phx_vsn) - attach_endpoint_start_handler(opts) attach_endpoint_stop_handler(opts) attach_router_start_handler() diff --git a/instrumentation/opentelemetry_phoenix/mix.exs b/instrumentation/opentelemetry_phoenix/mix.exs index 8e1bd50..5f79669 100644 --- a/instrumentation/opentelemetry_phoenix/mix.exs +++ b/instrumentation/opentelemetry_phoenix/mix.exs @@ -5,7 +5,7 @@ defmodule OpentelemetryPhoenix.MixProject do [ app: :opentelemetry_phoenix, description: description(), - version: "1.0.0-rc.3", + version: "1.0.0-rc.4", elixir: "~> 1.10", start_permanent: Mix.env() == :prod, dialyzer: [ @@ -21,7 +21,8 @@ defmodule OpentelemetryPhoenix.MixProject do ], elixirc_paths: elixirc_paths(Mix.env()), package: package(), - source_url: "https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_phoenix" + source_url: + "https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_phoenix" ] end @@ -57,10 +58,10 @@ defmodule OpentelemetryPhoenix.MixProject do # Run "mix help deps" to learn about dependencies. defp deps do [ - {:opentelemetry_api, "~> 1.0.0-rc"}, + {:opentelemetry_api, "~> 1.0.0-rc.2"}, {:opentelemetry_telemetry, "~> 1.0.0-beta"}, {:telemetry, "~> 0.4 or ~> 1.0.0"}, - {:opentelemetry, "~> 1.0.0-rc", only: [:dev, :test]}, + {:opentelemetry, "~> 1.0.0-rc.2", only: [:dev, :test]}, {:plug, "~> 1.11", only: [:dev, :test]}, {:ex_doc, "~> 0.24", only: [:dev], runtime: false}, {:plug_cowboy, "~> 2.4", only: [:test]},