Lock Otel versions and publish updates (#22)

This commit is contained in:
Bryan Naegele 2021-10-08 16:27:42 -06:00 committed by GitHub
parent bfee0f71a4
commit aece932faf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 39 additions and 10 deletions

View File

@ -0,0 +1,8 @@
# Changelog
## 1.0.0-rc.2
### Changed
* Update dependencies to allow telemetry 1.0.0

View File

@ -23,7 +23,7 @@ by adding `opentelemetry_ecto` to your list of dependencies in `mix.exs`:
```elixir ```elixir
def deps do def deps do
[ [
{:opentelemetry_ecto, "~> 1.0.0-rc"} {:opentelemetry_ecto, "~> 1.0.0-rc.2"}
] ]
end end
``` ```
@ -35,6 +35,7 @@ end
| | | | | | | |
| v0.1.0 | <= v.0.5.0 | | | v0.1.0 | <= v.0.5.0 | |
| v1.0.0-rc.1 | v1.0.0-rc.1 | | | 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) 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 and published on [HexDocs](https://hexdocs.pm). Once published, the docs can

View File

@ -5,7 +5,7 @@ defmodule OpentelemetryEcto.MixProject do
[ [
app: :opentelemetry_ecto, app: :opentelemetry_ecto,
description: description(), description: description(),
version: "1.0.0-rc.1", version: "1.0.0-rc.2",
elixir: "~> 1.10", elixir: "~> 1.10",
start_permanent: Mix.env() == :prod, start_permanent: Mix.env() == :prod,
deps: deps(), deps: deps(),

View File

@ -1,5 +1,17 @@
# Changelog # 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 ## 0.2.0
### Changed ### Changed

View File

@ -22,11 +22,21 @@ may be supplied.
```elixir ```elixir
def deps do def deps do
[ [
{:opentelemetry_phoenix, "~> 1.0.0-rc"} {:opentelemetry_phoenix, "~> 1.0.0-rc.4"}
] ]
end 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 ## Note on phoenix integration
`OpentelemetryPhoenix` requires phoenix to use `Plug.Telemetry` in order to correctly trace endpoint calls. `OpentelemetryPhoenix` requires phoenix to use `Plug.Telemetry` in order to correctly trace endpoint calls.

View File

@ -43,9 +43,6 @@ defmodule OpentelemetryPhoenix do
def setup(opts \\ []) do def setup(opts \\ []) do
opts = ensure_opts(opts) 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_start_handler(opts)
attach_endpoint_stop_handler(opts) attach_endpoint_stop_handler(opts)
attach_router_start_handler() attach_router_start_handler()

View File

@ -5,7 +5,7 @@ defmodule OpentelemetryPhoenix.MixProject do
[ [
app: :opentelemetry_phoenix, app: :opentelemetry_phoenix,
description: description(), description: description(),
version: "1.0.0-rc.3", version: "1.0.0-rc.4",
elixir: "~> 1.10", elixir: "~> 1.10",
start_permanent: Mix.env() == :prod, start_permanent: Mix.env() == :prod,
dialyzer: [ dialyzer: [
@ -21,7 +21,8 @@ defmodule OpentelemetryPhoenix.MixProject do
], ],
elixirc_paths: elixirc_paths(Mix.env()), elixirc_paths: elixirc_paths(Mix.env()),
package: package(), 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 end
@ -57,10 +58,10 @@ defmodule OpentelemetryPhoenix.MixProject do
# Run "mix help deps" to learn about dependencies. # Run "mix help deps" to learn about dependencies.
defp deps do defp deps do
[ [
{:opentelemetry_api, "~> 1.0.0-rc"}, {:opentelemetry_api, "~> 1.0.0-rc.2"},
{:opentelemetry_telemetry, "~> 1.0.0-beta"}, {:opentelemetry_telemetry, "~> 1.0.0-beta"},
{:telemetry, "~> 0.4 or ~> 1.0.0"}, {: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]}, {:plug, "~> 1.11", only: [:dev, :test]},
{:ex_doc, "~> 0.24", only: [:dev], runtime: false}, {:ex_doc, "~> 0.24", only: [:dev], runtime: false},
{:plug_cowboy, "~> 2.4", only: [:test]}, {:plug_cowboy, "~> 2.4", only: [:test]},