From 102e6a588570e477b783c4aae641cb1eea6b6cda Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Tue, 9 Apr 2024 08:40:29 +0100
Subject: [PATCH] Use OpenTelemetry preview packages

Use OpenTelemetry preview packages to consume fix from open-telemetry/opentelemetry-dotnet#5520.
---
 Directory.Packages.props                         | 6 +++---
 NuGet.config                                     | 8 ++++++++
 src/LondonTravel.Skill/LondonTravel.Skill.csproj | 3 ---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 85b2cc84..404621b5 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -28,9 +28,9 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="MSTest.TestFramework" Version="3.3.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="OpenTelemetry" Version="1.8.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
+    <PackageVersion Include="OpenTelemetry" Version="1.8.1-alpha.0.20" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1-alpha.0.20" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1-alpha.0.20" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.1.0-beta.4" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.3.0-beta.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
diff --git a/NuGet.config b/NuGet.config
index 38ac8e75..2a43978d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,9 +2,17 @@
 <configuration>
   <packageSources>
     <clear />
+    <add key="OpenTelemetry" value="https://www.myget.org/F/opentelemetry/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <packageSourceMapping>
+    <packageSource key="OpenTelemetry">
+      <package pattern="OpenTelemetry" />
+      <package pattern="OpenTelemetry.Api" />
+      <package pattern="OpenTelemetry.Api.ProviderBuilderExtensions" />
+      <package pattern="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+      <package pattern="OpenTelemetry.Extensions.Hosting" />
+    </packageSource>
     <packageSource key="NuGet">
       <package pattern="*" />
     </packageSource>
diff --git a/src/LondonTravel.Skill/LondonTravel.Skill.csproj b/src/LondonTravel.Skill/LondonTravel.Skill.csproj
index 9a198b0d..4ed45c63 100644
--- a/src/LondonTravel.Skill/LondonTravel.Skill.csproj
+++ b/src/LondonTravel.Skill/LondonTravel.Skill.csproj
@@ -13,9 +13,6 @@
     <RootNamespace>MartinCostello.LondonTravel.Skill</RootNamespace>
     <TargetFramework>net9.0</TargetFramework>
     <TieredCompilation>false</TieredCompilation>
-    <!-- HACK Workaround for https://github.com/open-telemetry/opentelemetry-dotnet/issues/5518 -->
-    <TrimmerSingleWarn>false</TrimmerSingleWarn>
-    <PublishAot>false</PublishAot>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(PublishForAWSLambda)' == 'true' ">
     <AssemblyName>bootstrap</AssemblyName>