Merge pull request #253 from solarwinds/cc/NH-88139

NH-88139: upgrade to joboe 10.0.11 and add some sdk generated trace test
solarwinds · Aug 9, 2024 · 03b97b5 · 03b97b5
2 parents 2cfcf68 + b6eba92
commit 03b97b5
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,7 +44,7 @@ subprojects {
                 opentelemetryJavaagent: "2.5.0",
                 bytebuddy             : "1.12.10",
                 guava                 : "30.1-jre",
-                joboe                 : "10.0.9",
+                joboe                 : "10.0.11",
                 agent                 : "2.5.1", // the custom distro agent version
                 autoservice           : "1.0.1",
                 caffeine              : "2.9.3",

diff --git a/libs/config-10.0.9.jar → libs/config-10.0.11.jar b/libs/config-10.0.9.jar → libs/config-10.0.11.jar
diff --git a/libs/core-10.0.9.jar → libs/core-10.0.11.jar b/libs/core-10.0.9.jar → libs/core-10.0.11.jar
diff --git a/libs/logging-10.0.9.jar → libs/logging-10.0.11.jar b/libs/logging-10.0.9.jar → libs/logging-10.0.11.jar
diff --git a/libs/metrics-10.0.9.jar → libs/metrics-10.0.11.jar b/libs/metrics-10.0.9.jar → libs/metrics-10.0.11.jar
diff --git a/libs/sampling-10.0.9.jar → libs/sampling-10.0.11.jar b/libs/sampling-10.0.9.jar → libs/sampling-10.0.11.jar
diff --git a/smoke-tests/k6/basic.js b/smoke-tests/k6/basic.js
@@ -271,10 +271,8 @@ function verify_distributed_trace() {
 
                     for (let k = 0; k < properties.length; k++) {
                         const property = properties[k]
-                        if (property.key === "service.name") {
-                            check(property, {"check that remote service, java-apm-smoke-test, is path of the trace": prop => prop.value === "java-apm-smoke-test"})
-                            if (property.value === "java-apm-smoke-test") return;
-                        }
+                        check(property, {"check that remote service, java-apm-smoke-test, is path of the trace": prop => prop.value === "java-apm-smoke-test"})
+                        check(property, {"sdk-trace": prop => prop.value === "SDK.trace.test"})
                     }
                 }
             }

diff --git a/smoke-tests/spring-boot-webmvc/build.gradle b/smoke-tests/spring-boot-webmvc/build.gradle
@@ -40,7 +40,10 @@ dependencies {
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
 
+    implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.5.0")
+    runtimeOnly("io.opentelemetry:opentelemetry-api:1.39.0")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+
     testImplementation("org.springframework.boot:spring-boot-starter-test")
 }
 

diff --git a/smoke-tests/spring-boot-webmvc/src/main/kotlin/com/solarwinds/webmvc/Controller.kt b/smoke-tests/spring-boot-webmvc/src/main/kotlin/com/solarwinds/webmvc/Controller.kt
@@ -18,6 +18,9 @@
 package com.solarwinds.webmvc
 
 import com.solarwinds.api.ext.SolarwindsAgent
+import io.opentelemetry.api.GlobalOpenTelemetry
+import io.opentelemetry.api.OpenTelemetry
+import io.opentelemetry.instrumentation.annotations.WithSpan
 import mu.KotlinLogging
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
@@ -32,16 +35,32 @@ import java.net.http.HttpResponse
 @RequestMapping
 class Controller {
     private val log = KotlinLogging.logger {}
+    private val otelSdk: OpenTelemetry = GlobalOpenTelemetry.get()
+    private val tracer = otelSdk.getTracer("sdk.tracing")
 
     @GetMapping("greet/{name}")
     fun greet(@PathVariable name: String): String{
+        val startSpan = tracer.spanBuilder("greet-span")
+            .setAttribute("sw.test.source", "SDK.trace.test")
+            .startSpan()
+        startSpan.makeCurrent().use {
         SolarwindsAgent.setTransactionName(name)
+            startSpan.end()
         return  "Hello $name\n===================================\n\n"
+        }
     }
 
+    @WithSpan
     @GetMapping("distributed")
     fun distributed(): String {
+        val startSpan = tracer.spanBuilder("greet-span")
+            .setAttribute("sw.test.source", "SDK.trace.test")
+            .startSpan()
+
+        startSpan.makeCurrent().use {
         log.info("Got request at distributed")
+            startSpan.end()
+        }
         return HttpClient.newHttpClient()
             .send(
                 HttpRequest.newBuilder(URI.create("http://petclinic:9966/petclinic/api/pettypes")).GET().build(),

diff --git a/smoke-tests/src/test/java/com/solarwinds/SmokeTest.java b/smoke-tests/src/test/java/com/solarwinds/SmokeTest.java
@@ -251,4 +251,12 @@ void assertThatLogsAreExported() throws IOException {
     assertTrue(passes > 0, "log export is broken");
   }
 
+  @Test
+  void assertThatSdkTracingIsWorking() throws IOException {
+    String resultJson = new String(
+        Files.readAllBytes(namingConventions.local.k6Results(Configs.E2E.config.agents().get(0))));
+
+    double passes = ResultsCollector.read(resultJson, "$.root_group.checks.['sdk-trace'].passes");
+    assertTrue(passes > 1, "SDK trace is not working, expected a count > 1 ");
+  }
 }