Replace ActivityExtensions.SetStatus by Activity.SetStatus

src/OpenTelemetry.Instrumentation.AWS/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+* Trace instrumentation will now call the [Activity.SetStatus](https://learn.microsoft.com/dotnet/api/system.diagnostics.activity.setstatus)
+  API instead of the deprecated OpenTelemetry API package extension when setting
+  span status. For details see: [Setting Status](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Api/README.md#setting-status).
+  ([#2358](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2358))
+
 ## 1.10.0-beta.1
 
 Released 2024-Nov-23

src/OpenTelemetry.Instrumentation.AWS/Implementation/Tracing/AWSTraceSpan.cs

@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using Amazon.Runtime.Telemetry;
 using Amazon.Runtime.Telemetry.Tracing;
-using OpenTelemetry.Trace;
 
 namespace OpenTelemetry.Instrumentation.AWS.Implementation.Tracing;
 
@@ -60,9 +59,7 @@ public override void RecordException(Exception exception, Attributes? attributes
         var tags = attributes != null ? new TagList(attributes.AllAttributes.ToArray()) : default;
 
         this.activity.AddException(exception, tags);
-#pragma warning disable CS0618 // Type or member is obsolete
-        this.activity.SetStatus(Status.Error.WithDescription(exception.Message));
-#pragma warning restore CS0618 // Type or member is obsolete
+        this.activity.SetStatus(ActivityStatusCode.Error, exception.Message);
     }
 
     public override void End()

src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaWrapper.cs

@@ -192,9 +192,7 @@ private static void OnException(Activity? activity, Exception exception)
             if (activity.IsAllDataRequested)
             {
                 activity.AddException(exception);
-#pragma warning disable CS0618 // Type or member is obsolete
-                activity.SetStatus(Status.Error.WithDescription(exception.Message));
-#pragma warning restore CS0618 // Type or member is obsolete
+                activity.SetStatus(ActivityStatusCode.Error, exception.Message);
             }
         }
     }

src/OpenTelemetry.Instrumentation.AWSLambda/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+* Trace instrumentation will now call the [Activity.SetStatus](https://learn.microsoft.com/dotnet/api/system.diagnostics.activity.setstatus)
+  API instead of the deprecated OpenTelemetry API package extension when setting
+  span status. For details see: [Setting Status](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Api/README.md#setting-status).
+  ([#2358](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2358))
+
 ## 1.10.0-beta.1
 
 Released 2024-Nov-23

src/OpenTelemetry.Instrumentation.ConfluentKafka/CHANGELOG.md

@@ -9,6 +9,11 @@
 * Updated OpenTelemetry core component version(s) to `1.10.0`.
   ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317))
 
+* Trace instrumentation will now call the [Activity.SetStatus](https://learn.microsoft.com/dotnet/api/system.diagnostics.activity.setstatus)
+  API instead of the deprecated OpenTelemetry API package extension when setting
+  span status. For details see: [Setting Status](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Api/README.md#setting-status).
+  ([#2358](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2358))
+
 ## 0.1.0-alpha.2
 
 Released 2024-Sep-18

src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumeResultExtensions.cs

@@ -113,9 +113,7 @@ public static bool TryExtractPropagationContext<TKey, TValue>(
         }
         catch (Exception ex)
         {
-#pragma warning disable CS0618 // Type or member is obsolete
-            processActivity?.SetStatus(Status.Error);
-#pragma warning restore CS0618 // Type or member is obsolete
+            processActivity?.SetStatus(ActivityStatusCode.Error);
             processActivity?.SetTag(SemanticConventions.AttributeErrorType, ex.GetType().FullName);
         }
         finally

src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md

@@ -27,6 +27,11 @@
 * Updated OpenTelemetry core component version(s) to `1.10.0`.
   ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317))
 
+* Trace instrumentation will now call the [Activity.SetStatus](https://learn.microsoft.com/dotnet/api/system.diagnostics.activity.setstatus)
+  API instead of the deprecated OpenTelemetry API package extension when setting
+  span status. For details see: [Setting Status](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Api/README.md#setting-status).
+  ([#2358](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2358))
+
 ## 1.0.0-beta.12
 
 Released 2024-Jun-18

src/OpenTelemetry.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs

@@ -5,7 +5,6 @@
 using System.Diagnostics;
 using System.Reflection;
 using OpenTelemetry.Internal;
-using OpenTelemetry.Trace;
 
 namespace OpenTelemetry.Instrumentation.EntityFrameworkCore.Implementation;
 
@@ -297,9 +296,7 @@ public override void OnEventWritten(string name, object? payload)
                         {
                             if (this.exceptionFetcher.Fetch(payload) is Exception exception)
                             {
-#pragma warning disable CS0618 // Type or member is obsolete
-                                activity.SetStatus(Status.Error.WithDescription(exception.Message));
-#pragma warning restore CS0618 // Type or member is obsolete
+                                activity.SetStatus(ActivityStatusCode.Error, exception.Message);
                             }
                             else
                             {

src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md

@@ -19,6 +19,11 @@
 * Updated OpenTelemetry core component version(s) to `1.10.0`.
   ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317))
 
+* Trace instrumentation will now call the [Activity.SetStatus](https://learn.microsoft.com/dotnet/api/system.diagnostics.activity.setstatus)
+  API instead of the deprecated OpenTelemetry API package extension when setting
+  span status. For details see: [Setting Status](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Api/README.md#setting-status).
+  ([#2358](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2358))
+
 ## 1.0.0-rc.6
 
 Released 2024-Apr-19

src/OpenTelemetry.Instrumentation.Owin/Implementation/DiagnosticsMiddleware.cs

@@ -150,9 +150,7 @@ private static void RequestEnd(IOwinContext owinContext, Exception? exception, l
 
                 if (exception != null)
                 {
-#pragma warning disable CS0618 // Type or member is obsolete
-                    activity.SetStatus(Status.Error);
-#pragma warning restore CS0618 // Type or member is obsolete
+                    activity.SetStatus(ActivityStatusCode.Error);
 
                     if (OwinInstrumentationActivitySource.Options?.RecordException == true)
                     {

src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md

@@ -5,6 +5,11 @@
 * Updated OpenTelemetry core component version(s) to `1.10.0`.
   ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317))
 
+* Trace instrumentation will now call the [Activity.SetStatus](https://learn.microsoft.com/dotnet/api/system.diagnostics.activity.setstatus)
+  API instead of the deprecated OpenTelemetry API package extension when setting
+  span status. For details see: [Setting Status](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Api/README.md#setting-status).
+  ([#2358](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2358))
+
 ## 1.0.0-beta.3
 
 Released 2024-Jun-18

src/OpenTelemetry.Instrumentation.Quartz/Implementation/QuartzDiagnosticListener.cs

@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Reflection;
 using OpenTelemetry.Internal;
-using OpenTelemetry.Trace;
 
 namespace OpenTelemetry.Instrumentation.Quartz.Implementation;
 
@@ -140,9 +139,7 @@ private void OnException(Activity activity, object? payload)
                 activity.AddException(exc);
             }
 
-#pragma warning disable CS0618 // Type or member is obsolete
-            activity.SetStatus(Status.Error.WithDescription(exc.Message));
-#pragma warning restore CS0618 // Type or member is obsolete
+            activity.SetStatus(ActivityStatusCode.Error, exc.Message);
 
             try
             {

src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md

@@ -12,6 +12,11 @@
   recorded (defaults to `false`). This is only supported by client instrumentation.
   ([#2271](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2271))
 
+* Trace instrumentation will now call the [Activity.SetStatus](https://learn.microsoft.com/dotnet/api/system.diagnostics.activity.setstatus)
+  API instead of the deprecated OpenTelemetry API package extension when setting
+  span status. For details see: [Setting Status](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Api/README.md#setting-status).
+  ([#2358](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2358))
+
 ## 1.0.0-rc.18
 
 Released 2024-Oct-28

src/OpenTelemetry.Instrumentation.Wcf/Implementation/ClientChannelInstrumentation.cs

@@ -5,7 +5,6 @@
 using System.ServiceModel.Channels;
 using OpenTelemetry.Context.Propagation;
 using OpenTelemetry.Internal;
-using OpenTelemetry.Trace;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Implementation;
 
@@ -92,9 +91,7 @@ public static void AfterRequestCompleted(Message? reply, RequestTelemetryState?
             {
                 if (reply == null || reply.IsFault)
                 {
-#pragma warning disable CS0618 // Type or member is obsolete
-                    activity.SetStatus(Status.Error);
-#pragma warning restore CS0618 // Type or member is obsolete
+                    activity.SetStatus(ActivityStatusCode.Error);
 
                     if (WcfInstrumentationActivitySource.Options!.RecordException && exception != null)
                     {

src/OpenTelemetry.Instrumentation.Wcf/Implementation/TelemetryDispatchMessageInspector.cs

@@ -8,7 +8,6 @@
 using System.ServiceModel.Dispatcher;
 using OpenTelemetry.Context.Propagation;
 using OpenTelemetry.Internal;
-using OpenTelemetry.Trace;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Implementation;
 
@@ -123,9 +122,7 @@ public void BeforeSendReply(ref Message reply, object? correlationState)
             {
                 if (reply.IsFault)
                 {
-#pragma warning disable CS0618 // Type or member is obsolete
-                    activity.SetStatus(Status.Error);
-#pragma warning restore CS0618 // Type or member is obsolete
+                    activity.SetStatus(ActivityStatusCode.Error);
                 }
 
                 activity.SetTag(WcfInstrumentationConstants.SoapReplyActionTag, reply.Headers.Action);

test/OpenTelemetry.Instrumentation.AWSLambda.Tests/AWSLambdaWrapperTests.cs

@@ -279,7 +279,10 @@ private void AssertSpanAttributes(Activity activity)
 
     private void AssertSpanException(Activity activity)
     {
-        Assert.Equal("ERROR", activity.GetTagValue(SpanAttributeConstants.StatusCodeKey));
-        Assert.NotNull(activity.GetTagValue(SpanAttributeConstants.StatusDescriptionKey));
+        Assert.Equal(ActivityStatusCode.Error, activity.Status);
+        Assert.Equal("TestException", activity.StatusDescription);
+        var exception = Assert.Single(activity.Events);
+        Assert.Equal("exception", exception.Name);
+        Assert.Equal("TestException", exception.Tags.SingleOrDefault(t => t.Key.Equals("exception.message")).Value);
     }
 }

test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs

@@ -289,7 +289,6 @@ private static void VerifyActivityData(Activity activity, bool isError = false,
         {
             Assert.Equal(ActivityStatusCode.Error, activity.Status);
             Assert.Equal("SQLite Error 1: 'no such table: no_table'.", activity.StatusDescription);
-            Assert.Contains(activity.Tags, t => t.Key == SpanAttributeConstants.StatusDescriptionKey);
         }
     }
 

test/OpenTelemetry.Instrumentation.Quartz.Tests/QuartzDiagnosticListenerTests.cs

@@ -186,9 +186,10 @@ public async Task Should_Record_Exception_When_Record_Exception_Enabled()
         Assert.Single(exportedItems);
         var activity = exportedItems[0];
 
-        Assert.Equal("exception", activity.Events.First().Name);
-        Assert.Equal("ERROR", activity.Tags.SingleOrDefault(t => t.Key.Equals(SpanAttributeConstants.StatusCodeKey)).Value);
-        Assert.Equal("Catch me if you can!", activity.Tags.SingleOrDefault(t => t.Key.Equals(SpanAttributeConstants.StatusDescriptionKey)).Value);
+        Assert.Equal(ActivityStatusCode.Error, activity.Status);
+        var exception = Assert.Single(activity.Events);
+        Assert.Equal("exception", exception.Name);
+        Assert.Equal("Catch me if you can!", exception.Tags.SingleOrDefault(t => t.Key.Equals("exception.message")).Value);
     }
 
     [Fact]
@@ -253,8 +254,10 @@ public async Task Should_Enrich_Exception_When_Record_Exception_Enabled_And_Enri
         Assert.Single(exportedItems);
         var activity = exportedItems[0];
 
-        Assert.Equal("ERROR", activity.Tags.SingleOrDefault(t => t.Key.Equals(SpanAttributeConstants.StatusCodeKey)).Value);
-        Assert.Equal("Catch me if you can!", activity.Tags.SingleOrDefault(t => t.Key.Equals(SpanAttributeConstants.StatusDescriptionKey)).Value);
+        Assert.Equal(ActivityStatusCode.Error, activity.Status);
+        var exception = Assert.Single(activity.Events);
+        Assert.Equal("exception", exception.Name);
+        Assert.Equal("Catch me if you can!", exception.Tags.SingleOrDefault(t => t.Key.Equals("exception.message")).Value);
         Assert.Equal(testId, activity.Tags.SingleOrDefault(t => t.Key.Equals("test.id")).Value);
     }