[v3] add language tag all spans (#4839)

* add language tag all spans * fix unit tests * update test snapshots * update smoke test snapshots * update test snapshots
DataDog · Jun 26, 2024 · 7aaae84 · 7aaae84
1 parent 2a2fa1f
commit 7aaae84
Show file tree

Hide file tree

Showing 93 changed files with 5,968 additions and 30 deletions.
diff --git a/tracer/build/smoke_test_snapshots/smoke_test_snapshots.json b/tracer/build/smoke_test_snapshots/smoke_test_snapshots.json
@@ -14,6 +14,7 @@
         "http.method": "GET",
         "http.status_code": "200",
         "http.url": "http://localhost:5000/api/values",
+        "language": "dotnet",
         "out.host": "localhost",
         "runtime-id": "11c61d09-16bb-477f-87ab-4f81d656c5ca",
         "span.kind": "client"

diff --git a/tracer/build/smoke_test_snapshots/smoke_test_snapshots_2_1.json b/tracer/build/smoke_test_snapshots/smoke_test_snapshots_2_1.json
@@ -14,6 +14,7 @@
         "http.method": "GET",
         "http.status_code": "200",
         "http.url": "http://localhost:5000/api/values",
+        "language": "dotnet",
         "out.host": "localhost",
         "runtime-id": "b34b2bed-9444-4597-87f6-b8202b03b1b8",
         "span.kind": "client"

diff --git a/tracer/src/Datadog.Trace/Agent/MessagePack/SpanMessagePackFormatter.cs b/tracer/src/Datadog.Trace/Agent/MessagePack/SpanMessagePackFormatter.cs
@@ -404,14 +404,10 @@ private int WriteTags(ref byte[] bytes, int offset, in SpanModel model, ITagProc
                 offset += MessagePackBinary.WriteRaw(ref bytes, offset, envRawBytes);
             }
 
-            // add "language=dotnet" tag to all spans, except those that
-            // represents a downstream service or external dependency
-            if (span.Tags is not InstrumentationTags { SpanKind: SpanKinds.Client or SpanKinds.Producer })
-            {
-                count++;
-                offset += MessagePackBinary.WriteStringBytes(ref bytes, offset, _languageNameBytes);
-                offset += MessagePackBinary.WriteStringBytes(ref bytes, offset, _languageValueBytes);
-            }
+            // add "language=dotnet" tag to all spans
+            count++;
+            offset += MessagePackBinary.WriteStringBytes(ref bytes, offset, _languageNameBytes);
+            offset += MessagePackBinary.WriteStringBytes(ref bytes, offset, _languageValueBytes);
 
             // add "version" tags to all spans whose service name is the default service name
             if (string.Equals(span.Context.ServiceNameInternal, model.TraceChunk.DefaultServiceName, StringComparison.OrdinalIgnoreCase))
@@ -426,7 +422,7 @@ private int WriteTags(ref byte[] bytes, int offset, in SpanModel model, ITagProc
                 }
             }
 
-            // SCI tags will be sent only once per trace
+            // SCI tags will be sent only once per trace chunk
             if (model.IsFirstSpanInChunk)
             {
                 var gitCommitShaRawBytes = MessagePackStringCache.GetGitCommitShaBytes(model.TraceChunk.GitCommitSha);

diff --git a/tracer/test/Datadog.Trace.Tests/Tagging/TagsListTests.cs b/tracer/test/Datadog.Trace.Tests/Tagging/TagsListTests.cs
@@ -233,12 +233,13 @@ public async Task Serialize_LanguageTag_ManualInstrumentation()
         }
 
         [Theory]
-        [InlineData(SpanKinds.Client, null)]
-        [InlineData(SpanKinds.Server, TracerConstants.Language)]
-        [InlineData(SpanKinds.Producer, null)]
-        [InlineData(SpanKinds.Consumer, TracerConstants.Language)]
-        [InlineData("other", TracerConstants.Language)]
-        public async Task Serialize_LanguageTag_AutomaticInstrumentation(string spanKind, string expectedLanguage)
+        [InlineData(SpanKinds.Client)]
+        [InlineData(SpanKinds.Server)]
+        [InlineData(SpanKinds.Producer)]
+        [InlineData(SpanKinds.Consumer)]
+        [InlineData(SpanKinds.Internal)]
+        [InlineData("other")]
+        public async Task Serialize_LanguageTag_AutomaticInstrumentation(string spanKind)
         {
             const int customTagCount = 15;
 
@@ -253,15 +254,7 @@ public async Task Serialize_LanguageTag_AutomaticInstrumentation(string spanKind
             await _tracer.FlushAsync();
             var traceChunks = _testApi.Wait();
             var deserializedSpan = traceChunks.Single().Single();
-
-            if (expectedLanguage == null)
-            {
-                deserializedSpan.Tags.Should().NotContainKey(Tags.Language);
-            }
-            else
-            {
-                deserializedSpan.Tags.Should().Contain(Tags.Language, expectedLanguage);
-            }
+            deserializedSpan.Tags.Should().Contain(Tags.Language, TracerConstants.Language);
         }
 
         private static void SetupForSerializationTest(Span span, int customTagCount)

diff --git a/tracer/test/snapshots/AerospikeTests.SchemaV0.verified.txt b/tracer/test/snapshots/AerospikeTests.SchemaV0.verified.txt
@@ -11,6 +11,7 @@
       aerospike.namespace: test,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -33,6 +34,7 @@
       aerospike.namespace: test,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -55,6 +57,7 @@
       aerospike.namespace: test,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -77,6 +80,7 @@
       aerospike.namespace: test,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -101,6 +105,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -125,6 +130,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -149,6 +155,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -173,6 +180,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -196,6 +204,7 @@
       aerospike.setname: myset1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -220,6 +229,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -244,6 +254,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -268,6 +279,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -292,6 +304,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -316,6 +329,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -340,6 +354,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -364,6 +379,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -388,6 +404,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -412,6 +429,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },
@@ -436,6 +454,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       runtime-id: Guid_1,
       span.kind: client
     },

diff --git a/tracer/test/snapshots/AerospikeTests.SchemaV1.verified.txt b/tracer/test/snapshots/AerospikeTests.SchemaV1.verified.txt
@@ -11,6 +11,7 @@
       aerospike.namespace: test,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -36,6 +37,7 @@
       aerospike.namespace: test,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -61,6 +63,7 @@
       aerospike.namespace: test,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -86,6 +89,7 @@
       aerospike.namespace: test,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -113,6 +117,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -140,6 +145,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -167,6 +173,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -194,6 +201,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -220,6 +228,7 @@
       aerospike.setname: myset1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -247,6 +256,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -274,6 +284,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -301,6 +312,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -328,6 +340,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -355,6 +368,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -382,6 +396,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -409,6 +424,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -436,6 +452,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -463,6 +480,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,
@@ -490,6 +508,7 @@
       aerospike.userkey: mykey1,
       component: aerospike,
       env: integration_tests,
+      language: dotnet,
       peer.service: test,
       runtime-id: Guid_1,
       span.kind: client,