Merge branch 'main' into fix/#3461

Author: jamescrosswell

CHANGELOG.md

@@ -10,6 +10,7 @@
 ### Fixes
 - Fixed JNI Error when accessing Android device data from multiple threads ([#3802](https://github.com/getsentry/sentry-dotnet/pull/3802))
 - Android - fix bug that prevents logcat.log from getting attached to unhandled events (SIGSEGV Segfault) ([#3694](https://github.com/getsentry/sentry-dotnet/pull/3694))
+- Fix "System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values. (Parameter 'idData')" error propagating OpenTelemetry span ids ([#3850](https://github.com/getsentry/sentry-dotnet/pull/3850))
 
 ### Dependencies
 

src/Sentry/SpanId.cs

@@ -41,7 +41,7 @@ namespace Sentry;
     public override int GetHashCode() => StringComparer.Ordinal.GetHashCode(_value);
 
     /// <inheritdoc />
-    public override string ToString() => _value.ToString("x8");
+    public override string ToString() => _value.ToString("x8").PadLeft(16, '0');
 
     /// <summary>
     /// Generates a new Sentry ID.

test/Sentry.Tests/Protocol/Context/TraceTests.cs

@@ -85,4 +85,15 @@ public void Clone_CopyValues()
         Assert.Equal(trace.SpanId, clone.SpanId);
         Assert.Equal(trace.TraceId, clone.TraceId);
     }
+
+    [Fact]
+    public void SpanId_LeadingZero_ToStringValid()
+    {
+        // Arrange
+        const string spanIdInput = "0ecd6f15f72015cb";
+        var spanId = new SpanId(spanIdInput);
+
+        // Assert
+        Assert.Equal(spanIdInput, spanId.ToString());
+    }
 }