From 8897400d4e710396b3455db3c8fdd0d1e1a87bf9 Mon Sep 17 00:00:00 2001
From: Bryan Naegele <bryannaegele@users.noreply.github.com>
Date: Fri, 13 Jan 2023 14:38:05 -0700
Subject: [PATCH] Phoenix 1.1.0 (#145)

* Phoenix 1.1.0

* Fix docs

* Publish tesla with updated sem conventions
---
 instrumentation/opentelemetry_phoenix/CHANGELOG.md         | 7 +++++++
 instrumentation/opentelemetry_phoenix/README.md            | 2 +-
 .../opentelemetry_phoenix/lib/opentelemetry_phoenix.ex     | 1 -
 instrumentation/opentelemetry_phoenix/mix.exs              | 4 ++--
 instrumentation/opentelemetry_tesla/mix.exs                | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/instrumentation/opentelemetry_phoenix/CHANGELOG.md b/instrumentation/opentelemetry_phoenix/CHANGELOG.md
index 8864008..7696d34 100644
--- a/instrumentation/opentelemetry_phoenix/CHANGELOG.md
+++ b/instrumentation/opentelemetry_phoenix/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.1.0
+
+### Features
+
+* Add support for opentelemetry_cowboy to capture the full request lifecycle
+  when using the Plug.Cowboy adapter
+
 ## 1.0.0
 
 ### Fixes
diff --git a/instrumentation/opentelemetry_phoenix/README.md b/instrumentation/opentelemetry_phoenix/README.md
index a73177a..73f227e 100644
--- a/instrumentation/opentelemetry_phoenix/README.md
+++ b/instrumentation/opentelemetry_phoenix/README.md
@@ -22,7 +22,7 @@ may be supplied.
 ```elixir
 def deps do
   [
-    {:opentelemetry_phoenix, "~> 1.0"}
+    {:opentelemetry_phoenix, "~> 1.1"}
   ]
 end
 ```
diff --git a/instrumentation/opentelemetry_phoenix/lib/opentelemetry_phoenix.ex b/instrumentation/opentelemetry_phoenix/lib/opentelemetry_phoenix.ex
index 82a3298..e07bb6c 100644
--- a/instrumentation/opentelemetry_phoenix/lib/opentelemetry_phoenix.ex
+++ b/instrumentation/opentelemetry_phoenix/lib/opentelemetry_phoenix.ex
@@ -36,7 +36,6 @@ defmodule OpentelemetryPhoenix do
       def start(_type, _args) do
         :opentelemetry_cowboy.setup()
         OpentelemetryPhoenix.setup(adapter: :cowboy2)
-        OpentelemetryPhoenix.setup()
 
         children = [
           {Phoenix.PubSub, name: MyApp.PubSub},
diff --git a/instrumentation/opentelemetry_phoenix/mix.exs b/instrumentation/opentelemetry_phoenix/mix.exs
index 6748b7b..63bb4ce 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",
+      version: "1.1.0",
       elixir: "~> 1.10",
       start_permanent: Mix.env() == :prod,
       dialyzer: [
@@ -44,7 +44,7 @@ defmodule OpentelemetryPhoenix.MixProject do
       licenses: ["Apache-2.0"],
       links: %{
         "GitHub" =>
-          "https://github.com/open-telemetry/opentelemetry-erlang-contrib/instrumentation/opentelemetry_phoenix",
+          "https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_phoenix",
         "OpenTelemetry Erlang" => "https://github.com/open-telemetry/opentelemetry-erlang",
         "OpenTelemetry Erlang Contrib" => "https://github.com/open-telemetry/opentelemetry-erlang-contrib",
         "OpenTelemetry.io" => "https://opentelemetry.io"
diff --git a/instrumentation/opentelemetry_tesla/mix.exs b/instrumentation/opentelemetry_tesla/mix.exs
index 008e360..e815760 100644
--- a/instrumentation/opentelemetry_tesla/mix.exs
+++ b/instrumentation/opentelemetry_tesla/mix.exs
@@ -4,7 +4,7 @@ defmodule OpentelemetryTesla.MixProject do
   def project do
     [
       app: :opentelemetry_tesla,
-      version: "2.1.0",
+      version: "2.2.0",
       elixir: "~> 1.10",
       start_permanent: Mix.env() == :prod,
       deps: deps(),