Merge branch 'master' into augusto/update-microbenchmark-bp-branch

Author: igoragoli

profiler/build/install_timeit.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-dotnet tool update -g timeitsharp --version 0.4.5 --allow-downgrade
+dotnet tool update -g timeitsharp --version 0.4.6 --allow-downgrade
 
 rem Add %USERPROFILE%\.dotnet\tools to Path if it is not already there
 path|find /i "%USERPROFILE%\.dotnet\tools" >nul || set path=%path%;"%USERPROFILE%\.dotnet\tools"

profiler/build/install_timeit.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-dotnet tool update -g timeitsharp --version 0.4.5 --allow-downgrade
+dotnet tool update -g timeitsharp --version 0.4.6 --allow-downgrade

tracer/build/timeit/Samples.FakeDbCommand/run.cmd

@@ -28,7 +28,7 @@ set FAILED=0
 echo *********************
 echo Installing timeitsharp
 echo *********************
-dotnet tool update -g timeitsharp --version 0.4.5 --allow-downgrade
+dotnet tool update -g timeitsharp --version 0.4.6 --allow-downgrade
 
 echo *********************
 echo .NET Framework 4.8

tracer/build/timeit/Samples.HttpMessageHandler/run.cmd

@@ -28,7 +28,7 @@ set FAILED=0
 echo *********************
 echo Installing timeitsharp
 echo *********************
-dotnet tool update -g timeitsharp --version 0.4.5 --allow-downgrade
+dotnet tool update -g timeitsharp --version 0.4.6 --allow-downgrade
 
 echo *********************
 echo .NET Framework 4.8

tracer/src/Datadog.Trace/Agent/DiscoveryService/AgentConfiguration.cs

@@ -12,6 +12,8 @@ internal record AgentConfiguration
     public AgentConfiguration(
         string? configurationEndpoint,
         string? debuggerEndpoint,
+        string? debuggerV2Endpoint,
+        string? diagnosticsEndpoint,
         string? symbolDbEndpoint,
         string? agentVersion,
         string? statsEndpoint,
@@ -20,12 +22,12 @@ public AgentConfiguration(
         string? telemetryProxyEndpoint,
         string? tracerFlareEndpoint,
         bool clientDropP0,
-        string? diagnosticsEndpoint,
         bool spanMetaStructs,
         bool? spanEvents)
     {
         ConfigurationEndpoint = configurationEndpoint;
         DebuggerEndpoint = debuggerEndpoint;
+        DebuggerV2Endpoint = debuggerV2Endpoint;
         DiagnosticsEndpoint = diagnosticsEndpoint;
         SymbolDbEndpoint = symbolDbEndpoint;
         AgentVersion = agentVersion;
@@ -43,6 +45,8 @@ public AgentConfiguration(
 
     public string? DebuggerEndpoint { get; }
 
+    public string? DebuggerV2Endpoint { get; }
+
     public string? DiagnosticsEndpoint { get; }
 
     public string? SymbolDbEndpoint { get; }

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

@@ -20,6 +20,7 @@ namespace Datadog.Trace.Agent.DiscoveryService
     internal class DiscoveryService : IDiscoveryService
     {
         private const string SupportedDebuggerEndpoint = "debugger/v1/input";
+        private const string SupportedDebuggerV2Endpoint = "debugger/v2/input";
         private const string SupportedDiagnosticsEndpoint = "debugger/v1/diagnostics";
         private const string SupportedSymbolDbEndpoint = "symdb/v1/input";
         private const string SupportedConfigurationEndpoint = "v0.7/config";
@@ -66,6 +67,7 @@ public DiscoveryService(
             new[]
             {
                 SupportedDebuggerEndpoint,
+                SupportedDebuggerV2Endpoint,
                 SupportedDiagnosticsEndpoint,
                 SupportedSymbolDbEndpoint,
                 SupportedConfigurationEndpoint,
@@ -223,6 +225,7 @@ private async Task ProcessDiscoveryResponse(IApiResponse response)
             var discoveredEndpoints = (jObject["endpoints"] as JArray)?.Values<string>().ToArray();
             string? configurationEndpoint = null;
             string? debuggerEndpoint = null;
+            string? debuggerV2Endpoint = null;
             string? diagnosticsEndpoint = null;
             string? symbolDbEndpoint = null;
             string? statsEndpoint = null;
@@ -246,6 +249,10 @@ private async Task ProcessDiscoveryResponse(IApiResponse response)
                     {
                         debuggerEndpoint = endpoint;
                     }
+                    else if (endpoint.Equals(SupportedDebuggerV2Endpoint, StringComparison.OrdinalIgnoreCase))
+                    {
+                        debuggerV2Endpoint = endpoint;
+                    }
                     else if (endpoint.Equals(SupportedDiagnosticsEndpoint, StringComparison.OrdinalIgnoreCase))
                     {
                         diagnosticsEndpoint = endpoint;
@@ -290,7 +297,8 @@ private async Task ProcessDiscoveryResponse(IApiResponse response)
             var newConfig = new AgentConfiguration(
                 configurationEndpoint: configurationEndpoint,
                 debuggerEndpoint: debuggerEndpoint,
-                diagnosticsEndpoint: diagnosticsEndpoint ?? debuggerEndpoint,
+                debuggerV2Endpoint: debuggerV2Endpoint ?? diagnosticsEndpoint,
+                diagnosticsEndpoint: diagnosticsEndpoint,
                 symbolDbEndpoint: symbolDbEndpoint,
                 agentVersion: agentVersion,
                 statsEndpoint: statsEndpoint,

tracer/src/Datadog.Trace/Debugger/DebuggerFactory.cs

@@ -30,10 +30,12 @@ internal class DebuggerFactory
     internal static DynamicInstrumentation CreateDynamicInstrumentation(IDiscoveryService discoveryService, IRcmSubscriptionManager remoteConfigurationManager, TracerSettings tracerSettings, string serviceName, DebuggerSettings debuggerSettings, IGitMetadataTagsProvider gitMetadataTagsProvider)
     {
         var snapshotSlicer = SnapshotSlicer.Create(debuggerSettings);
-        var snapshotStatusSink = SnapshotSink.Create(debuggerSettings, snapshotSlicer);
+        var snapshotSink = SnapshotSink.Create(debuggerSettings, snapshotSlicer);
+        var logSink = SnapshotSink.Create(debuggerSettings, snapshotSlicer);
         var diagnosticsSink = DiagnosticsSink.Create(serviceName, debuggerSettings);
 
-        var debuggerUploader = CreateSnapshotUploader(discoveryService, debuggerSettings, gitMetadataTagsProvider, GetApiFactory(tracerSettings, false), snapshotStatusSink);
+        var snapshotUploader = CreateSnapshotUploader(discoveryService, debuggerSettings, gitMetadataTagsProvider, GetApiFactory(tracerSettings, true), snapshotSink);
+        var logUploader = CreateSnapshotUploader(discoveryService, debuggerSettings, gitMetadataTagsProvider, GetApiFactory(tracerSettings, false), logSink);
         var diagnosticsUploader = CreateDiagnosticsUploader(discoveryService, debuggerSettings, gitMetadataTagsProvider, GetApiFactory(tracerSettings, true), diagnosticsSink);
         var lineProbeResolver = LineProbeResolver.Create(debuggerSettings.ThirdPartyDetectionExcludes, debuggerSettings.ThirdPartyDetectionIncludes);
         var probeStatusPoller = ProbeStatusPoller.Create(diagnosticsSink, debuggerSettings);
@@ -46,7 +48,8 @@ internal static DynamicInstrumentation CreateDynamicInstrumentation(IDiscoverySe
             discoveryService: discoveryService,
             remoteConfigurationManager: remoteConfigurationManager,
             lineProbeResolver: lineProbeResolver,
-            snapshotUploader: debuggerUploader,
+            snapshotUploader: snapshotUploader,
+            logUploader: logUploader,
             diagnosticsUploader: diagnosticsUploader,
             probeStatusPoller: probeStatusPoller,
             configurationUpdater: configurationUpdater,
@@ -70,12 +73,22 @@ private static IDogStatsd GetDogStatsd(TracerSettings tracerSettings, string ser
         return statsd;
     }
 
-    private static SnapshotUploader CreateSnapshotUploader(IDiscoveryService discoveryService, DebuggerSettings debuggerSettings, IGitMetadataTagsProvider gitMetadataTagsProvider, IApiRequestFactory apiFactory, SnapshotSink snapshotStatusSink)
+    private static SnapshotUploader CreateSnapshotUploader(IDiscoveryService discoveryService, DebuggerSettings debuggerSettings, IGitMetadataTagsProvider gitMetadataTagsProvider, IApiRequestFactory apiFactory, SnapshotSink snapshotSink)
     {
         var snapshotBatchUploadApi = DebuggerUploadApiFactory.CreateSnapshotUploadApi(apiFactory, discoveryService, gitMetadataTagsProvider);
         var snapshotBatchUploader = BatchUploader.Create(snapshotBatchUploadApi);
 
-        var debuggerSink = SnapshotUploader.Create(snapshotStatusSink, snapshotBatchUploader, debuggerSettings);
+        var debuggerSink = SnapshotUploader.Create(snapshotSink, snapshotBatchUploader, debuggerSettings);
+
+        return debuggerSink;
+    }
+
+    private static SnapshotUploader CreateLogUploader(IDiscoveryService discoveryService, DebuggerSettings debuggerSettings, IGitMetadataTagsProvider gitMetadataTagsProvider, IApiRequestFactory apiFactory, SnapshotSink snapshotSink)
+    {
+        var logUploaderApi = DebuggerUploadApiFactory.CreateLogUploadApi(apiFactory, discoveryService, gitMetadataTagsProvider);
+        var logBatchUploader = BatchUploader.Create(logUploaderApi);
+
+        var debuggerSink = SnapshotUploader.Create(snapshotSink, logBatchUploader, debuggerSettings);
 
         return debuggerSink;
     }

tracer/src/Datadog.Trace/Debugger/DynamicInstrumentation.cs

@@ -38,6 +38,7 @@ internal class DynamicInstrumentation : IDisposable
         private readonly IRcmSubscriptionManager _subscriptionManager;
         private readonly ISubscription _subscription;
         private readonly ISnapshotUploader _snapshotUploader;
+        private readonly ISnapshotUploader _logUploader;
         private readonly IDebuggerUploader _diagnosticsUploader;
         private readonly ILineProbeResolver _lineProbeResolver;
         private readonly List<ProbeDefinition> _unboundProbes;
@@ -54,6 +55,7 @@ internal DynamicInstrumentation(
             IRcmSubscriptionManager remoteConfigurationManager,
             ILineProbeResolver lineProbeResolver,
             ISnapshotUploader snapshotUploader,
+            ISnapshotUploader logUploader,
             IDebuggerUploader diagnosticsUploader,
             IProbeStatusPoller probeStatusPoller,
             ConfigurationUpdater configurationUpdater,
@@ -65,6 +67,7 @@ internal DynamicInstrumentation(
             _discoveryService = discoveryService;
             _lineProbeResolver = lineProbeResolver;
             _snapshotUploader = snapshotUploader;
+            _logUploader = logUploader;
             _diagnosticsUploader = diagnosticsUploader;
             _probeStatusPoller = probeStatusPoller;
             _subscriptionManager = remoteConfigurationManager;
@@ -138,6 +141,13 @@ private void StartBackgroundProcess()
                                       CancellationToken.None,
                                       TaskContinuationOptions.OnlyOnFaulted,
                                       TaskScheduler.Default);
+
+            _ = _logUploader.StartFlushingAsync()
+                            .ContinueWith(
+                                 t => Log.Error(t?.Exception, "Error in log uploader"),
+                                 CancellationToken.None,
+                                 TaskContinuationOptions.OnlyOnFaulted,
+                                 TaskScheduler.Default);
         }
 
         internal void UpdateAddedProbeInstrumentations(IReadOnlyList<ProbeDefinition> addedProbes)
@@ -463,10 +473,27 @@ internal void AddSnapshot(ProbeInfo probe, string snapshot)
                 return;
             }
 
+            if (!probe.IsFullSnapshot)
+            {
+                AddLog(probe, snapshot);
+                return;
+            }
+
             _snapshotUploader.Add(probe.ProbeId, snapshot);
             SetProbeStatusToEmitting(probe);
         }
 
+        internal void AddLog(ProbeInfo probe, string log)
+        {
+            if (IsDisposed)
+            {
+                return;
+            }
+
+            _logUploader.Add(probe.ProbeId, log);
+            SetProbeStatusToEmitting(probe);
+        }
+
         internal void SetProbeStatusToEmitting(ProbeInfo probe)
         {
             if (IsDisposed)

tracer/src/Datadog.Trace/Debugger/ExceptionAutoInstrumentation/ExceptionReplaySnapshotCreator.cs

@@ -4,11 +4,8 @@
 // </copyright>
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Datadog.Trace.Debugger.Expressions;
+using Datadog.Trace.Debugger.Models;
 using Datadog.Trace.Debugger.Snapshots;
 using ProbeLocation = Datadog.Trace.Debugger.Expressions.ProbeLocation;
 
@@ -33,6 +30,8 @@ public ExceptionReplaySnapshotCreator(bool isFullSnapshot, ProbeLocation locatio
 
         internal static string FrameIndex { get; } = Guid.NewGuid().ToString();
 
+        internal override string DebuggerProduct => DebuggerTags.DebuggerProduct.ER;
+
         internal override DebuggerSnapshotCreator EndSnapshot()
         {
             JsonWriter.WritePropertyName("exceptionHash");

tracer/src/Datadog.Trace/Debugger/Models/Snapshot.cs

@@ -43,4 +43,32 @@ internal record struct DebuggerSnapshot
     {
         public SnapshotProbe Snapshot { get; set; }
     }
+
+    internal static class DebuggerTags
+    {
+        /// <summary>
+        /// ddsource
+        /// </summary>
+        internal const string DDSource = "dd_debugger";
+
+        /// <summary>
+        /// Tags for debugger.type
+        /// </summary>
+        internal static class DebuggerType
+        {
+            internal const string Snapshot = "snapshot";
+            internal const string Diagnostic = "diagnostic";
+            internal const string SymDb = "symdb";
+        }
+
+        /// <summary>
+        /// Tags for debugger.product
+        /// </summary>
+        internal static class DebuggerProduct
+        {
+            internal const string DI = "di";
+            internal const string ER = "er";
+            internal const string LD = "ld";
+        }
+    }
 }