Merge branch 'main' into main

Author: RichardChukwu

.github/workflows/fossa.yml

@@ -0,0 +1,20 @@
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry

README.md

@@ -235,7 +235,6 @@ you're more than welcome to participate!
 ([@open-telemetry/dotnet-maintainers](https://github.com/orgs/open-telemetry/teams/dotnet-maintainers)):
 
 * [Alan West](https://github.com/alanwest), New Relic
-* [Mikel Blanchard](https://github.com/CodeBlanch), Microsoft
 * [Rajkumar Rangaraj](https://github.com/rajkumar-rangaraj), Microsoft
 
 [Emeritus Maintainers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager):
@@ -248,6 +247,7 @@ you're more than welcome to participate!
 ([@open-telemetry/dotnet-approvers](https://github.com/orgs/open-telemetry/teams/dotnet-approvers)):
 
 * [Cijo Thomas](https://github.com/cijothomas), Microsoft
+* [Mikel Blanchard](https://github.com/CodeBlanch), Microsoft
 * [Piotr Kiełkowicz](https://github.com/Kielek), Splunk
 
 [Emeritus Approvers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager):

docs/metrics/customizing-the-sdk/Program.cs

@@ -29,19 +29,19 @@ public static void Main()
             .AddView(instrumentName: "MyCounter", name: "MyCounterRenamed")
 
             // Change Histogram boundaries using the Explicit Bucket Histogram aggregation.
-            .AddView(instrumentName: "MyHistogram", new ExplicitBucketHistogramConfiguration() { Boundaries = new double[] { 10, 20 } })
+            .AddView(instrumentName: "MyHistogram", new ExplicitBucketHistogramConfiguration() { Boundaries = [10.0, 20.0] })
 
             // Change Histogram to use the Base2 Exponential Bucket Histogram aggregation.
             .AddView(instrumentName: "MyExponentialBucketHistogram", new Base2ExponentialBucketHistogramConfiguration())
 
             // For the instrument "MyCounterCustomTags", aggregate with only the keys "tag1", "tag2".
-            .AddView(instrumentName: "MyCounterCustomTags", new MetricStreamConfiguration() { TagKeys = new string[] { "tag1", "tag2" } })
+            .AddView(instrumentName: "MyCounterCustomTags", new MetricStreamConfiguration() { TagKeys = ["tag1", "tag2"] })
 
             // Drop the instrument "MyCounterDrop".
             .AddView(instrumentName: "MyCounterDrop", MetricStreamConfiguration.Drop)
 
             // Configure the Explicit Bucket Histogram aggregation with custom boundaries and new name.
-            .AddView(instrumentName: "histogramWithMultipleAggregations", new ExplicitBucketHistogramConfiguration() { Boundaries = new double[] { 10, 20 }, Name = "MyHistogramWithExplicitHistogram" })
+            .AddView(instrumentName: "histogramWithMultipleAggregations", new ExplicitBucketHistogramConfiguration() { Boundaries = [10.0, 20.0], Name = "MyHistogramWithExplicitHistogram" })
 
             // Use Base2 Exponential Bucket Histogram aggregation and new name.
             .AddView(instrumentName: "histogramWithMultipleAggregations", new Base2ExponentialBucketHistogramConfiguration() { Name = "MyHistogramWithBase2ExponentialBucketHistogram" })

examples/AspNetCore/Controllers/WeatherForecastController.cs

@@ -12,10 +12,10 @@ namespace Examples.AspNetCore.Controllers;
 [Route("[controller]")]
 public class WeatherForecastController : ControllerBase
 {
-    private static readonly string[] Summaries = new[]
-    {
-        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching",
-    };
+    private static readonly string[] Summaries =
+    [
+        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+    ];
 
     private static readonly HttpClient HttpClient = new();
 

examples/Console/TestPrometheusExporter.cs

@@ -35,7 +35,7 @@ internal static int Run(PrometheusOptions options)
             .AddMeter(MyMeter.Name)
             .AddMeter(MyMeter2.Name)
             .AddPrometheusHttpListener(
-                o => o.UriPrefixes = new string[] { $"http://localhost:{options.Port}/" })
+                o => o.UriPrefixes = [$"http://localhost:{options.Port}/"])
             .Build();
 
         var process = Process.GetCurrentProcess();

src/OpenTelemetry.Api/Context/Propagation/B3Propagator.cs

@@ -35,7 +35,7 @@ public sealed class B3Propagator : TextMapPropagator
     // "Debug" sampled value.
     internal const string FlagsValue = "1";
 
-    private static readonly HashSet<string> AllFields = new() { XB3TraceId, XB3SpanId, XB3ParentSpanId, XB3Sampled, XB3Flags };
+    private static readonly HashSet<string> AllFields = [XB3TraceId, XB3SpanId, XB3ParentSpanId, XB3Sampled, XB3Flags];
 
     private static readonly HashSet<string> SampledValues = new(StringComparer.Ordinal) { SampledValue, LegacySampledValue };
 

src/OpenTelemetry.Api/Context/Propagation/BaggagePropagator.cs

@@ -20,8 +20,8 @@ public class BaggagePropagator : TextMapPropagator
     private const int MaxBaggageLength = 8192;
     private const int MaxBaggageItems = 180;
 
-    private static readonly char[] EqualSignSeparator = new[] { '=' };
-    private static readonly char[] CommaSignSeparator = new[] { ',' };
+    private static readonly char[] EqualSignSeparator = ['='];
+    private static readonly char[] CommaSignSeparator = [','];
 
     /// <inheritdoc/>
     public override ISet<string> Fields => new HashSet<string> { BaggageHeaderName };

src/OpenTelemetry.Api/Logs/LogRecordSeverityExtensions.cs

@@ -57,8 +57,8 @@ static class LogRecordSeverityExtensions
     internal const string Fatal3ShortName = FatalShortName + "3";
     internal const string Fatal4ShortName = FatalShortName + "4";
 
-    private static readonly string[] LogRecordSeverityShortNames = new string[]
-    {
+    private static readonly string[] LogRecordSeverityShortNames =
+    [
         UnspecifiedShortName,
 
         TraceShortName,
@@ -89,8 +89,8 @@ static class LogRecordSeverityExtensions
         FatalShortName,
         Fatal2ShortName,
         Fatal3ShortName,
-        Fatal4ShortName,
-    };
+        Fatal4ShortName
+    ];
 
     /// <summary>
     /// Returns the OpenTelemetry Specification short name for the <see

src/OpenTelemetry.Exporter.Console/Implementation/ConsoleTagWriter.cs

@@ -73,6 +73,13 @@ protected override void OnUnsupportedTagDropped(
         this.onUnsupportedTagDropped(tagKey, tagValueTypeFullName);
     }
 
+    protected override bool TryWriteEmptyTag(ref ConsoleTag consoleTag, string key, object? value)
+    {
+        consoleTag.Key = key;
+        consoleTag.Value = null;
+        return true;
+    }
+
     internal struct ConsoleTag
     {
         public string? Key;

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md

@@ -16,6 +16,10 @@ Notes](../../RELEASENOTES.md).
   `Activity.StatusDescription` exceeds 127 bytes.
   ([#6119](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6119))
 
+* Fixed incorrect log serialization of attributes with null values, causing
+  some backends to reject logs.
+  ([#6149](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6149))
+
 ## 1.11.1
 
 Released 2025-Jan-22

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpTagWriter.cs

@@ -81,6 +81,13 @@ protected override void OnUnsupportedTagDropped(
             tagValueTypeFullName,
             tagKey);
 
+    protected override bool TryWriteEmptyTag(ref OtlpTagWriterState state, string key, object? value)
+    {
+        state.WritePosition = ProtobufSerializer.WriteStringWithTag(state.Buffer, state.WritePosition, ProtobufOtlpCommonFieldNumberConstants.KeyValue_Key, key);
+        state.WritePosition = ProtobufSerializer.WriteTagAndLength(state.Buffer, state.WritePosition, 0, ProtobufOtlpCommonFieldNumberConstants.KeyValue_Value, ProtobufWireType.LEN);
+        return true;
+    }
+
     internal struct OtlpTagWriterState
     {
         public byte[] Buffer;

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptionsExtensions.cs

@@ -65,7 +65,7 @@ public static THeaders GetHeaders<THeaders>(this OtlpExporterOptions options, Ac
                 {
                     // Specify the maximum number of substrings to return to 2
                     // This treats everything that follows the first `=` in the string as the value to be added for the metadata key
-                    var keyValueData = pair.Split(new char[] { '=' }, 2);
+                    var keyValueData = pair.Split(['='], 2);
                     if (keyValueData.Length != 2)
                     {
                         throw new ArgumentException("Headers provided in an invalid format.");
@@ -174,11 +174,11 @@ public static void TryEnableIHttpClientFactoryIntegration(this OtlpExporterOptio
                             "CreateClient",
                             BindingFlags.Public | BindingFlags.Instance,
                             binder: null,
-                            new Type[] { typeof(string) },
+                            [typeof(string)],
                             modifiers: null);
                         if (createClientMethod != null)
                         {
-                            HttpClient? client = (HttpClient?)createClientMethod.Invoke(httpClientFactory, new object[] { httpClientName });
+                            HttpClient? client = (HttpClient?)createClientMethod.Invoke(httpClientFactory, [httpClientName]);
 
                             if (client != null)
                             {

src/OpenTelemetry.Exporter.Prometheus.HttpListener/PrometheusHttpListenerOptions.cs

@@ -12,7 +12,7 @@ public class PrometheusHttpListenerOptions
 {
     internal const string DefaultScrapeEndpointPath = "/metrics";
 
-    private IReadOnlyCollection<string> uriPrefixes = new[] { "http://localhost:9464/" };
+    private IReadOnlyCollection<string> uriPrefixes = ["http://localhost:9464/"];
 
     /// <summary>
     /// Gets or sets the path to use for the scraping endpoint. Default value: "/metrics".

src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinTagWriter.cs

@@ -64,4 +64,6 @@ protected override void OnUnsupportedTagDropped(
             tagValueTypeFullName,
             tagKey);
     }
+
+    protected override bool TryWriteEmptyTag(ref Utf8JsonWriter state, string key, object? value) => false;
 }

src/OpenTelemetry.Exporter.Zipkin/ZipkinExporterHelperExtensions.cs

@@ -91,7 +91,7 @@ private static BaseProcessor<Activity> BuildZipkinExporterProcessor(
                             "CreateClient",
                             BindingFlags.Public | BindingFlags.Instance,
                             binder: null,
-                            new Type[] { typeof(string) },
+                            [typeof(string)],
                             modifiers: null);
                         if (createClientMethod != null)
                         {

src/OpenTelemetry.Extensions.Propagators/B3Propagator.cs

@@ -35,7 +35,7 @@ public sealed class B3Propagator : TextMapPropagator
     // "Debug" sampled value.
     internal const string FlagsValue = "1";
 
-    private static readonly HashSet<string> AllFields = new() { XB3TraceId, XB3SpanId, XB3ParentSpanId, XB3Sampled, XB3Flags };
+    private static readonly HashSet<string> AllFields = [XB3TraceId, XB3SpanId, XB3ParentSpanId, XB3Sampled, XB3Flags];
 
     private static readonly HashSet<string> SampledValues = new(StringComparer.Ordinal) { SampledValue, LegacySampledValue };
 

src/OpenTelemetry.Extensions.Propagators/JaegerPropagator.cs

@@ -17,7 +17,7 @@ public class JaegerPropagator : TextMapPropagator
     internal const string JaegerDelimiterEncoded = "%3A"; // while the spec defines the delimiter as a ':', some clients will url encode headers.
     internal const string SampledValue = "1";
 
-    internal static readonly string[] JaegerDelimiters = { JaegerDelimiter, JaegerDelimiterEncoded };
+    internal static readonly string[] JaegerDelimiters = [JaegerDelimiter, JaegerDelimiterEncoded];
 
     private static readonly int TraceId128BitLength = "0af7651916cd43dd8448eb211c80319c".Length;
     private static readonly int SpanIdLength = "00f067aa0ba902b7".Length;

src/OpenTelemetry.Shims.OpenTracing/TracerShim.cs

@@ -76,7 +76,7 @@ private TextMapPropagator Propagator
 
             foreach (var entry in textMapCarrier)
             {
-                carrierMap.Add(entry.Key, new[] { entry.Value });
+                carrierMap.Add(entry.Key, [entry.Value]);
             }
 
             static IEnumerable<string>? GetCarrierKeyValue(Dictionary<string, IEnumerable<string>> source, string key)

src/Shared/MathHelper.cs

@@ -12,8 +12,8 @@ namespace OpenTelemetry.Internal;
 internal static class MathHelper
 {
     // https://en.wikipedia.org/wiki/Leading_zero
-    private static readonly byte[] LeadingZeroLookupTable = new byte[]
-    {
+    private static readonly byte[] LeadingZeroLookupTable =
+    [
         8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
         3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -29,8 +29,8 @@ internal static class MathHelper
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    };
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    ];
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static int LeadingZero8(byte value)

src/Shared/Shims/NullableAttributes.cs

@@ -51,7 +51,7 @@ internal sealed class MemberNotNullWhenAttribute : Attribute
         public MemberNotNullWhenAttribute(bool returnValue, string member)
         {
             ReturnValue = returnValue;
-            Members = new[] { member };
+            Members = [member];
         }
 
         public MemberNotNullWhenAttribute(bool returnValue, params string[] members)

src/Shared/TagWriter/TagWriter.cs

@@ -36,7 +36,7 @@ public bool TryWriteTag(
     {
         if (value == null)
         {
-            return false;
+            return this.TryWriteEmptyTag(ref state, key, value);
         }
 
         switch (value)
@@ -117,6 +117,8 @@ public bool TryWriteTag(
         return true;
     }
 
+    protected abstract bool TryWriteEmptyTag(ref TTagState state, string key, object? value);
+
     protected abstract void WriteIntegralTag(ref TTagState state, string key, long value);
 
     protected abstract void WriteFloatingPointTag(ref TTagState state, string key, double value);

test/Benchmarks/Metrics/ExemplarBenchmarks.cs

@@ -41,7 +41,7 @@ namespace Benchmarks.Metrics;
 public class ExemplarBenchmarks
 {
     private static readonly ThreadLocal<Random> ThreadLocalRandom = new(() => new Random());
-    private readonly string[] dimensionValues = new string[] { "DimVal1", "DimVal2", "DimVal3", "DimVal4", "DimVal5", "DimVal6", "DimVal7", "DimVal8", "DimVal9", "DimVal10" };
+    private readonly string[] dimensionValues = ["DimVal1", "DimVal2", "DimVal3", "DimVal4", "DimVal5", "DimVal6", "DimVal7", "DimVal8", "DimVal9", "DimVal10"];
     private Histogram<double>? histogramWithoutTagReduction;
     private Histogram<double>? histogramWithTagReduction;
     private Counter<long>? counterWithoutTagReduction;
@@ -86,7 +86,7 @@ public void Setup()
                 {
                     return new MetricStreamConfiguration()
                     {
-                        TagKeys = new string[] { "DimName1", "DimName2", "DimName3" },
+                        TagKeys = ["DimName1", "DimName2", "DimName3"],
                         ExemplarReservoirFactory = CreateExemplarReservoir,
                     };
                 }

test/Benchmarks/Metrics/HistogramBenchmarks.cs

@@ -46,7 +46,7 @@ public class HistogramBenchmarks
 {
     private const int MaxValue = 10000;
     private readonly Random random = new();
-    private readonly string[] dimensionValues = new string[] { "DimVal1", "DimVal2", "DimVal3", "DimVal4", "DimVal5", "DimVal6", "DimVal7", "DimVal8", "DimVal9", "DimVal10" };
+    private readonly string[] dimensionValues = ["DimVal1", "DimVal2", "DimVal3", "DimVal4", "DimVal5", "DimVal6", "DimVal7", "DimVal8", "DimVal9", "DimVal10"];
     private Histogram<long>? histogram;
     private MeterProvider? meterProvider;
     private Meter? meter;

test/Benchmarks/Metrics/MetricCollectBenchmarks.cs

@@ -25,7 +25,7 @@ namespace Benchmarks.Metrics;
 
 public class MetricCollectBenchmarks
 {
-    private readonly string[] dimensionValues = new string[] { "DimVal1", "DimVal2", "DimVal3", "DimVal4", "DimVal5", "DimVal6", "DimVal7", "DimVal8", "DimVal9", "DimVal10" };
+    private readonly string[] dimensionValues = ["DimVal1", "DimVal2", "DimVal3", "DimVal4", "DimVal5", "DimVal6", "DimVal7", "DimVal8", "DimVal9", "DimVal10"];
 
     // TODO: Confirm if this needs to be thread-safe
     private readonly Random random = new();

test/Benchmarks/Metrics/MetricsBenchmarks.cs

@@ -59,7 +59,7 @@ namespace Benchmarks.Metrics;
 public class MetricsBenchmarks
 {
     private readonly Random random = new();
-    private readonly string[] dimensionValues = new string[] { "DimVal1", "DimVal2", "DimVal3", "DimVal4", "DimVal5", "DimVal6", "DimVal7", "DimVal8", "DimVal9", "DimVal10" };
+    private readonly string[] dimensionValues = ["DimVal1", "DimVal2", "DimVal3", "DimVal4", "DimVal5", "DimVal6", "DimVal7", "DimVal8", "DimVal9", "DimVal10"];
     private Counter<long>? counter;
     private MeterProvider? meterProvider;
     private Meter? meter;

test/Benchmarks/Metrics/MetricsViewBenchmarks.cs

@@ -30,7 +30,7 @@ namespace Benchmarks.Metrics;
 public class MetricsViewBenchmarks
 {
     private static readonly ThreadLocal<Random> ThreadLocalRandom = new(() => new Random());
-    private static readonly string[] DimensionValues = new string[] { "DimVal1", "DimVal2", "DimVal3", "DimVal4", "DimVal5", "DimVal6", "DimVal7", "DimVal8", "DimVal9", "DimVal10" };
+    private static readonly string[] DimensionValues = ["DimVal1", "DimVal2", "DimVal3", "DimVal4", "DimVal5", "DimVal6", "DimVal7", "DimVal8", "DimVal9", "DimVal10"];
     private static readonly int DimensionsValuesLength = DimensionValues.Length;
     private List<Metric>? metrics;
     private Counter<long>? counter;
@@ -96,15 +96,15 @@ public void Setup()
         {
             this.meterProvider = Sdk.CreateMeterProviderBuilder()
                 .AddMeter(this.meter.Name)
-                .AddView("nomatch", new MetricStreamConfiguration() { TagKeys = new string[] { "DimName1", "DimName2", "DimName3" } })
+                .AddView("nomatch", new MetricStreamConfiguration() { TagKeys = ["DimName1", "DimName2", "DimName3"] })
                 .AddInMemoryExporter(this.metrics)
                 .Build();
         }
         else if (this.ViewConfig == ViewConfiguration.ViewApplied)
         {
             this.meterProvider = Sdk.CreateMeterProviderBuilder()
                 .AddMeter(this.meter.Name)
-                .AddView(this.counter.Name, new MetricStreamConfiguration() { TagKeys = new string[] { "DimName1", "DimName2", "DimName3" } })
+                .AddView(this.counter.Name, new MetricStreamConfiguration() { TagKeys = ["DimName1", "DimName2", "DimName3"] })
                 .AddInMemoryExporter(this.metrics)
                 .Build();
         }

test/OpenTelemetry.Api.Tests/Context/Propagation/CompositePropagatorTest.cs

@@ -14,7 +14,7 @@ public class CompositePropagatorTest
         count++;
         if (headers.TryGetValue(name, out var value))
         {
-            return new[] { value };
+            return [value];
         }
 
         return Empty;

test/OpenTelemetry.Api.Tests/Trace/SpanAttributesTest.cs

@@ -19,16 +19,16 @@ public void ValidateAddMethods()
     {
         var spanAttribute = new SpanAttributes();
         spanAttribute.Add("key_string", "string");
-        spanAttribute.Add("key_a_string", new string[] { "string" });
+        spanAttribute.Add("key_a_string", ["string"]);
 
         spanAttribute.Add("key_double", 1.01);
-        spanAttribute.Add("key_a_double", new double[] { 1.01 });
+        spanAttribute.Add("key_a_double", [1.01]);
 
         spanAttribute.Add("key_bool", true);
-        spanAttribute.Add("key_a_bool", new bool[] { true });
+        spanAttribute.Add("key_a_bool", [true]);
 
         spanAttribute.Add("key_long", 1);
-        spanAttribute.Add("key_a_long", new long[] { 1 });
+        spanAttribute.Add("key_a_long", [1L]);
 
         Assert.Equal(8, spanAttribute.Attributes.Count);
     }

test/OpenTelemetry.Exporter.Console.Tests/ConsoleActivityExporterTest.cs

@@ -43,6 +43,6 @@ public void VerifyConsoleActivityExporterDoesntFailWithoutActivityLinkTags()
 
         // Test that the ConsoleExporter correctly handles an Activity without Tags.
         using var consoleExporter = new ConsoleActivityExporter(new ConsoleExporterOptions());
-        Assert.Equal(ExportResult.Success, consoleExporter.Export(new Batch<Activity>(new[] { activity }, 1)));
+        Assert.Equal(ExportResult.Success, consoleExporter.Export(new Batch<Activity>([activity], 1)));
     }
 }