[AzureMonitor] upgrade OTel to v1.11 (#48574)

* upgrade OTel to v1.10 and fix api conflicts * bugfix: should not create exception telemetry when message is empty * test bug: fixing bug with requestData.Success * adding support for net9.0 to csproj and global.json * upgrade OTel to v1.10 and fix api conflicts * bugfix: should not create exception telemetry when message is empty * test bug: fixing bug with requestData.Success * adding support for net9.0 to csproj and global.json * cleanup * bump version 1.11.* * fix for Http * changelogs * changelog * fix unit tests * comment * pr feedback, revert change
Azure · Mar 7, 2025 · 23b666e · 23b666e
1 parent 93bb4b7
commit 23b666e
Show file tree

Hide file tree

Showing 20 changed files with 337 additions and 316 deletions.
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
@@ -180,11 +180,11 @@
 
   <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.Monitor.OpenTelemetry'))">
     <!-- OpenTelemetry dependency approved for Azure.Monitor.OpenTelemetry.Exporter package only -->
-    <PackageReference Update="OpenTelemetry" Version="1.9.0" />
-    <PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
-    <PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
-    <PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
-    <PackageReference Update="OpenTelemetry.PersistentStorage.FileSystem" Version="1.0.0" />
+    <PackageReference Update="OpenTelemetry" Version="1.11.2" />
+    <PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
+    <PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
+    <PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
+    <PackageReference Update="OpenTelemetry.PersistentStorage.FileSystem" Version="1.0.1" />
     <PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="[2.1.1,6.0)" />
     <PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="[2.1.1,6.0)" />
   </ItemGroup>
@@ -373,12 +373,12 @@
     <PackageReference Update="NSubstitute" Version="3.1.0" />
     <PackageReference Update="NUnit" Version="3.13.2" />
     <PackageReference Update="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Update="OpenTelemetry" Version="1.9.0" />
-    <PackageReference Update="OpenTelemetry.Exporter.Console" Version="1.9.0" />
-    <PackageReference Update="OpenTelemetry.Exporter.InMemory" Version="1.9.0" />
-    <PackageReference Update="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
-    <PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
-    <PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.9.0-beta.1" />
+    <PackageReference Update="OpenTelemetry" Version="1.11.2" />
+    <PackageReference Update="OpenTelemetry.Exporter.Console" Version="1.11.2" />
+    <PackageReference Update="OpenTelemetry.Exporter.InMemory" Version="1.11.2" />
+    <PackageReference Update="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
+    <PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
+    <PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.11.0-beta.2" />
     <PackageReference Update="Polly" Version="7.1.0" />
     <PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/CHANGELOG.md b/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/CHANGELOG.md
@@ -10,6 +10,13 @@
 
 ### Other Changes
 
+* Update OpenTelemetry dependencies
+  ([#48574](https://github.com/Azure/azure-sdk-for-net/pull/48574))
+  - OpenTelemetry 1.11.2
+  - OpenTelemetry.Extensions.Hosting 1.11.2
+  - OpenTelemetry.Instrumentation.AspNetCore 1.11.1
+  - OpenTelemetry.Instrumentation.Http 1.11.1
+
 ## 1.3.0-beta.2 (2024-10-11)
 
 ### Bugs Fixed

diff --git a/...ing/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs b/...ing/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs
@@ -187,7 +187,7 @@ public override void OnEventWritten(string name, object? payload)
 
                                 if (this.options.RecordException)
                                 {
-                                    activity.RecordException(exception);
+                                    activity.AddException(exception); // TODO: I made this change only to get the build to pass. This has already been fixed in Contrib repo and needs to be synced here
                                 }
                             }
                             else

diff --git a/...metry.AspNetCore.Integration.Tests/SessionRecords/DistroWebAppLiveTests/VerifyDistro.json b/...metry.AspNetCore.Integration.Tests/SessionRecords/DistroWebAppLiveTests/VerifyDistro.json
-Original file line number
+Diff line change
@@ Expand Up @@
                                     if (this.options.RecordException)
                                     {
-                                        activity.RecordException(exception);
+                                        activity.AddException(exception); // TODO: I made this change only to get the build to pass. This has already been fixed in Contrib repo and needs to be synced here
                                     }
                                 }
                                 else
@@ Expand Down @@