update to use the latest semconv: https://opentelemetry.io/docs/specs…

…/semconv/resource/#telemetry-sdk-experimental
open-telemetry · Dec 11, 2023 · 0d04d1e · 0d04d1e
1 parent 10f4d6e
commit 0d04d1e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java b/...distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java
@@ -52,7 +52,7 @@ public void springBootSmokeTestOnJDK() throws IOException, InterruptedException
     Assertions.assertEquals(1, countSpansByName(traces, "WebController.withSpan"));
     Assertions.assertEquals(2, countSpansByAttributeValue(traces, "custom", "demo"));
     Assertions.assertNotEquals(
-        0, countResourcesByValue(traces, "telemetry.auto.version", currentAgentVersion));
+        0, countResourcesByValue(traces, "telemetry.distro.version", currentAgentVersion));
     Assertions.assertNotEquals(0, countResourcesByValue(traces, "custom.resource", "demo"));
 
     stopTarget();

diff --git a/...es/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java b/...es/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java
@@ -76,7 +76,7 @@ private void testAndVerify() throws IOException, InterruptedException {
     Assertions.assertEquals(1, countSpansByName(traces, "WebController.withSpan"));
     Assertions.assertEquals(2, countSpansByAttributeValue(traces, "custom", "demo"));
     Assertions.assertNotEquals(
-        0, countResourcesByValue(traces, "telemetry.auto.version", currentAgentVersion));
+        0, countResourcesByValue(traces, "telemetry.distro.version", currentAgentVersion));
     Assertions.assertNotEquals(0, countResourcesByValue(traces, "custom.resource", "demo"));
   }
 }
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy
@@ -51,7 +51,7 @@ class GrpcSmokeTest extends SmokeTest {
     countSpansByName(traces, 'opentelemetry.proto.collector.trace.v1.TraceService/Export') == 1
     countSpansByName(traces, 'TestService.withSpan') == 1
 
-    [currentAgentVersion] as Set == findResourceAttribute(traces, "telemetry.auto.version")
+    [currentAgentVersion] as Set == findResourceAttribute(traces, "telemetry.distro.version")
       .map { it.stringValue }
       .collect(toSet())
 

diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy
@@ -43,7 +43,7 @@ class QuarkusSmokeTest extends SmokeTest {
     countSpansByName(traces, 'GET /hello') == 1
     countSpansByName(traces, 'HelloResource.hello') == 1
 
-    [currentAgentVersion] as Set == findResourceAttribute(traces, "telemetry.auto.version")
+      [currentAgentVersion] as Set == findResourceAttribute(traces, "telemetry.distro.version")
       .map { it.stringValue }
       .collect(toSet())
 

diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
@@ -60,7 +60,7 @@ class SpringBootSmokeTest extends SmokeTest {
       .allMatch { it.attributesList.stream().map { it.key }.collect(toSet()).containsAll(["thread.id", "thread.name"]) }
 
     then: "correct agent version is captured in the resource"
-    [currentAgentVersion] as Set == findResourceAttribute(traces, "telemetry.auto.version")
+    [currentAgentVersion] as Set == findResourceAttribute(traces, "telemetry.distro.version")
       .map { it.stringValue }
       .collect(toSet())