From 25a656803b32295a3d23b6c9f02ca7ec85884b2c Mon Sep 17 00:00:00 2001
From: Luke Bakken <luke@bakken.io>
Date: Tue, 4 Jun 2024 08:18:29 -0700
Subject: [PATCH 1/2] Ensure OpenTelemetry project is set up like OAuth2

Fixes #1591
---
 Build.csproj                                                | 1 +
 .../RabbitMQ.Client.OpenTelemetry/PublicAPI.Shipped.txt     | 0
 .../RabbitMQ.Client.OpenTelemetry/PublicAPI.Unshipped.txt   | 2 ++
 .../RabbitMQ.Client.OpenTelemetry.csproj                    | 6 +++++-
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 projects/RabbitMQ.Client.OpenTelemetry/PublicAPI.Shipped.txt
 create mode 100644 projects/RabbitMQ.Client.OpenTelemetry/PublicAPI.Unshipped.txt

diff --git a/Build.csproj b/Build.csproj
index 7c8152fb09..a919ea9644 100644
--- a/Build.csproj
+++ b/Build.csproj
@@ -9,6 +9,7 @@
     <ProjectReference Include="projects/Benchmarks/Benchmarks.csproj" />
     <ProjectReference Include="projects/RabbitMQ.Client/RabbitMQ.Client.csproj" />
     <ProjectReference Include="projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj" />
+    <ProjectReference Include="projects/RabbitMQ.Client.OpenTelemetry/RabbitMQ.Client.OpenTelemetry.csproj" />
     <ProjectReference Include="projects/toxiproxy-netcore/src/ToxiproxyNetCore/ToxiproxyNetCore.csproj" />
     <ProjectReference Include="projects/Test/Common/Common.csproj" />
     <ProjectReference Include="projects/Test/Applications/CreateChannel/CreateChannel.csproj" />
diff --git a/projects/RabbitMQ.Client.OpenTelemetry/PublicAPI.Shipped.txt b/projects/RabbitMQ.Client.OpenTelemetry/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/projects/RabbitMQ.Client.OpenTelemetry/PublicAPI.Unshipped.txt b/projects/RabbitMQ.Client.OpenTelemetry/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..d5aeab4fd9
--- /dev/null
+++ b/projects/RabbitMQ.Client.OpenTelemetry/PublicAPI.Unshipped.txt
@@ -0,0 +1,2 @@
+OpenTelemetry.Trace.OpenTelemetryExtensions
+static OpenTelemetry.Trace.OpenTelemetryExtensions.AddRabbitMQInstrumentation(this OpenTelemetry.Trace.TracerProviderBuilder builder) -> OpenTelemetry.Trace.TracerProviderBuilder
diff --git a/projects/RabbitMQ.Client.OpenTelemetry/RabbitMQ.Client.OpenTelemetry.csproj b/projects/RabbitMQ.Client.OpenTelemetry/RabbitMQ.Client.OpenTelemetry.csproj
index f3f0c07150..3106b28119 100644
--- a/projects/RabbitMQ.Client.OpenTelemetry/RabbitMQ.Client.OpenTelemetry.csproj
+++ b/projects/RabbitMQ.Client.OpenTelemetry/RabbitMQ.Client.OpenTelemetry.csproj
@@ -7,7 +7,7 @@
     <AssemblyTitle>RabbitMQ OpenTelemetry Integration Package for .NET</AssemblyTitle>
     <Authors>VMware</Authors>
     <Company>VMware, Inc. or its affiliates.</Company>
-    <Copyright>Copyright © 2007-2023 VMware, Inc. or its affiliates.</Copyright>
+    <Copyright>Copyright (c) 2007-2024 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.</Copyright>
     <Description>The RabbitMQ OpenTelemetry Library for .NET adds convenience extension methods for RabbitMQ/OpenTelemetry</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageIcon>icon.png</PackageIcon>
@@ -41,6 +41,10 @@
 
   <ItemGroup>
     <None Remove="icon.png" />
+    <None Remove="PublicAPI.Shipped.txt" />
+    <None Remove="PublicAPI.Unshipped.txt" />
+    <AdditionalFiles Include="PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI.Unshipped.txt" />
     <Content Include="icon.png" PackagePath="" />
     <None Include="README.md" Pack="true" PackagePath="/" />
     <InternalsVisibleTo Include="Unit" />

From 26c0b71e47a24269d45214164529f29d103cb801 Mon Sep 17 00:00:00 2001
From: Luke Bakken <luke@bakken.io>
Date: Tue, 4 Jun 2024 08:28:39 -0700
Subject: [PATCH 2/2] Bump versions for Windows testing

---
 .ci/windows/versions.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/windows/versions.json b/.ci/windows/versions.json
index 11c0c71d14..511d65528e 100644
--- a/.ci/windows/versions.json
+++ b/.ci/windows/versions.json
@@ -1,4 +1,4 @@
 {
-  "erlang": "26.2.3",
-  "rabbitmq": "3.13.0"
+  "erlang": "26.2.5",
+  "rabbitmq": "3.13.3"
 }