From f36873765a0babf7b8b428a44f1a06917efbc942 Mon Sep 17 00:00:00 2001
From: Utkarsh Umesan Pillai <66651184+utpilla@users.noreply.github.com>
Date: Fri, 9 Jun 2023 17:16:59 -0700
Subject: [PATCH 1/3] Update System.Diagnostics.DiagnosticSource package
 version to 7.0.2

---
 Directory.Packages.props | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 155842462b..f649eb08fe 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -24,28 +24,10 @@
     <PackageVersion Include="MinVer" Version="[4.2.0,5.0)" />
     <PackageVersion Include="OpenTracing" Version="[0.12.1,0.13)" />
     <PackageVersion Include="StyleCop.Analyzers" Version="[1.2.0-beta.435,2.0)" />
-
-    <!--
-        Typically, the latest stable version of System.Diagnostics.DiagnosticSource should be used here because:
-        1) Each major version bump will have some new OpenTelemetry API capabilities (e.g. .NET 6 introduced Meter
-          API, .NET 7 added UpDownCounter, .NET 8 is adding Meter/Instrument level attributes support, .NET 9 might
-          add Advice/Hint API) that the OpenTelemetry components rely on.
-        2) Each minor version bump is normally security hotfixes or critical bug fixes.
-        3) The .NET runtime team provides extra backward compatibility guarantee to System.Diagnostics.DiagnosticSource
-          even during major version bumps, so compatibility is not a concern here.
-    -->
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
-
-    <!-- A conservative version of System.Reflection.Emit.Lightweight must be used here since there is no backward compatibility guarantee during major version bumps. -->
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
     <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
-
-    <!-- A conservative version of System.Text.Encodings.Web must be used here since there is no backward compatibility guarantee during major version bumps. -->
     <PackageVersion Include="System.Text.Encodings.Web" Version="4.7.2" />
-
-    <!-- A conservative version of System.Text.Json must be used here since there is no backward compatibility guarantee during major version bumps. -->
     <PackageVersion Include="System.Text.Json" Version="4.7.2" />
-
-    <!-- A conservative version of System.Threading.Tasks.Extensions must be used here since there is no backward compatibility guarantee during major version bumps. -->
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>
 

From 5b4bb6ab8653e12366ec72a1ff8295093d4c5bc7 Mon Sep 17 00:00:00 2001
From: Utkarsh Umesan Pillai <66651184+utpilla@users.noreply.github.com>
Date: Fri, 9 Jun 2023 17:25:28 -0700
Subject: [PATCH 2/3] Update CHANGELOG

---
 src/OpenTelemetry.Api/CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/OpenTelemetry.Api/CHANGELOG.md b/src/OpenTelemetry.Api/CHANGELOG.md
index 01b0805d30..f8512a9b95 100644
--- a/src/OpenTelemetry.Api/CHANGELOG.md
+++ b/src/OpenTelemetry.Api/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Updated `System.Diagnostics.DiagnosticSource` package version to `7.0.2`.
+  ([#4576](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4576))
+
 * **Breaking change** In order to make `RuntimeContext` compatible with
   ahead-of-time compilation (AOT),
   `RuntimeContext.ContextSlotType` can only be assigned one

From 8546f38fd602340764a19d7ea83ba4b8f00b1565 Mon Sep 17 00:00:00 2001
From: Utkarsh Umesan Pillai <66651184+utpilla@users.noreply.github.com>
Date: Fri, 9 Jun 2023 17:32:47 -0700
Subject: [PATCH 3/3] Fix merge

---
 Directory.Packages.props | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index f649eb08fe..34171c7390 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -24,10 +24,28 @@
     <PackageVersion Include="MinVer" Version="[4.2.0,5.0)" />
     <PackageVersion Include="OpenTracing" Version="[0.12.1,0.13)" />
     <PackageVersion Include="StyleCop.Analyzers" Version="[1.2.0-beta.435,2.0)" />
+
+    <!--
+        Typically, the latest stable version of System.Diagnostics.DiagnosticSource should be used here because:
+        1) Each major version bump will have some new OpenTelemetry API capabilities (e.g. .NET 6 introduced Meter
+          API, .NET 7 added UpDownCounter, .NET 8 is adding Meter/Instrument level attributes support, .NET 9 might
+          add Advice/Hint API) that the OpenTelemetry components rely on.
+        2) Each minor version bump is normally security hotfixes or critical bug fixes.
+        3) The .NET runtime team provides extra backward compatibility guarantee to System.Diagnostics.DiagnosticSource
+          even during major version bumps, so compatibility is not a concern here.
+    -->
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
+
+    <!-- A conservative version of System.Reflection.Emit.Lightweight must be used here since there is no backward compatibility guarantee during major version bumps. -->
     <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+
+    <!-- A conservative version of System.Text.Encodings.Web must be used here since there is no backward compatibility guarantee during major version bumps. -->
     <PackageVersion Include="System.Text.Encodings.Web" Version="4.7.2" />
+
+    <!-- A conservative version of System.Text.Json must be used here since there is no backward compatibility guarantee during major version bumps. -->
     <PackageVersion Include="System.Text.Json" Version="4.7.2" />
+
+    <!-- A conservative version of System.Threading.Tasks.Extensions must be used here since there is no backward compatibility guarantee during major version bumps. -->
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>