quarkus

Author: zeitlinger

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy

@@ -6,15 +6,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
 import java.time.Duration;
 import java.util.Collection;
+import io.opentelemetry.sdk.logs.data.LogRecordData;
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 @DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
-class LogsSmokeTest extends SmokeTest {
+class LogsSmokeTest extends JavaSmokeTest {
+  @Override
   protected String getTargetImage(String jdk) {
     return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
         + jdk
@@ -33,7 +34,7 @@ void Should_export_logs(int jdk) {
     startTarget(jdk);
 
     client().get("/greeting").aggregate().join();
-    Collection<ExportLogsServiceRequest> logs = waitForLogs();
+    Collection<LogRecordData> logs = waitForLogs();
 
     assertThat(logs).isNotEmpty();
 

smoke-tests/src/test/java/io/opentelemetry/smoketest/LogsSmokeTest.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.smoketest;
+
+import io.opentelemetry.semconv.ServiceAttributes;
+import java.time.Duration;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
+import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static io.opentelemetry.sdk.testing.assertj.TracesAssert.assertThat;
+
+@DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
+class QuarkusSmokeTest extends JavaSmokeTest {
+  @Override
+  protected String getTargetImage(String jdk) {
+    return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk"
+        + jdk
+        + "-20241105.11678591860";
+  }
+
+  @Override
+  protected TargetWaitStrategy getWaitStrategy() {
+    return new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Listening on.*");
+  }
+
+  @Override
+  protected boolean getSetServiceName() {
+    return false;
+  }
+
+  @ParameterizedTest
+  @ValueSource(ints = {17, 21, 23}) // Quarkus 3.7+ requires Java 17+
+  void quarkus_smoke_test_on_JDK__jdk(int jdk) throws Exception {
+    startTarget(jdk);
+    String currentAgentVersion;
+    try (JarFile agentJar = new JarFile(agentPath)) {
+      currentAgentVersion =
+          agentJar
+              .getManifest()
+              .getMainAttributes()
+              .getValue(Attributes.Name.IMPLEMENTATION_VERSION);
+    }
+
+    client().get("/hello").aggregate().join();
+
+    assertThat(waitForTraces())
+        .hasTracesSatisfyingExactly(
+            trace ->
+                trace.hasSpansSatisfyingExactly(
+                    span ->
+                        span.hasName("GET /hello")
+                            .hasResourceSatisfying(
+                                resource -> {
+                                  resource
+                                      .hasAttribute(
+                                          TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION,
+                                          currentAgentVersion)
+                                      .hasAttribute(ServiceAttributes.SERVICE_NAME, "quarkus");
+                                })));
+
+    stopTarget();
+  }
+}