From f34f95fff2e10d195da050d5857c808516301696 Mon Sep 17 00:00:00 2001
From: Bryan Naegele <bryannaegele@users.noreply.github.com>
Date: Wed, 17 Jan 2024 11:11:09 -0700
Subject: [PATCH] Update cowboy to opentelemetry_api 1.2 (#230)

* Update to opentelemetry_api 1.2

* Fix application deps
---
 .../opentelemetry_cowboy/rebar.config         |  8 ++---
 .../opentelemetry_cowboy/rebar.lock           | 35 +++++++++++--------
 .../src/opentelemetry_cowboy.app.src          |  6 ++--
 .../test/opentelemetry_cowboy_SUITE.erl       |  2 +-
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/instrumentation/opentelemetry_cowboy/rebar.config b/instrumentation/opentelemetry_cowboy/rebar.config
index 4205cf4..20ab675 100644
--- a/instrumentation/opentelemetry_cowboy/rebar.config
+++ b/instrumentation/opentelemetry_cowboy/rebar.config
@@ -1,7 +1,7 @@
 {erl_opts, [debug_info]}.
 {deps, [
   {cowboy_telemetry, "~> 0.4"},
-  {opentelemetry_api, "~> 1.0"},
+  {opentelemetry_api, "~> 1.2"},
   {opentelemetry_telemetry, "~> 1.0"},
   {telemetry, "~> 1.0"}
 ]}.
@@ -19,9 +19,9 @@
             {subpackages, true}]}]},
   {test, [{erl_opts, [nowarn_export_all]},
           {deps, [
-            {opentelemetry, "~> 1.0"},
-            {opentelemetry_exporter, "~> 1.0"},
-            {cowboy, "~> 2.7"}
+            {opentelemetry, "~> 1.3"},
+            {opentelemetry_exporter, "~> 1.6"},
+            {cowboy, "~> 2.10"}
             ]},
           {paths, ["src", "test/support"]},
           {ct_opts, [{ct_hooks, [cth_surefire]}]}]}]}.
diff --git a/instrumentation/opentelemetry_cowboy/rebar.lock b/instrumentation/opentelemetry_cowboy/rebar.lock
index b5907fa..a47ca3e 100644
--- a/instrumentation/opentelemetry_cowboy/rebar.lock
+++ b/instrumentation/opentelemetry_cowboy/rebar.lock
@@ -1,31 +1,36 @@
 {"1.2.0",
-[{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},1},
+[{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.10.0">>},1},
  {<<"cowboy_telemetry">>,{pkg,<<"cowboy_telemetry">>,<<"0.4.0">>},0},
- {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},2},
- {<<"opentelemetry_api">>,{pkg,<<"opentelemetry_api">>,<<"1.1.1">>},0},
+ {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.12.1">>},2},
+ {<<"opentelemetry_api">>,{pkg,<<"opentelemetry_api">>,<<"1.2.2">>},0},
+ {<<"opentelemetry_semantic_conventions">>,
+  {pkg,<<"opentelemetry_semantic_conventions">>,<<"0.2.0">>},
+  1},
  {<<"opentelemetry_telemetry">>,
   {pkg,<<"opentelemetry_telemetry">>,<<"1.0.0">>},
   0},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},2},
- {<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.1.0">>},0},
- {<<"telemetry_registry">>,{pkg,<<"telemetry_registry">>,<<"0.3.0">>},1}]}.
+ {<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.2.1">>},0},
+ {<<"telemetry_registry">>,{pkg,<<"telemetry_registry">>,<<"0.3.1">>},1}]}.
 [
 {pkg_hash,[
- {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>},
+ {<<"cowboy">>, <<"FF9FFEFF91DAE4AE270DD975642997AFE2A1179D94B1887863E43F681A203E26">>},
  {<<"cowboy_telemetry">>, <<"F239F68B588EFA7707ABCE16A84D0D2ACF3A0F50571F8BB7F56A15865AAE820C">>},
- {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>},
- {<<"opentelemetry_api">>, <<"3B43877C456C8A7F5448A95D9BF4FB4BB8CC2ABBBEA2C62D5F8E8C538B4AF14F">>},
+ {<<"cowlib">>, <<"A9FA9A625F1D2025FE6B462CB865881329B5CAFF8F1854D1CBC9F9533F00E1E1">>},
+ {<<"opentelemetry_api">>, <<"693F47B0D8C76DA2095FE858204CFD6350C27FE85D00E4B763DEECC9588CF27A">>},
+ {<<"opentelemetry_semantic_conventions">>, <<"B67FE459C2938FCAB341CB0951C44860C62347C005ACE1B50F8402576F241435">>},
  {<<"opentelemetry_telemetry">>, <<"D5982A319E725FCD2305B306B65C18A86AFDCF7D96821473CF0649FF88877615">>},
  {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
- {<<"telemetry">>, <<"A589817034A27EAB11144AD24D5C0F9FAB1F58173274B1E9BAE7074AF9CBEE51">>},
- {<<"telemetry_registry">>, <<"6768F151EA53FC0FBCA70DBFF5B20A8D663EE4E0C0B2AE589590E08658E76F1E">>}]},
+ {<<"telemetry">>, <<"68FDFE8D8F05A8428483A97D7AAB2F268AAFF24B49E0F599FAA091F1D4E7F61C">>},
+ {<<"telemetry_registry">>, <<"14A3319A7D9027BDBFF7EBCACF1A438F5F5C903057B93AEE484CCA26F05BDCBA">>}]},
 {pkg_hash_ext,[
- {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>},
+ {<<"cowboy">>, <<"3AFDCCB7183CC6F143CB14D3CF51FA00E53DB9EC80CDCD525482F5E99BC41D6B">>},
  {<<"cowboy_telemetry">>, <<"7D98BAC1EE4565D31B62D59F8823DFD8356A169E7FCBB83831B8A5397404C9DE">>},
- {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>},
- {<<"opentelemetry_api">>, <<"A9554B3208B60A70043318D051EA78FBBC7A1B8F4C418EBC16CCB40015995675">>},
+ {<<"cowlib">>, <<"163B73F6367A7341B33C794C4E88E7DBFE6498AC42DCD69EF44C5BC5507C8DB0">>},
+ {<<"opentelemetry_api">>, <<"DC77B9A00F137A858E60A852F14007BB66EDA1FFBEB6C05D5FE6C9E678B05E9D">>},
+ {<<"opentelemetry_semantic_conventions">>, <<"D61FA1F5639EE8668D74B527E6806E0503EFC55A42DB7B5F39939D84C07D6895">>},
  {<<"opentelemetry_telemetry">>, <<"3401D13A1D4B7AA941A77E6B3EC074F0AE77F83B5B2206766CE630123A9291A9">>},
  {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
- {<<"telemetry">>, <<"B727B2A1F75614774CFF2D7565B64D0DFA5BD52BA517F16543E6FC7EFCC0DF48">>},
- {<<"telemetry_registry">>, <<"492E2ADBC609F3E79ECE7F29FEC363A97A2C484AC78A83098535D6564781E917">>}]}
+ {<<"telemetry">>, <<"DAD9CE9D8EFFC621708F99EAC538EF1CBE05D6A874DD741DE2E689C47FEAFED5">>},
+ {<<"telemetry_registry">>, <<"6D0CA77B691CF854ED074B459A93B87F4C7F5512F8F7743C635CA83DA81F939E">>}]}
 ].
diff --git a/instrumentation/opentelemetry_cowboy/src/opentelemetry_cowboy.app.src b/instrumentation/opentelemetry_cowboy/src/opentelemetry_cowboy.app.src
index 242f543..7ccb898 100644
--- a/instrumentation/opentelemetry_cowboy/src/opentelemetry_cowboy.app.src
+++ b/instrumentation/opentelemetry_cowboy/src/opentelemetry_cowboy.app.src
@@ -1,13 +1,13 @@
 {application, opentelemetry_cowboy,
  [{description, "OpenTelemetry Cowboy Instrumentation"},
-  {vsn, "0.2.1"},
+  {vsn, "0.3.0"},
   {registered, []},
   {applications,
    [kernel,
     stdlib,
     opentelemetry_api,
-    telemetry,
-    telemetry_registry
+    opentelemetry_telemetry,
+    telemetry
    ]},
   {env,[]},
   {modules, []},
diff --git a/instrumentation/opentelemetry_cowboy/test/opentelemetry_cowboy_SUITE.erl b/instrumentation/opentelemetry_cowboy/test/opentelemetry_cowboy_SUITE.erl
index 6dffe52..a1b629a 100644
--- a/instrumentation/opentelemetry_cowboy/test/opentelemetry_cowboy_SUITE.erl
+++ b/instrumentation/opentelemetry_cowboy/test/opentelemetry_cowboy_SUITE.erl
@@ -126,7 +126,7 @@ failed_request(_Config) ->
     receive
         {span, #span{name=Name,events=Events,attributes=Attributes,parent_span_id=undefined,kind=Kind}} ->
             [Event] = otel_events:list(Events),
-            #event{name= <<"exception">>} = Event,
+            #event{name=exception} = Event,
             ?assertEqual(<<"HTTP GET">>, Name),
             ?assertEqual(?SPAN_KIND_SERVER, Kind),
             ExpectedAttrs = #{