getsentry · Flash0ver · Apr 30, 2025 · Apr 30, 2025 · May 5, 2025 · May 5, 2025
@@ -1,5 +1,15 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Add experimental support for [Sentry Structured Logging](https://docs.sentry.io/product/explore/logs/) via `SentrySdk.Experimental.Logger` ([#4158](https://github.com/getsentry/sentry-dotnet/pull/4158))
+- Add experimental integrations of [Sentry Structured Logging](https://docs.sentry.io/product/explore/logs/) ([#4193](https://github.com/getsentry/sentry-dotnet/pull/4193))
+    - `Sentry.AspNetCore`, enabled via `SentryAspNetCoreOptions.Experimental.EnableLogs`
+    - `Sentry.Extensions.Logging`, enabled via `SentryLoggingOptions.Experimental.EnableLogs`
+    - `Sentry.Maui`, enabled via `SentryMauiOptions.Experimental.EnableLogs`
+
 ## 5.11.2
 
 ### Fixes
@@ -14,22 +24,8 @@
 
 ## 5.11.0
 
-- Moved experimental _Sentry Structured Logger_ from `SentrySdk.Logger` to `SentrySdk.Experimental.Logger` ([#4158](https://github.com/getsentry/sentry-dotnet/pull/4158))
-- Moved experimental options for _Sentry Structured Logging_ ([#4193](https://github.com/getsentry/sentry-dotnet/pull/4193))
-  - `Sentry.AspNetCore`: from `SentryAspNetCoreOptions.EnableLogs` to `SentryAspNetCoreOptions.Experimental.EnableLogs`
-  - `Sentry.Extensions.Logging`: from `SentryLoggingOptions.EnableLogs` to `SentryLoggingOptions.Experimental.EnableLogs`
-  - `Sentry.Maui`: from `SentryMauiOptions.EnableLogs` to `SentryMauiOptions.Experimental.EnableLogs`
-
-## 5.8.0-alpha.0
-
 ### Features
 
-- Add experimental support for _Sentry Structured Logging_ via `SentrySdk.Logger` ([#4158](https://github.com/getsentry/sentry-dotnet/pull/4158))
-- Add experimental integrations of _Sentry Structured Logging_ ([#4193](https://github.com/getsentry/sentry-dotnet/pull/4193))
-  - `Sentry.AspNetCore`, enabled via `SentryAspNetCoreOptions.EnableLogs`
-  - `Sentry.Extensions.Logging`, enabled via `SentryLoggingOptions.EnableLogs`
-  - `Sentry.Maui`, enabled via `SentryMauiOptions.EnableLogs`
-- Add experimental support for [_Sentry Structured Logging_](https://docs.sentry.io/product/explore/logs/) via `SentrySdk.Experimental.Logger` ([#4158](https://github.com/getsentry/sentry-dotnet/pull/4158))
 - Added non-allocating `ConfigureScope` and `ConfigureScopeAsync` overloads ([#4244](https://github.com/getsentry/sentry-dotnet/pull/4244))
 - Add .NET MAUI `AutomationId` element information to breadcrumbs ([#4248](https://github.com/getsentry/sentry-dotnet/pull/4248))
 - The HTTP Response Status Code for spans instrumented using OpenTelemetry is now searchable ([#4283](https://github.com/getsentry/sentry-dotnet/pull/4283))

diff --git a/samples/Sentry.Samples.Console.Basic/Program.cs b/samples/Sentry.Samples.Console.Basic/Program.cs
@@ -42,7 +42,7 @@
     options.Experimental.SetBeforeSendLog(static log =>
     {
         // A demonstration of how you can drop logs based on some attribute they have
-        if (log.TryGetAttribute("suppress", out bool attribute) && attribute)
+        if (log.TryGetAttribute("suppress", out var attribute) && attribute is true)
         {
             return null;
         }

diff --git a/src/Sentry/HubExtensions.cs b/src/Sentry/HubExtensions.cs
@@ -259,4 +259,16 @@ internal static ITransactionTracer StartTransaction(
         var transaction = hub.GetTransaction();
         return transaction?.IsSampled == true ? transaction : null;
     }
+
+    internal static Scope? GetScope(this IHub hub)
+    {
+        if (hub is Hub fullHub)
+        {
+            return fullHub.ScopeManager.GetCurrent().Key;
+        }
+
+        Scope? current = null;
+        hub.ConfigureScope(scope => current = scope);
+        return current;
+    }
 }
diff --git a/src/Sentry/Internal/DefaultSentryStructuredLogger.cs b/src/Sentry/Internal/DefaultSentryStructuredLogger.cs
@@ -52,7 +52,8 @@ private protected override void CaptureLog(SentryLogLevel level, string template
             return;
         }
 
-        log.SetDefaultAttributes(_options);
+        var scope = _hub.GetScope();
+        log.SetDefaultAttributes(_options, scope?.Sdk ?? SdkVersion.Instance);
 
         var configuredLog = log;
         if (_options.Experimental.BeforeSendLogInternal is { } beforeSendLog)

diff --git a/src/Sentry/SentryLog.cs b/src/Sentry/SentryLog.cs
@@ -1,6 +1,5 @@
 using Sentry.Extensibility;
 using Sentry.Infrastructure;
-using Sentry.Internal;
 using Sentry.Protocol;
 
 namespace Sentry;
@@ -131,7 +130,7 @@ internal SentryLog(DateTimeOffset timestamp, SentryId traceId, SentryLogLevel le
     [Experimental(DiagnosticId.ExperimentalFeature)]
     public bool TryGetAttribute(string key, [NotNullWhen(true)] out object? value)
     {
-        if (_attributes.TryGetValue(key, out var attribute) && attribute.Type == "object" && attribute.Value is not null)
+        if (_attributes.TryGetValue(key, out var attribute) && attribute.Value is not null)
         {
             value = attribute.Value;
             return true;
@@ -168,7 +167,7 @@ internal void SetAttribute(string key, string value)
         _attributes[key] = new SentryAttribute(value, "string");
     }
 
-    internal void SetDefaultAttributes(SentryOptions options)
+    internal void SetDefaultAttributes(SentryOptions options, SdkVersion sdk)
     {
         var environment = options.SettingLocator.GetEnvironment();
         SetAttribute("sentry.environment", environment);
@@ -179,8 +178,11 @@ internal void SetDefaultAttributes(SentryOptions options)
             SetAttribute("sentry.release", release);
         }
 
-        SetAttribute("sentry.sdk.name", Constants.SdkName);
-        if (SdkVersion.Instance.Version is { } version)
+        if (sdk.Name is { } name)
+        {
+            SetAttribute("sentry.sdk.name", name);
+        }
+        if (sdk.Version is { } version)
         {
             SetAttribute("sentry.sdk.version", version);
         }

diff --git a/test/Sentry.Tests/SentryLogTests.cs b/test/Sentry.Tests/SentryLogTests.cs
@@ -21,6 +21,51 @@ public SentryLogTests(ITestOutputHelper output)
         _output = new TestOutputDiagnosticLogger(output);
     }
 
+    [Fact]
+    public void Protocol_Default_VerifyAttributes()
+    {
+        var options = new SentryOptions
+        {
+            Environment = "my-environment",
+            Release = "my-release",
+        };
+        var sdk = new SdkVersion
+        {
+            Name = "Sentry.Test.SDK",
+            Version = "1.2.3-test+Sentry"
+        };
+
+        var log = new SentryLog(Timestamp, TraceId, (SentryLogLevel)24, "message")
+        {
+            Template = "template",
+            Parameters = ImmutableArray.Create<object>("params"),
+            ParentSpanId = ParentSpanId,
+        };
+        log.SetAttribute("attribute", "value");
+        log.SetDefaultAttributes(options, sdk);
+
+        log.Timestamp.Should().Be(Timestamp);
+        log.TraceId.Should().Be(TraceId);
+        log.Level.Should().Be((SentryLogLevel)24);
+        log.Message.Should().Be("message");
+        log.Template.Should().Be("template");
+        log.Parameters.Should().BeEquivalentTo(["params"]);
+        log.ParentSpanId.Should().Be(ParentSpanId);
+
+        log.TryGetAttribute("attribute", out object attribute).Should().BeTrue();
+        attribute.Should().Be("value");
+        log.TryGetAttribute("sentry.environment", out string environment).Should().BeTrue();
+        environment.Should().Be(options.Environment);
+        log.TryGetAttribute("sentry.release", out string release).Should().BeTrue();
+        release.Should().Be(options.Release);
+        log.TryGetAttribute("sentry.sdk.name", out string name).Should().BeTrue();
+        name.Should().Be(sdk.Name);
+        log.TryGetAttribute("sentry.sdk.version", out string version).Should().BeTrue();
+        version.Should().Be(sdk.Version);
+        log.TryGetAttribute("not-found", out object notFound).Should().BeFalse();
+        notFound.Should().BeNull();
+    }
+
     [Fact]
     public void WriteTo_Envelope_MinimalSerializedSentryLog()
     {
@@ -31,7 +76,7 @@ public void WriteTo_Envelope_MinimalSerializedSentryLog()
         };
 
         var log = new SentryLog(Timestamp, TraceId, SentryLogLevel.Trace, "message");
-        log.SetDefaultAttributes(options);
+        log.SetDefaultAttributes(options, new SdkVersion());
 
         var envelope = Envelope.FromLog(log);
 
@@ -80,14 +125,6 @@ public void WriteTo_Envelope_MinimalSerializedSentryLog()
                 "sentry.release": {
                   "value": "my-release",
                   "type": "string"
-                },
-                "sentry.sdk.name": {
-                  "value": "{{SdkVersion.Instance.Name}}",
-                  "type": "string"
-                },
-                "sentry.sdk.version": {
-                  "value": "{{SdkVersion.Instance.Version}}",
-                  "type": "string"
                 }
               }
             }
@@ -117,7 +154,7 @@ public void WriteTo_EnvelopeItem_MaximalSerializedSentryLog()
         log.SetAttribute("boolean-attribute", true);
         log.SetAttribute("integer-attribute", 3);
         log.SetAttribute("double-attribute", 4.4);
-        log.SetDefaultAttributes(options);
+        log.SetDefaultAttributes(options, new SdkVersion { Name = "Sentry.Test.SDK", Version = "1.2.3-test+Sentry" });
 
         var envelope = EnvelopeItem.FromLog(log);
 
@@ -194,11 +231,11 @@ public void WriteTo_EnvelopeItem_MaximalSerializedSentryLog()
                   "type": "string"
                 },
                 "sentry.sdk.name": {
-                  "value": "{{SdkVersion.Instance.Name}}",
+                  "value": "Sentry.Test.SDK",
                   "type": "string"
                 },
                 "sentry.sdk.version": {
-                  "value": "{{SdkVersion.Instance.Version}}",
+                  "value": "1.2.3-test+Sentry",
                   "type": "string"
                 },
                 "sentry.trace.parent_span_id": {