Now that we can use vendored Span<> type in our library, enable the new Traces http/protobuf implementation to run on all runtimes. This also removes the '#if NETCOREAPP3_1_OR_GREATER' from the vendored OpenTelemetry .NET SDK ProtobufSerializer

Author: zacharycmontoya

tracer/src/Datadog.Trace/Agent/AgentWriter.cs

@@ -97,9 +97,7 @@ internal AgentWriter(IApi api, IStatsAggregator? statsAggregator, IStatsdManager
             ISpanBufferSerializer CreateSpanSerializer() => api.TracesEncoding switch
             {
                 TracesEncoding.OtlpJson => new OtlpTracesJsonSerializer(),
-#if NETCOREAPP3_1_OR_GREATER
                 TracesEncoding.OtlpProtobuf => new OpenTelemetry.Traces.OtlpTracesProtobufSerializer(),
-#endif
                 _ => new SpanBufferMessagePackSerializer(SpanFormatterResolver.Instance),
             };
 

tracer/src/Datadog.Trace/OpenTelemetry/Stubs/OpenTelemetryProtocolExporterEventSource.cs

@@ -4,7 +4,6 @@
 // </copyright>
 
 #nullable enable
-#if NETCOREAPP3_1_OR_GREATER
 
 using System;
 
@@ -88,4 +87,3 @@ public void BufferResizeFailedDueToMemory(string signalType)
         }
     }
 }
-#endif

tracer/src/Datadog.Trace/OpenTelemetry/Stubs/OtlpSignalType.cs

@@ -4,7 +4,6 @@
 // </copyright>
 
 #nullable enable
-#if NETCOREAPP3_1_OR_GREATER
 
 namespace Datadog.Trace.Vendors.OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.Serializer
 {
@@ -35,6 +34,3 @@ internal enum OtlpSignalType
         Logs = 3,
     }
 }
-
-#endif
-

tracer/src/Datadog.Trace/OpenTelemetry/Traces/OtlpTracesProtobufSerializer.cs

@@ -3,10 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
 
-#if NETCOREAPP3_1_OR_GREATER
-
 using System;
-using System.Buffers.Binary;
 using Datadog.Trace.Agent;
 using Datadog.Trace.Agent.MessagePack;
 using Datadog.Trace.OpenTelemetry.Common;
@@ -488,5 +485,3 @@ private static void WriteHexBytes(byte[] bytes, int writePosition, string hex, i
         };
     }
 }
-
-#endif

tracer/src/Datadog.Trace/Vendors/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpCommonFieldNumberConstants.cs

@@ -4,18 +4,9 @@
 //------------------------------------------------------------------------------
 #pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
 #nullable enable
-#if NETCOREAPP3_1_OR_GREATER
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace Datadog.Trace.Vendors.OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.Serializer;
 
 /// <summary>
@@ -45,5 +36,3 @@ internal static class ProtobufOtlpCommonFieldNumberConstants
 
     internal const int ArrayValue_Value = 1;
 }
-
-#endif

tracer/src/Datadog.Trace/Vendors/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpTraceFieldNumberConstants.cs

@@ -4,18 +4,9 @@
 //------------------------------------------------------------------------------
 #pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
 #nullable enable
-#if NETCOREAPP3_1_OR_GREATER
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace Datadog.Trace.Vendors.OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.Serializer;
 
 /// <summary>
@@ -86,5 +77,3 @@ internal static class ProtobufOtlpTraceFieldNumberConstants
     internal const int Status_Code_Ok = 1;
     internal const int Status_Code_Error = 2;
 }
-
-#endif

tracer/src/Datadog.Trace/Vendors/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufSerializer.cs

@@ -4,11 +4,9 @@
 //------------------------------------------------------------------------------
 #pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
 #nullable enable
-#if NETCOREAPP3_1_OR_GREATER
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using System.Buffers.Binary;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 #if NETFRAMEWORK || NETSTANDARD2_0
@@ -20,7 +18,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -353,5 +350,3 @@ private static unsafe ref T GetNonNullPinnableReference<T>(ReadOnlySpan<T> span)
         => ref (span.Length != 0) ? ref Unsafe.AsRef(in MemoryMarshal.GetReference(span)) : ref Unsafe.AsRef<T>((void*)1);
 #endif
 }
-
-#endif

tracer/src/Datadog.Trace/Vendors/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufWireType.cs

@@ -4,17 +4,9 @@
 //------------------------------------------------------------------------------
 #pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
 #nullable enable
-#if NETCOREAPP3_1_OR_GREATER
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Datadog.Trace.Vendors.OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.Serializer;
 
@@ -60,5 +52,3 @@ internal enum ProtobufWireType : uint
     /// </summary>
     I32 = 5,
 }
-
-#endif

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/OpenTelemetrySdkTests.cs

@@ -231,7 +231,6 @@ public async Task IntegrationDisabled(string packageVersion)
             }
         }
 
-#if NET6_0_OR_GREATER
         [SkippableTheory]
         [Trait("Category", "EndToEnd")]
         [MemberData(nameof(GetOtlpTracesTestData))]
@@ -531,7 +530,6 @@ await Verifier.Verify(finalJson, settings)
                               .DisableRequireUniquePrefix();
             }
         }
-#endif
 
 #if NET6_0_OR_GREATER
         [SkippableTheory]