[geneva] Updates for 1.10.0-rc.1 (open-telemetry#2294)

Author: CodeBlanch

src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md

@@ -19,6 +19,9 @@
   For configuration details see:
   [OtlpProtobufEncoding](./README.md#otlpprotobufencoding).
 
+* Update OpenTelemetry SDK version to `1.10.0-rc.1`.
+  ([#2294](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2294))
+
 ## 1.9.0
 
 Released 2024-Jun-21

src/OpenTelemetry.Exporter.Geneva/Common.GenevaExporter.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <OTelSdkVersion>$(OpenTelemetryCoreLatestVersion)</OTelSdkVersion>
+    <OTelSdkVersion>$(OpenTelemetryCoreLatestPrereleaseVersion)</OTelSdkVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(OTelSdkVersion.Contains('alpha')) OR $(OTelSdkVersion.Contains('beta')) OR $(OTelSdkVersion.Contains('rc'))">

src/OpenTelemetry.Exporter.Geneva/Internal/ReentrantExportProcessor.cs

@@ -1,38 +1,18 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using System.Linq.Expressions;
-using System.Reflection;
-
 namespace OpenTelemetry.Exporter.Geneva;
 
-// This export processor exports without synchronization.
-// Once OpenTelemetry .NET officially support this,
-// we can get rid of this class.
-// This is currently only used in ETW export, where we know
-// that the underlying system is safe under concurrent calls.
 internal class ReentrantExportProcessor<T> : BaseExportProcessor<T>
     where T : class
 {
-    private static readonly Func<T, Batch<T>> CreateBatch = BuildCreateBatchDelegate();
-
     public ReentrantExportProcessor(BaseExporter<T> exporter)
         : base(exporter)
     {
     }
 
     protected override void OnExport(T data)
     {
-        this.exporter.Export(CreateBatch(data));
-    }
-
-    private static Func<T, Batch<T>> BuildCreateBatchDelegate()
-    {
-        var flags = BindingFlags.Instance | BindingFlags.NonPublic;
-        var ctor = typeof(Batch<T>).GetConstructor(flags, null, new Type[] { typeof(T) }, null)
-            ?? throw new InvalidOperationException("Batch ctor accepting a single item could not be found reflectively");
-        var value = Expression.Parameter(typeof(T), null);
-        var lambda = Expression.Lambda<Func<T, Batch<T>>>(Expression.New(ctor, value), value);
-        return lambda.Compile();
+        this.exporter.Export(new(data));
     }
 }

test/OpenTelemetry.Exporter.Geneva.Benchmarks/Exporter/TLDTraceExporterBenchmarks.cs

@@ -55,7 +55,7 @@ public TLDTraceExporterBenchmarks()
             this.activity = testActivity!;
             this.activity.SetTag("tagString", "value");
             this.activity.SetTag("tagInt", 100);
-            this.activity.SetStatus(Status.Error);
+            this.activity.SetStatus(ActivityStatusCode.Error);
         }
 
         this.msgPackExporter = new MsgPackTraceExporter(new GenevaExporterOptions
@@ -128,7 +128,7 @@ private Batch<Activity> CreateBatch()
         {
             activity.SetTag("tagString", "value");
             activity.SetTag("tagInt", 100);
-            activity.SetStatus(Status.Error);
+            activity.SetStatus(ActivityStatusCode.Error);
         }
 
         return batchGeneratorExporter.Batch;

test/OpenTelemetry.Exporter.Geneva.Benchmarks/Exporter/TraceExporterBenchmarks.cs

@@ -54,7 +54,7 @@ public TraceExporterBenchmarks()
             this.activity = testActivity!;
             this.activity.SetTag("tagString", "value");
             this.activity.SetTag("tagInt", 100);
-            this.activity.SetStatus(Status.Error);
+            this.activity.SetStatus(ActivityStatusCode.Error);
         }
 
         activityListener.Dispose();
@@ -129,7 +129,7 @@ private Batch<Activity> CreateBatch()
         {
             activity.SetTag("tagString", "value");
             activity.SetTag("tagInt", 100);
-            activity.SetStatus(Status.Error);
+            activity.SetStatus(ActivityStatusCode.Error);
         }
 
         return batchGeneratorExporter.Batch;

test/OpenTelemetry.Exporter.Geneva.Tests/GenevaTraceExporterTests.cs

@@ -175,12 +175,12 @@ public void GenevaTraceExporter_Success_Windows()
 
         using (var activity = source.StartActivity("Bar"))
         {
-            activity.SetStatus(Status.Error);
+            activity.SetStatus(ActivityStatusCode.Error);
         }
 
         using (var activity = source.StartActivity("Baz"))
         {
-            activity.SetStatus(Status.Ok);
+            activity.SetStatus(ActivityStatusCode.Ok);
         }
     }
 
@@ -298,21 +298,25 @@ public void GenevaTraceExporter_Serialization_Success(bool hasTableNameMapping,
                     activity?.SetTag("clientRequestId", "58a37988-2c05-427a-891f-5e0e1266fcc5");
                     activity?.SetTag("foo", 1);
                     activity?.SetTag("bar", 2);
+#pragma warning disable CS0618 // Type or member is obsolete
                     activity?.SetStatus(Status.Error.WithDescription("Error description from OTel API"));
+#pragma warning restore CS0618 // Type or member is obsolete
                 }
             }
 
             using (var activity = source.StartActivity("TestActivityForSetStatusAPI"))
             {
-                activity?.SetStatus(ActivityStatusCode.Error, "Error description from .NET API");
+                activity?.SetStatus(ActivityStatusCode.Error, description: "Error description from .NET API");
             }
 
             // If the activity Status is set using both the OTel API and the .NET API, the `Status` and `StatusDescription` set by
             // the .NET API is chosen
             using (var activity = source.StartActivity("PreferStatusFromDotnetAPI"))
             {
+#pragma warning disable CS0618 // Type or member is obsolete
                 activity?.SetStatus(Status.Error.WithDescription("Error description from OTel API"));
-                activity?.SetStatus(ActivityStatusCode.Error, "Error description from .NET API");
+#pragma warning restore CS0618 // Type or member is obsolete
+                activity?.SetStatus(ActivityStatusCode.Error, description: "Error description from .NET API");
                 customChecksForActivity = mapping =>
                 {
                     Assert.Equal("Error description from .NET API", mapping["statusMessage"]);
@@ -680,17 +684,19 @@ private void AssertFluentdForwardModeForActivity(GenevaExporterOptions exporterO
         Assert.Equal((byte)activity.Kind, mapping["kind"]);
         Assert.Equal(activity.StartTimeUtc, mapping["startTime"]);
 
-        var activityStatusCode = activity.GetStatus().StatusCode;
+#pragma warning disable CS0618 // Type or member is obsolete
+        var otelApiStatusCode = activity.GetStatus();
+#pragma warning restore CS0618 // Type or member is obsolete
 
         if (activity.Status == ActivityStatusCode.Error)
         {
             Assert.False((bool)mapping["success"]);
             Assert.Equal(activity.StatusDescription, mapping["statusMessage"]);
         }
-        else if (activityStatusCode == StatusCode.Error)
+        else if (otelApiStatusCode.StatusCode == StatusCode.Error)
         {
             Assert.False((bool)mapping["success"]);
-            var activityStatusDesc = activity.GetStatus().Description;
+            var activityStatusDesc = otelApiStatusCode.Description;
             Assert.Equal(activityStatusDesc, mapping["statusMessage"]);
         }
         else