Ignore v1 telemetry sent by version conflict packages

DataDog · Oct 26, 2023 · dee34cb · dee34cb
1 parent 2f17375
commit dee34cb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/tracer/test/Datadog.Trace.TestHelpers/MockTelemetryAgent.cs b/tracer/test/Datadog.Trace.TestHelpers/MockTelemetryAgent.cs
@@ -130,8 +130,9 @@ internal static TelemetryWrapper DeserializeResponse(Stream inputStream, string
         {
             return apiVersion switch
             {
+                "v1" => null, // In version conflict, we may still send v1 telemetry. Just ignore it
                 TelemetryConstants.ApiVersionV2 => DeserializeV2(inputStream, requestType),
-                _ => throw new Exception($"Unknown telemetry api version: {apiVersion}"),
+                _ => throw new Exception($"Unknown telemetry api version: {apiVersion}, {Deserialize(inputStream)}"),
             };
 
             static TelemetryWrapper DeserializeV2(Stream inputStream, string requestType)
@@ -152,6 +153,12 @@ static TelemetryWrapper DeserializeV2(Stream inputStream, string requestType)
 
                 return new TelemetryWrapper.V2(telemetry);
             }
+
+            static string Deserialize(Stream inputStream)
+            {
+                using var sr = new StreamReader(inputStream);
+                return sr.ReadToEnd();
+            }
         }
 
         protected virtual void OnRequestReceived(HttpListenerContext context)
@@ -167,11 +174,14 @@ protected virtual void HandleHttpRequest(HttpListenerContext ctx)
             var requestType = ctx.Request.Headers[TelemetryConstants.RequestTypeHeader];
 
             var telemetry = DeserializeResponse(ctx.Request.InputStream, apiVersion, requestType);
-            Telemetry.Push(telemetry);
-
-            lock (this)
+            if (telemetry is not null)
             {
-                RequestHeaders = RequestHeaders.Add(new NameValueCollection(ctx.Request.Headers));
+                Telemetry.Push(telemetry);
+
+                lock (this)
+                {
+                    RequestHeaders = RequestHeaders.Add(new NameValueCollection(ctx.Request.Headers));
+                }
             }
 
             // NOTE: HttpStreamRequest doesn't support Transfer-Encoding: Chunked

diff --git a/tracer/test/Datadog.Trace.TestHelpers/MockTracerAgent.cs b/tracer/test/Datadog.Trace.TestHelpers/MockTracerAgent.cs
@@ -599,6 +599,11 @@ private void HandlePotentialTelemetryData(MockHttpParser.MockHttpRequest request
                     using var stream = new MemoryStream(body);
 
                     var telemetry = MockTelemetryAgent.DeserializeResponse(stream, apiVersion, requestType);
+                    if (telemetry is null)
+                    {
+                        return;
+                    }
+
                     Telemetry.Push(telemetry);
 
                     lock (this)