From cc1a83cb1ac39ac07248fa4972ec091a42286ebd Mon Sep 17 00:00:00 2001
From: Madalyn Redding <mredding@microsoft.com>
Date: Wed, 5 Jul 2023 13:39:13 -0700
Subject: [PATCH 1/8] test

---
 eng/Packages.Data.props                                |  2 +-
 sdk/core/Azure.Core/src/Azure.Core.csproj              | 10 +++++++++-
 .../src/Shared/MessagingClientDiagnostics.cs           |  6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 915432a23e17..03ecd92cbced 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -68,7 +68,7 @@
     <PackageReference Update="System.Memory.Data" Version="1.0.2" />
     <PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Update="System.Net.Http" Version="4.3.4" />
-    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="4.6.0" />
+    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
     <PackageReference Update="System.Reflection.TypeExtensions" Version="4.7.0" />
     <PackageReference Update="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.4" />
diff --git a/sdk/core/Azure.Core/src/Azure.Core.csproj b/sdk/core/Azure.Core/src/Azure.Core.csproj
index 919fa69230fa..65f5a16c1a36 100644
--- a/sdk/core/Azure.Core/src/Azure.Core.csproj
+++ b/sdk/core/Azure.Core/src/Azure.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>This is the implementation of the Azure Client Pipeline</Description>
     <AssemblyTitle>Microsoft Azure Client Pipeline</AssemblyTitle>
@@ -23,6 +23,14 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
+  <!-- Keep System.Diagnostics.DiagnosticSource 5.0.0 for netcoreapp2.1 support. -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" VersionOverride="5.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.1' ">
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
diff --git a/sdk/core/Azure.Core/src/Shared/MessagingClientDiagnostics.cs b/sdk/core/Azure.Core/src/Shared/MessagingClientDiagnostics.cs
index 41c968d4072b..e77d6568edb4 100644
--- a/sdk/core/Azure.Core/src/Shared/MessagingClientDiagnostics.cs
+++ b/sdk/core/Azure.Core/src/Shared/MessagingClientDiagnostics.cs
@@ -170,10 +170,10 @@ public void InstrumentMessage(IDictionary<string, object> properties, string act
                     DiagnosticScope.ActivityKind.Producer);
                 messageScope.Start();
 
-                Activity activity = Activity.Current;
+                Activity? activity = Activity.Current;
                 if (activity != null)
                 {
-                    traceparent = activity.Id;
+                    traceparent = activity!.Id!;
                     properties[DiagnosticIdAttribute] = traceparent;
                     if (ActivityExtensions.SupportsActivitySource())
                     {
@@ -192,4 +192,4 @@ public void InstrumentMessage(IDictionary<string, object> properties, string act
             }
         }
     }
-}
\ No newline at end of file
+}

From d0dbba48adb74dc432c0067faf9d2a84dcc17b75 Mon Sep 17 00:00:00 2001
From: Madalyn Redding <mredding@microsoft.com>
Date: Wed, 5 Jul 2023 13:44:58 -0700
Subject: [PATCH 2/8] fix

---
 sdk/core/Azure.Core/src/Azure.Core.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sdk/core/Azure.Core/src/Azure.Core.csproj b/sdk/core/Azure.Core/src/Azure.Core.csproj
index 65f5a16c1a36..ddeaa9b2dbd4 100644
--- a/sdk/core/Azure.Core/src/Azure.Core.csproj
+++ b/sdk/core/Azure.Core/src/Azure.Core.csproj
@@ -33,7 +33,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
     <PackageReference Include="System.Numerics.Vectors" />
     <PackageReference Include="System.Threading.Tasks.Extensions" />
     <PackageReference Include="System.Text.Json" />

From 6bf36c4760900ca40025c13cb2f4794b0d8c86c7 Mon Sep 17 00:00:00 2001
From: Madalyn Redding <mredding@microsoft.com>
Date: Thu, 6 Jul 2023 10:45:25 -0700
Subject: [PATCH 3/8] remove deprecated reference version

---
 sdk/core/Azure.Core/src/Azure.Core.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/core/Azure.Core/src/Azure.Core.csproj b/sdk/core/Azure.Core/src/Azure.Core.csproj
index ddeaa9b2dbd4..5a519b4aaee9 100644
--- a/sdk/core/Azure.Core/src/Azure.Core.csproj
+++ b/sdk/core/Azure.Core/src/Azure.Core.csproj
@@ -23,9 +23,9 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
-  <!-- Keep System.Diagnostics.DiagnosticSource 5.0.0 for netcoreapp2.1 support. -->
+  <!-- Keep System.Diagnostics.DiagnosticSource 4.6.0 for netcoreapp2.1 support. -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" VersionOverride="5.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" VersionOverride="4.6.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.1' ">
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />

From 914f1080d80f054a28b02b6827f160cc1fdbc4bf Mon Sep 17 00:00:00 2001
From: Madalyn Redding <mredding@microsoft.com>
Date: Thu, 6 Jul 2023 16:27:27 -0700
Subject: [PATCH 4/8] DO NOT MERGE

---
 .../src/Azure.Monitor.OpenTelemetry.Exporter.csproj        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
index 2d8baab9787d..5da71b51dbf9 100644
--- a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
+++ b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
@@ -11,12 +11,17 @@
   <ItemGroup>
     <!-- Versions are defined in eng/Packages.Data.props -->
     <!-- Whenever updating OpenTelemetry dependencies, confirm that Test dependencies are also updated. -->
-    <PackageReference Include="Azure.Core" />
+    <!--<PackageReference Include="Azure.Core" />-->
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="OpenTelemetry" />
     <PackageReference Include="OpenTelemetry.PersistentStorage.FileSystem" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\core\Azure.Core\src\Azure.Core.csproj" />
+	    <TrimmerRootAssembly Include="Azure.Core" />
+  </ItemGroup>
+
   <!-- Shared source from Azure.Core -->
   <ItemGroup>
     <Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />

From 8b3eef1dbf8956425d27b70b3fd977d641b32d70 Mon Sep 17 00:00:00 2001
From: Madalyn Redding <mredding@microsoft.com>
Date: Fri, 7 Jul 2023 10:27:18 -0700
Subject: [PATCH 5/8] feedback

---
 sdk/core/Azure.Core/src/Azure.Core.csproj          | 14 ++++++--------
 .../src/Shared/MessagingClientDiagnostics.cs       |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sdk/core/Azure.Core/src/Azure.Core.csproj b/sdk/core/Azure.Core/src/Azure.Core.csproj
index 5a519b4aaee9..30c5e59f32ab 100644
--- a/sdk/core/Azure.Core/src/Azure.Core.csproj
+++ b/sdk/core/Azure.Core/src/Azure.Core.csproj
@@ -23,23 +23,21 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
-  <!-- Keep System.Diagnostics.DiagnosticSource 4.6.0 for netcoreapp2.1 support. -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" VersionOverride="4.6.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.1' ">
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
     <PackageReference Include="System.Numerics.Vectors" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
     <PackageReference Include="System.Threading.Tasks.Extensions" />
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.Text.Encodings.Web" />
     <PackageReference Include="System.Memory.Data" />
   </ItemGroup>
 
+  <!-- Keep System.Diagnostics.DiagnosticSource 4.6.0 for netcoreapp2.1 support. -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" VersionOverride="4.6.0" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <PackageReference Include="System.Net.Http" />
diff --git a/sdk/core/Azure.Core/src/Shared/MessagingClientDiagnostics.cs b/sdk/core/Azure.Core/src/Shared/MessagingClientDiagnostics.cs
index e77d6568edb4..130444cb4b64 100644
--- a/sdk/core/Azure.Core/src/Shared/MessagingClientDiagnostics.cs
+++ b/sdk/core/Azure.Core/src/Shared/MessagingClientDiagnostics.cs
@@ -173,7 +173,7 @@ public void InstrumentMessage(IDictionary<string, object> properties, string act
                 Activity? activity = Activity.Current;
                 if (activity != null)
                 {
-                    traceparent = activity!.Id!;
+                    traceparent = activity.Id!;
                     properties[DiagnosticIdAttribute] = traceparent;
                     if (ActivityExtensions.SupportsActivitySource())
                     {

From b0d381324f3d0ad45a00dd0987a2488f4da41b65 Mon Sep 17 00:00:00 2001
From: Madalyn Redding <mredding@microsoft.com>
Date: Fri, 7 Jul 2023 10:28:41 -0700
Subject: [PATCH 6/8] reverting file

---
 .../src/Azure.Monitor.OpenTelemetry.Exporter.csproj      | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
index 5da71b51dbf9..9414ae19a403 100644
--- a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
+++ b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>An OpenTelemetry .NET exporter that exports to Azure Monitor</Description>
     <AssemblyTitle>AzureMonitor OpenTelemetry Exporter</AssemblyTitle>
@@ -11,17 +11,12 @@
   <ItemGroup>
     <!-- Versions are defined in eng/Packages.Data.props -->
     <!-- Whenever updating OpenTelemetry dependencies, confirm that Test dependencies are also updated. -->
-    <!--<PackageReference Include="Azure.Core" />-->
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="OpenTelemetry" />
     <PackageReference Include="OpenTelemetry.PersistentStorage.FileSystem" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\core\Azure.Core\src\Azure.Core.csproj" />
-	    <TrimmerRootAssembly Include="Azure.Core" />
-  </ItemGroup>
-
   <!-- Shared source from Azure.Core -->
   <ItemGroup>
     <Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />

From 0920d7faae159d91ded2200b8562908094c716b0 Mon Sep 17 00:00:00 2001
From: Madalyn Redding <mredding@microsoft.com>
Date: Fri, 7 Jul 2023 10:30:03 -0700
Subject: [PATCH 7/8] removing extra newline

---
 .../src/Azure.Monitor.OpenTelemetry.Exporter.csproj             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
index 9414ae19a403..7498eb5ee5c5 100644
--- a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
+++ b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
@@ -24,4 +24,4 @@
     <Compile Include="$(AzureCoreSharedSources)EventSourceEventFormatting.cs" LinkBase="Shared" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file

From 638da55ec0da5615857fbc005a6613fb27680f2d Mon Sep 17 00:00:00 2001
From: Madalyn Redding <66138537+m-redding@users.noreply.github.com>
Date: Fri, 7 Jul 2023 10:34:42 -0700
Subject: [PATCH 8/8] fix

---
 .../src/Azure.Monitor.OpenTelemetry.Exporter.csproj           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
index 7498eb5ee5c5..2d8baab9787d 100644
--- a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
+++ b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>An OpenTelemetry .NET exporter that exports to Azure Monitor</Description>
     <AssemblyTitle>AzureMonitor OpenTelemetry Exporter</AssemblyTitle>
@@ -24,4 +24,4 @@
     <Compile Include="$(AzureCoreSharedSources)EventSourceEventFormatting.cs" LinkBase="Shared" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>