diff --git a/config/test.exs b/config/test.exs index 1346196..62ed10e 100644 --- a/config/test.exs +++ b/config/test.exs @@ -1,6 +1,5 @@ import Config config :opentelemetry, - sampler: {:always_on, %{}}, tracer: :otel_tracer_default, processors: [{:otel_batch_processor, %{scheduled_delay_ms: 1}}] diff --git a/lib/teleplug.ex b/lib/teleplug.ex index 66251fa..0a6eb16 100644 --- a/lib/teleplug.ex +++ b/lib/teleplug.ex @@ -24,7 +24,7 @@ defmodule Teleplug do @impl true def call(conn, _opts) do - :otel_propagator.text_map_extract(conn.req_headers) + :otel_propagator_text_map.extract(conn.req_headers) attributes = http_common_attributes(conn) ++ diff --git a/lib/teleplug/instrumentation.ex b/lib/teleplug/instrumentation.ex index 1bf1ed5..848a4c2 100644 --- a/lib/teleplug/instrumentation.ex +++ b/lib/teleplug/instrumentation.ex @@ -17,8 +17,6 @@ defmodule Teleplug.Instrumentation do ] def setup do - OpenTelemetry.register_application_tracer(:teleplug) - # attach to plug and phoenix route dispatch events so it works when using one or the other Enum.each(@start_events, fn event -> attach_to_event(event, &__MODULE__.register_route/4) end) Enum.each(@end_events, fn event -> attach_to_event(event, &__MODULE__.unregister_route/4) end) diff --git a/mix.exs b/mix.exs index f4bad3f..6a45c1b 100644 --- a/mix.exs +++ b/mix.exs @@ -2,7 +2,7 @@ defmodule Teleplug.MixProject do use Mix.Project @source_url "https://github.com/primait/teleplug" - @version "1.0.0-rc.6.1" + @version "1.0.0-rc.7" def project do [ @@ -25,7 +25,7 @@ defmodule Teleplug.MixProject do # Run "mix help deps" to learn about dependencies. defp deps do [ - {:opentelemetry_api, "~> 1.0.0-rc.2"}, + {:opentelemetry_api, "~> 1.0.0-rc.3"}, {:plug, "~> 1.11"}, {:telemetry, "~> 0.4 or ~> 1.0.0"} ] ++ dev_deps() @@ -36,8 +36,8 @@ defmodule Teleplug.MixProject do {:credo, "~> 1.5", only: [:dev, :test], runtime: false}, {:dialyxir, "~> 1.1", only: [:dev, :test], runtime: false}, {:ex_doc, ">= 0.0.0", only: :dev, runtime: false}, - {:opentelemetry, "~> 1.0.0-rc.2", only: :test}, - {:opentelemetry_exporter, "~> 1.0.0-rc.1", only: :test} + {:opentelemetry, "~> 1.0.0-rc.3", only: :test}, + {:opentelemetry_exporter, "~> 1.0.0-rc.3", only: :test} ] end diff --git a/mix.lock b/mix.lock index 373ad65..78bc634 100644 --- a/mix.lock +++ b/mix.lock @@ -18,9 +18,9 @@ "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"}, "mime": {:hex, :mime, "1.6.0", "dabde576a497cef4bbdd60aceee8160e02a6c89250d6c0b29e56c0dfb00db3d2", [:mix], [], "hexpm", "31a1a8613f8321143dde1dafc36006a17d28d02bdfecb9e95a880fa7aabd19a7"}, "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"}, - "opentelemetry": {:hex, :opentelemetry, "1.0.0-rc.2", "d3e1fd9debfd73e00b0241cac464be7cd6ca6ac2bd38ab2ebe0c92401c76a342", [:rebar3], [{:opentelemetry_api, "~> 1.0.0-rc.2", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}], "hexpm", "2f810e2eed70a9ea0c9b6943969b59e37f96a2f9e10920045a6c7676c2ab8181"}, - "opentelemetry_api": {:hex, :opentelemetry_api, "1.0.0-rc.2", "a0ec5b242bb7ce7563b4891e77dcfa529defc9e42c19a5a702574c5ac3d0c6e7", [:mix, :rebar3], [], "hexpm", "426a969c8ee2afa8ab55b58e6e40e81c1f934c064459a1acb530f54042f9a9a3"}, - "opentelemetry_exporter": {:hex, :opentelemetry_exporter, "1.0.0-rc.1", "e3abedac6636b27c1132fa78782356fc43407b03a7a1eb6f10c8cbc10f4e1d73", [:rebar3], [{:grpcbox, "~>0.14.0", [hex: :grpcbox, repo: "hexpm", optional: false]}, {:opentelemetry, "~> 1.0.0-rc.1", [hex: :opentelemetry, repo: "hexpm", optional: false]}, {:opentelemetry_api, "~> 1.0.0-rc.1", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}], "hexpm", "c35dc739fb87206decb4982c949029a2476e89de73ec93cb19bb4e6dafe501d7"}, + "opentelemetry": {:hex, :opentelemetry, "1.0.0-rc.3", "d2698bee882c354274563ee85d097bb736a9adb8d8ed376a4deea0cd3a14bb31", [:rebar3], [{:opentelemetry_api, "~> 1.0.0-rc.3", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}], "hexpm", "c9105933df0d783d94cf08d79206eb8d6578abc0bcbd498d0b497ec62a4e30a8"}, + "opentelemetry_api": {:hex, :opentelemetry_api, "1.0.0-rc.3.2", "588ebf85fa7d18eba8db297b7d0a2a654f680f35c4466cd0045cd12a6fda27d7", [:mix, :rebar3], [], "hexpm", "1e0ba55db6718d5797e72c00e3821e60e02f7829e3fb64dc1a7c96f7c2776a58"}, + "opentelemetry_exporter": {:hex, :opentelemetry_exporter, "1.0.0-rc.3", "76f5657d4c94a12003d9ed2c8da1023c815e98f5553184dbb0cdaeec76db676d", [:rebar3], [{:grpcbox, ">= 0.0.0", [hex: :grpcbox, repo: "hexpm", optional: false]}, {:opentelemetry, "~> 1.0.0-rc.3", [hex: :opentelemetry, repo: "hexpm", optional: false]}, {:opentelemetry_api, "~> 1.0.0-rc.3", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}], "hexpm", "267f0e4c3f1f5557cc7ad6ac71d66b8eaf7b3b56fde942c21f8a0bc96174fe1e"}, "plug": {:hex, :plug, "1.11.1", "f2992bac66fdae679453c9e86134a4201f6f43a687d8ff1cd1b2862d53c80259", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "23524e4fefbb587c11f0833b3910bfb414bf2e2534d61928e920f54e3a1b881f"}, "plug_crypto": {:hex, :plug_crypto, "1.2.2", "05654514ac717ff3a1843204b424477d9e60c143406aa94daf2274fdd280794d", [:mix], [], "hexpm", "87631c7ad914a5a445f0a3809f99b079113ae4ed4b867348dd9eec288cecb6db"}, "telemetry": {:hex, :telemetry, "0.4.3", "a06428a514bdbc63293cd9a6263aad00ddeb66f608163bdec7c8995784080818", [:rebar3], [], "hexpm", "eb72b8365ffda5bed68a620d1da88525e326cb82a75ee61354fc24b844768041"},