From fcfafc905c4b83bebcb878d27b63a69d29ca89ca Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Sun, 21 Jun 2026 14:30:11 -0500
Subject: [PATCH 1/4] Mark OpenTelemetry libraries as AOT/trim compatible

Set IsAotCompatible=true for production libraries targeting net8.0+ so the trim/AOT/single-file analyzers run and the assemblies are marked trimmable.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 build/Common.prod.props | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/Common.prod.props b/build/Common.prod.props
index a0de59e9ce6..895a429b8d3 100644
--- a/build/Common.prod.props
+++ b/build/Common.prod.props
@@ -10,6 +10,14 @@
     <EnablePackageValidation Condition="'$(EnablePackageValidation)' == ''">false</EnablePackageValidation>
   </PropertyGroup>
 
+  <PropertyGroup Label="TrimAndAotCompatibility"
+                 Condition="'$(IsAotCompatible)' == '' AND $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+    <!-- Note: Production libraries are marked AOT (and trim) compatible for .NET
+    targets greater than net7.0. This enables the trim, AOT, and single-file
+    analyzers for those targets. -->
+    <IsAotCompatible>true</IsAotCompatible>
+  </PropertyGroup>
+
   <PropertyGroup Label="PackageProperties">
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/open-telemetry/opentelemetry-dotnet</RepositoryUrl>

From dc2c05b00a79b62fc842f3f94511d35492bb3818 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Sun, 21 Jun 2026 14:41:37 -0500
Subject: [PATCH 2/4] Add CHANGELOG entries and drop redundant comment

Address PR feedback: document trim/AOT compatibility in each package CHANGELOG and remove the self-descriptive comment in Common.prod.props.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 build/Common.prod.props                                        | 3 ---
 src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md   | 3 +++
 src/OpenTelemetry.Api/CHANGELOG.md                             | 3 +++
 src/OpenTelemetry.Exporter.Console/CHANGELOG.md                | 3 +++
 src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md               | 3 +++
 src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md  | 3 +++
 src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md  | 3 +++
 .../CHANGELOG.md                                               | 3 +++
 src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md                 | 3 +++
 src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md              | 3 +++
 src/OpenTelemetry.Extensions.Propagators/CHANGELOG.md          | 3 +++
 src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md               | 3 +++
 src/OpenTelemetry/CHANGELOG.md                                 | 3 +++
 13 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/build/Common.prod.props b/build/Common.prod.props
index 895a429b8d3..aa8d151a612 100644
--- a/build/Common.prod.props
+++ b/build/Common.prod.props
@@ -12,9 +12,6 @@
 
   <PropertyGroup Label="TrimAndAotCompatibility"
                  Condition="'$(IsAotCompatible)' == '' AND $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-    <!-- Note: Production libraries are marked AOT (and trim) compatible for .NET
-    targets greater than net7.0. This enables the trim, AOT, and single-file
-    analyzers for those targets. -->
     <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
diff --git a/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md b/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md
index 2622eae474e..ad84b0727ba 100644
--- a/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md
+++ b/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md
@@ -7,6 +7,9 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 ## 1.16.0
 
 Released 2026-Jun-10
diff --git a/src/OpenTelemetry.Api/CHANGELOG.md b/src/OpenTelemetry.Api/CHANGELOG.md
index 694925ee6e8..e7754d9cbc6 100644
--- a/src/OpenTelemetry.Api/CHANGELOG.md
+++ b/src/OpenTelemetry.Api/CHANGELOG.md
@@ -6,6 +6,9 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 * Fixed `TraceContextPropagator` to normalize empty `tracestate` header values
   to `null` when extracting trace context.
   ([#7407](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7407))
diff --git a/src/OpenTelemetry.Exporter.Console/CHANGELOG.md b/src/OpenTelemetry.Exporter.Console/CHANGELOG.md
index 7ee2374e17b..1d663562144 100644
--- a/src/OpenTelemetry.Exporter.Console/CHANGELOG.md
+++ b/src/OpenTelemetry.Exporter.Console/CHANGELOG.md
@@ -6,6 +6,9 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 ## 1.16.0
 
 Released 2026-Jun-10
diff --git a/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md b/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md
index f0cb1e24095..39a146d3b1f 100644
--- a/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md
+++ b/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md
@@ -6,6 +6,9 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 ## 1.16.0
 
 Released 2026-Jun-10
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md
index a85a27f72bf..bc21c90d446 100644
--- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md
+++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md
@@ -7,6 +7,9 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 * Fixed `OtlpLogExporter` so `OtlpExporterOptions.ExportProcessorType` and
   `OtlpExporterOptions.BatchExportProcessorOptions` are respected when
   `LogRecordExportProcessorOptions` are not configured.
diff --git a/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md b/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md
index 0e9add6b5e4..cfa9d192f78 100644
--- a/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md
+++ b/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md
@@ -7,6 +7,9 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 ## 1.16.0-beta.1
 
 Released 2026-Jun-10
diff --git a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md
index 505ad815c36..4b5cf11ca80 100644
--- a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md
+++ b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md
@@ -7,6 +7,9 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 ## 1.16.0-beta.1
 
 Released 2026-Jun-10
diff --git a/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md b/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md
index 46eb60af056..88351bffbcb 100644
--- a/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md
+++ b/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md
@@ -6,6 +6,9 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 ## 1.16.0
 
 Released 2026-Jun-10
diff --git a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md
index b8c61d0f10b..e372460879b 100644
--- a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md
+++ b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md
@@ -6,6 +6,9 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 ## 1.16.0
 
 Released 2026-Jun-10
diff --git a/src/OpenTelemetry.Extensions.Propagators/CHANGELOG.md b/src/OpenTelemetry.Extensions.Propagators/CHANGELOG.md
index 73a291104f1..82ed52154ea 100644
--- a/src/OpenTelemetry.Extensions.Propagators/CHANGELOG.md
+++ b/src/OpenTelemetry.Extensions.Propagators/CHANGELOG.md
@@ -6,6 +6,9 @@ covering all components see: [Release Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 ## 1.16.0
 
 Released 2026-Jun-10
diff --git a/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md b/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md
index 6efc20b277d..8ef65dd06d5 100644
--- a/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md
+++ b/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md
@@ -6,6 +6,9 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 ## 1.16.0-beta.1
 
 Released 2026-Jun-10
diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md
index f769d92e9d0..fd0396eca3d 100644
--- a/src/OpenTelemetry/CHANGELOG.md
+++ b/src/OpenTelemetry/CHANGELOG.md
@@ -6,6 +6,9 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 * Fixed a metric point reclaim data race on CPU ARM architectures.
   ([#7401](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7401))
 

From 649b25b17bc2d41ae20a25a0b36400a709ebd237 Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Sun, 21 Jun 2026 20:52:03 +0100
Subject: [PATCH 3/4] [Infra] Move CHANGELOG entries

Move to the end of the sections.
---
 .../CHANGELOG.md                                            | 6 +++---
 src/OpenTelemetry/CHANGELOG.md                              | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md
index bc21c90d446..ceb56237088 100644
--- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md
+++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md
@@ -7,14 +7,14 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
-* The library is now marked as trim and AOT compatible.
-  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
-
 * Fixed `OtlpLogExporter` so `OtlpExporterOptions.ExportProcessorType` and
   `OtlpExporterOptions.BatchExportProcessorOptions` are respected when
   `LogRecordExportProcessorOptions` are not configured.
   ([#7399](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7399))
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 ## 1.16.0
 
 Released 2026-Jun-10
diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md
index fd0396eca3d..4e3e70c69d6 100644
--- a/src/OpenTelemetry/CHANGELOG.md
+++ b/src/OpenTelemetry/CHANGELOG.md
@@ -6,12 +6,12 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
-* The library is now marked as trim and AOT compatible.
-  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
-
 * Fixed a metric point reclaim data race on CPU ARM architectures.
   ([#7401](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7401))
 
+* The library is now marked as trim and AOT compatible.
+  ([#7441](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7441))
+
 ## 1.16.0
 
 Released 2026-Jun-10

From b173233696def0b8c41bd9b0c7cd5d8fd161463b Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Sun, 21 Jun 2026 20:55:03 +0100
Subject: [PATCH 4/4] [Infra] Fix lint warning

Make the indentation linter happy.
---
 build/Common.prod.props | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build/Common.prod.props b/build/Common.prod.props
index aa8d151a612..26d147bbf09 100644
--- a/build/Common.prod.props
+++ b/build/Common.prod.props
@@ -10,8 +10,7 @@
     <EnablePackageValidation Condition="'$(EnablePackageValidation)' == ''">false</EnablePackageValidation>
   </PropertyGroup>
 
-  <PropertyGroup Label="TrimAndAotCompatibility"
-                 Condition="'$(IsAotCompatible)' == '' AND $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+  <PropertyGroup Label="TrimAndAotCompatibility" Condition="'$(IsAotCompatible)' == '' AND $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
     <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>