Merge branch 'main' into 3773-host_appbuilder

Author: aritchie

.github/CODEOWNERS

@@ -1 +1 @@
-*       @bruno-garcia @jamescrosswell
+*       @aritchie @jamescrosswell

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
+        uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

CHANGELOG.md

@@ -1,16 +1,17 @@
 # Changelog
 
-## Unreleased
+## 5.1.1
 
 ### Fixes
 
+- Emit transaction.data inside contexts.trace.data ([#3936](https://github.com/getsentry/sentry-dotnet/pull/3936))
 - Native SIGSEGV errors resulting from managed NullReferenceExceptions are now suppressed on Android ([#3903](https://github.com/getsentry/sentry-dotnet/pull/3903))
 - OTel activities that are marked as not recorded are no longer sent to Sentry ([#3890](https://github.com/getsentry/sentry-dotnet/pull/3890))
 - Fixed envelopes with oversized attachments getting stuck in __processing ([#3938](https://github.com/getsentry/sentry-dotnet/pull/3938))
-- Unknown stack frames in profiles on .NET 8+ ([#3942](https://github.com/getsentry/sentry-dotnet/pull/3942))
-- Deduplicate profiling stack frames ([#3941](https://github.com/getsentry/sentry-dotnet/pull/3941))
+- OperatingSystem will now return macOS as OS name instead of 'Darwin' as well as the proper version. ([#2710](https://github.com/getsentry/sentry-dotnet/pull/3956))
 - Ignore null value on CocoaScopeObserver.SetTag ([#3948](https://github.com/getsentry/sentry-dotnet/pull/3948))
 - Add Azure Function UseSentry overloads for easier wire ups  ([#3971](https://github.com/getsentry/sentry-dotnet/pull/3971))
+- Deduplicate profiling stack frames ([#3969](https://github.com/getsentry/sentry-dotnet/pull/3969))
 
 ## 5.1.0
 

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>5.1.0</VersionPrefix>
+    <VersionPrefix>5.1.1</VersionPrefix>
     <LangVersion>13</LangVersion>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

src/Sentry.Profiling/SampleProfilerSession.cs

@@ -12,6 +12,7 @@ namespace Sentry.Profiling;
 internal class SampleProfilerSession : IDisposable
 {
     private readonly EventPipeSession _session;
+    private readonly TraceLogEventSource _eventSource;
     private readonly SampleProfilerTraceEventParser _sampleEventParser;
     private readonly IDiagnosticLogger? _logger;
     private readonly SentryStopwatch _stopwatch;
@@ -22,22 +23,22 @@ private SampleProfilerSession(SentryStopwatch stopwatch, EventPipeSession sessio
     {
         _session = session;
         _logger = logger;
-        EventSource = eventSource;
-        _sampleEventParser = new SampleProfilerTraceEventParser(EventSource);
+        _eventSource = eventSource;
+        _sampleEventParser = new SampleProfilerTraceEventParser(_eventSource);
         _stopwatch = stopwatch;
         _processing = processing;
     }
 
     // Exposed only for benchmarks.
     internal static EventPipeProvider[] Providers = new[]
     {
-        new EventPipeProvider(ClrTraceEventParser.ProviderName, EventLevel.Verbose, (long) (
-            ClrTraceEventParser.Keywords.Jit
-            | ClrTraceEventParser.Keywords.NGen
-            | ClrTraceEventParser.Keywords.Loader
-            | ClrTraceEventParser.Keywords.Binder
-            | ClrTraceEventParser.Keywords.JittedMethodILToNativeMap
-            )),
+        // Note: all events we need issued by "DotNETRuntime" provider are at "EventLevel.Informational"
+        // see https://learn.microsoft.com/en-us/dotnet/fundamentals/diagnostics/runtime-events
+        // TODO replace Keywords.Default with a subset. Currently it is:
+        //   Default = GC | Type | GCHeapSurvivalAndMovement | Binder | Loader | Jit | NGen | SupressNGen
+        //                | StopEnumeration | Security | AppDomainResourceManagement | Exception | Threading | Contention | Stack | JittedMethodILToNativeMap
+        //                | ThreadTransfer | GCHeapAndTypeNames | Codesymbols | Compilation,
+        new EventPipeProvider(ClrTraceEventParser.ProviderName, EventLevel.Informational, (long) ClrTraceEventParser.Keywords.Default),
         new EventPipeProvider(SampleProfilerTraceEventParser.ProviderName, EventLevel.Informational),
         // new EventPipeProvider(TplEtwProviderTraceEventParser.ProviderName, EventLevel.Informational, (long) TplEtwProviderTraceEventParser.Keywords.Default)
     };
@@ -47,14 +48,11 @@ private SampleProfilerSession(SentryStopwatch stopwatch, EventPipeSession sessio
     // need a large buffer if we're connecting righ away. Leaving it too large increases app memory usage.
     internal static int CircularBufferMB = 16;
 
-    // Exposed for tests
-    internal TraceLogEventSource EventSource { get; }
-
     public SampleProfilerTraceEventParser SampleEventParser => _sampleEventParser;
 
     public TimeSpan Elapsed => _stopwatch.Elapsed;
 
-    public TraceLog TraceLog => EventSource.TraceLog;
+    public TraceLog TraceLog => _eventSource.TraceLog;
 
     // default is false, set 1 for true.
     private static int _throwOnNextStartupForTests = 0;
@@ -112,15 +110,15 @@ public async Task WaitForFirstEventAsync(CancellationToken cancellationToken = d
     {
         var tcs = new TaskCompletionSource();
         var cb = (TraceEvent _) => { tcs.TrySetResult(); };
-        EventSource.AllEvents += cb;
+        _eventSource.AllEvents += cb;
         try
         {
             // Wait for the first event to be processed.
             await tcs.Task.WaitAsync(cancellationToken).ConfigureAwait(false);
         }
         finally
         {
-            EventSource.AllEvents -= cb;
+            _eventSource.AllEvents -= cb;
         }
     }
 
@@ -134,7 +132,7 @@ public void Stop()
                 _session.Stop();
                 _processing.Wait();
                 _session.Dispose();
-                EventSource.Dispose();
+                _eventSource.Dispose();
             }
             catch (Exception ex)
             {

src/Sentry.Profiling/Sentry.Profiling.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Sentry\Sentry.csproj" />
-    <PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.553101" />
+    <PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.510501" />
     <!--  This triggers the build of this project and its dependencies. We don't need all of them but this is the easiest way -->
     <!--  to make sure the project builds/cleans etc in tandem with this. Packaging copies the 2 DLLs we need below -->
     <ProjectReference Include="../../modules/perfview/src/TraceEvent/TraceEvent.csproj" PrivateAssets="all" />

src/Sentry/IHasData.cs

@@ -0,0 +1,17 @@
+namespace Sentry;
+
+/// <summary>
+/// Implemented by objects that contain a map of untyped additional metadata.
+/// </summary>
+public interface IHasData
+{
+    /// <summary>
+    /// An arbitrary mapping of additional metadata to store with the event.
+    /// </summary>
+    IReadOnlyDictionary<string, object?> Data { get; }
+
+    /// <summary>
+    /// Sets an extra.
+    /// </summary>
+    void SetData(string key, object? value);
+}

src/Sentry/ISpanData.cs

@@ -5,7 +5,7 @@ namespace Sentry;
 /// <summary>
 /// Immutable data belonging to a span.
 /// </summary>
-public interface ISpanData : ITraceContext, IHasTags, IHasExtra
+public interface ISpanData : ITraceContext, IHasData, IHasTags, IHasExtra
 {
     /// <summary>
     /// Start timestamp.

src/Sentry/Internal/Enricher.cs

@@ -45,8 +45,15 @@ public void Apply(IEventLike eventLike)
                 } catch {
                     eventLike.Contexts.OperatingSystem.RawDescription = Environment.OSVersion.VersionString;
                 }
+
 #else
                 eventLike.Contexts.OperatingSystem.RawDescription = RuntimeInformation.OSDescription;
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                {
+                    // works for catalyst and net9 base
+                    eventLike.Contexts.OperatingSystem.Name = "macOS";
+                    eventLike.Contexts.OperatingSystem.Version = Environment.OSVersion.Version.ToString(); // reports macOS version (ie. 15.3.0)
+                }
 #endif
             }
         }

src/Sentry/Internal/NoOpSpan.cs

@@ -19,6 +19,7 @@ protected NoOpSpan()
     public bool? IsSampled => default;
     public IReadOnlyDictionary<string, string> Tags => ImmutableDictionary<string, string>.Empty;
     public IReadOnlyDictionary<string, object?> Extra => ImmutableDictionary<string, object?>.Empty;
+    public IReadOnlyDictionary<string, object?> Data => ImmutableDictionary<string, object?>.Empty;
     public DateTimeOffset StartTimestamp => default;
     public DateTimeOffset? EndTimestamp => default;
     public bool IsFinished => default;
@@ -71,6 +72,10 @@ public void SetExtra(string key, object? value)
     {
     }
 
+    public void SetData(string key, object? value)
+    {
+    }
+
     public SentryTraceHeader GetTraceHeader() => SentryTraceHeader.Empty;
 
     public IReadOnlyDictionary<string, Measurement> Measurements => ImmutableDictionary<string, Measurement>.Empty;