update debugger type and forwarding based on new logic

Author: dudikeleti

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

@@ -30,7 +30,7 @@ public ExceptionReplaySnapshotCreator(bool isFullSnapshot, ProbeLocation locatio
 
         internal static string FrameIndex { get; } = Guid.NewGuid().ToString();
 
-        internal override string DebuggerProduct => DebuggerTags.DebuggerProduct.ER;
+        internal override string DebuggerType => DebuggerTags.DebuggerType.ExceptionReplaySnapshot;
 
         internal override DebuggerSnapshotCreator EndSnapshot()
         {

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

@@ -56,19 +56,10 @@ internal static class DebuggerTags
         /// </summary>
         internal static class DebuggerType
         {
-            internal const string Snapshot = "snapshot";
+            internal const string DynamicInstrumentationSnapshot = "di_snapshot";
+            internal const string ExceptionReplaySnapshot = "er_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";
-        }
     }
 }

tracer/src/Datadog.Trace/Debugger/Snapshots/DebuggerSnapshotCreator.cs

@@ -66,7 +66,7 @@ public DebuggerSnapshotCreator(bool isFullSnapshot, ProbeLocation location, bool
             MethodScopeMembers = methodScopeMembers;
         }
 
-        internal virtual string DebuggerProduct => DebuggerTags.DebuggerProduct.DI;
+        internal virtual string DebuggerType => DebuggerTags.DebuggerType.DynamicInstrumentationSnapshot;
 
         internal string SnapshotId
         {
@@ -883,10 +883,7 @@ internal DebuggerSnapshotCreator AddGeneralInfo(string service, string traceId,
             JsonWriter.WriteValue(spanId);
 
             JsonWriter.WritePropertyName("debugger.type");
-            JsonWriter.WriteValue(DebuggerTags.DebuggerType.Snapshot);
-
-            JsonWriter.WritePropertyName("debugger.product");
-            JsonWriter.WriteValue(DebuggerProduct);
+            JsonWriter.WriteValue(DebuggerType);
 
             return this;
         }

tracer/src/Datadog.Trace/Debugger/Upload/DebuggerUploadApiBase.cs

@@ -19,7 +19,7 @@ namespace Datadog.Trace.Debugger.Upload;
 
 internal abstract class DebuggerUploadApiBase : IBatchUploadApi
 {
-    protected const string Debuggerv1Endpoint = "debugger/v1/input";
+    private const string DebuggerV1Endpoint = "debugger/v1/input";
 
     private readonly IApiRequestFactory _apiRequestFactory;
     private readonly IGitMetadataTagsProvider? _gitMetadataTagsProvider;
@@ -60,7 +60,7 @@ protected string? Endpoint
     protected Task<IApiResponse> PostAsync(string uri, ArraySegment<byte> data)
     {
         var request = _apiRequestFactory.Create(new Uri(uri));
-        var isDebuggerV1 = uri.Contains(Debuggerv1Endpoint);
+        var isDebuggerV1 = uri.Contains(DebuggerV1Endpoint);
 
         return isDebuggerV1
                    ? request.PostAsync(data, MimeTypes.Json)

tracer/src/Datadog.Trace/Debugger/Upload/SnapshotUploadApi.cs

@@ -23,7 +23,10 @@ private SnapshotUploadApi(
             IGitMetadataTagsProvider gitMetadataTagsProvider)
             : base(apiRequestFactory, gitMetadataTagsProvider)
         {
-            discoveryService.SubscribeToChanges(c => Endpoint = c.DebuggerV2Endpoint);
+            discoveryService.SubscribeToChanges(c =>
+            {
+                Endpoint = c.DebuggerV2Endpoint ?? c.DiagnosticsEndpoint ?? c.DebuggerEndpoint;
+            });
         }
 
         public static SnapshotUploadApi Create(