[AzureMonitor] update OTel to 1.9.0-rc.1 (#44522)

* update OTel to 1.9.0-rc.1 * changelog * remove old pragma warning * update todo
Azure · Jun 13, 2024 · ddb2d0b · ddb2d0b
1 parent f907762
commit ddb2d0b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
@@ -168,9 +168,8 @@
 
   <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.Monitor.OpenTelemetry'))">
     <!-- OpenTelemetry dependency approved for Azure.Monitor.OpenTelemetry.Exporter package only -->
-    <PackageReference Update="OpenTelemetry" Version="1.8.1" />
-    <PackageReference Update="OpenTelemetry.Exporter.InMemory" Version="1.8.1" />
-    <PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
+    <PackageReference Update="OpenTelemetry" Version="1.9.0-rc.1" />
+    <PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.9.0-rc.1" />
     <PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
     <PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
     <PackageReference Update="OpenTelemetry.PersistentStorage.FileSystem" Version="1.0.0" />
@@ -334,7 +333,8 @@
     <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.8.1" />
+    <PackageReference Update="OpenTelemetry" Version="1.9.0-rc.1" />
+    <PackageReference Update="OpenTelemetry.Exporter.InMemory" Version="1.9.0-rc.1" />
     <PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.6.0-beta.3" />
     <PackageReference Update="Polly" Version="7.1.0" />
     <PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/CHANGELOG.md b/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/CHANGELOG.md
@@ -20,6 +20,11 @@
   (This feature was originally introduced in 1.2.0-beta.1)
   ([#44511](https://github.com/Azure/azure-sdk-for-net/pull/44511))
 
+* Update OpenTelemetry dependencies.
+  ([#44522](https://github.com/Azure/azure-sdk-for-net/pull/44522))
+  - OpenTelemetry 1.9.0-rc.1
+  - OpenTelemetry.Extensions.Hosting 1.9.0-rc.1
+
 ## 1.2.0 (2024-06-11)
 
 ### Other Changes

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/src/OpenTelemetryBuilderExtensions.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/src/OpenTelemetryBuilderExtensions.cs
@@ -50,12 +50,7 @@ public static class OpenTelemetryBuilderExtensions
         /// <item>SQL Client.</item>
         /// </list>
         /// </remarks>
-#pragma warning disable CS0618 // Type or member is obsolete
-        // Note: OpenTelemetryBuilder is obsolete because users should target
-        // IOpenTelemetryBuilder for extensions but this method is valid and
-        // expected to be called to obtain a root builder.
         public static OpenTelemetryBuilder UseAzureMonitor(this OpenTelemetryBuilder builder)
-#pragma warning restore CS0618 // Type or member is obsolete
         {
             builder.Services.TryAddSingleton<IConfigureOptions<AzureMonitorOptions>,
                         DefaultAzureMonitorOptions>();
@@ -82,12 +77,7 @@ public static OpenTelemetryBuilder UseAzureMonitor(this OpenTelemetryBuilder bui
         /// <item>SQL Client.</item>
         /// </list>
         /// </remarks>
-#pragma warning disable CS0618 // Type or member is obsolete
-        // Note: OpenTelemetryBuilder is obsolete because users should target
-        // IOpenTelemetryBuilder for extensions but this method is valid and
-        // expected to be called to obtain a root builder.
         public static OpenTelemetryBuilder UseAzureMonitor(this OpenTelemetryBuilder builder, Action<AzureMonitorOptions> configureAzureMonitor)
-#pragma warning restore CS0618 // Type or member is obsolete
         {
             if (builder.Services == null)
             {

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/CHANGELOG.md b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/CHANGELOG.md
@@ -9,6 +9,10 @@
   (This feature was originally introduced in 1.3.0-beta.1)
   ([#44511](https://github.com/Azure/azure-sdk-for-net/pull/44511))
 
+* Update OpenTelemetry dependencies
+  ([#44522](https://github.com/Azure/azure-sdk-for-net/pull/44522))
+  - OpenTelemetry 1.9.0-rc.1
+
 ## 1.3.0 (2024-06-07)
 
 ### Other Changes

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Customizations/Models/MessageData.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Customizations/Models/MessageData.cs
@@ -17,7 +17,10 @@ public MessageData(int version, LogRecord logRecord) : base(version)
             Properties = new ChangeTrackingDictionary<string, string>();
             Measurements = new ChangeTrackingDictionary<string, double>();
             Message = LogsHelper.GetMessageAndSetProperties(logRecord, Properties).Truncate(SchemaConstants.MessageData_Message_MaxLength);
+#pragma warning disable CS0618 // Type or member is obsolete
+            // TODO: Remove warning disable with next Stable release.
             SeverityLevel = LogsHelper.GetSeverityLevel(logRecord.LogLevel);
+#pragma warning restore CS0618 // Type or member is obsolete
         }
     }
 }
diff --git a/.../Azure.Monitor.OpenTelemetry.Exporter/src/Customizations/Models/TelemetryExceptionData.cs b/.../Azure.Monitor.OpenTelemetry.Exporter/src/Customizations/Models/TelemetryExceptionData.cs
@@ -28,7 +28,10 @@ public TelemetryExceptionData(int version, LogRecord logRecord) : base(version)
 
             var message = LogsHelper.GetMessageAndSetProperties(logRecord, Properties);
 
+#pragma warning disable CS0618 // Type or member is obsolete
+            // TODO: Remove warning disable with next Stable release.
             SeverityLevel = LogsHelper.GetSeverityLevel(logRecord.LogLevel);
+#pragma warning restore CS0618 // Type or member is obsolete
             ProblemId = LogsHelper.GetProblemId(logRecord.Exception).Truncate(SchemaConstants.ExceptionData_ProblemId_MaxLength);
 
             // collect the set of exceptions detail info from the passed in exception