Merge remote-tracking branch 'upstream/main' into update-develocity-config

Author: trask

examples/distro/smoke-tests/build.gradle

@@ -5,7 +5,7 @@ plugins {
 dependencies {
   testImplementation("org.testcontainers:testcontainers:1.20.4")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.29.0")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.29.1")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")

examples/extension/build.gradle

@@ -101,7 +101,7 @@ dependencies {
   //All dependencies below are only for tests
   testImplementation("org.testcontainers:testcontainers:1.20.4")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.29.0")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.29.1")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha")

instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/groovy/server/VertxLatestHttpServerTest.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.vertx;
+
+import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Vertx;
+
+class VertxLatestHttpServerTest extends AbstractVertxHttpServerTest {
+
+  @Override
+  protected Class<? extends AbstractVerticle> verticle() {
+    return VertxLatestWebServer.class;
+  }
+
+  @Override
+  protected void stopServer(Vertx server) throws Exception {
+    server.close();
+  }
+}

instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxLatestHttpServerTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package server;
+package io.opentelemetry.javaagent.instrumentation.vertx;
 
 import io.vertx.core.Promise;
 import io.vertx.core.http.HttpServerResponse;

instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/java/server/VertxLatestWebServer.java renamed to instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxLatestWebServer.java

@@ -3,14 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package server
+package io.opentelemetry.javaagent.instrumentation.vertx;
 
-import io.vertx.core.AbstractVerticle
+import io.vertx.core.AbstractVerticle;
 
 class VertxHttpServerTest extends AbstractVertxHttpServerTest {
-
   @Override
   protected Class<? extends AbstractVerticle> verticle() {
-    return VertxWebServer
+    return VertxWebServer.class;
   }
 }

instrumentation/vertx/vertx-web-3.0/javaagent/src/version3Test/groovy/server/VertxHttpServerTest.groovy renamed to instrumentation/vertx/vertx-web-3.0/javaagent/src/version3Test/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxHttpServerTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package server;
+package io.opentelemetry.javaagent.instrumentation.vertx;
 
 import io.vertx.core.Future;
 import io.vertx.core.http.HttpServerResponse;

instrumentation/vertx/vertx-web-3.0/javaagent/src/version3Test/java/server/VertxWebServer.java renamed to instrumentation/vertx/vertx-web-3.0/javaagent/src/version3Test/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebServer.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.vertx;
+
+import io.opentelemetry.instrumentation.api.internal.HttpConstants;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest;
+import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
+import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
+import io.vertx.core.AbstractVerticle;
+import io.vertx.core.DeploymentOptions;
+import io.vertx.core.Vertx;
+import io.vertx.core.VertxOptions;
+import io.vertx.core.json.JsonObject;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+abstract class AbstractVertxHttpServerTest extends AbstractHttpServerTest<Vertx> {
+
+  @RegisterExtension
+  static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
+
+  @Override
+  protected void configure(HttpServerTestOptions options) {
+    super.configure(options);
+    options.setTestPathParam(true);
+    // server spans are ended inside of the controller spans
+    options.setVerifyServerSpanEndTime(false);
+    options.setContextPath("/vertx-app");
+    options.setExpectedHttpRoute(
+        (endpoint, method) -> {
+          if (Objects.equals(method, HttpConstants._OTHER)) {
+            return getContextPath() + endpoint.getPath();
+          }
+          if (Objects.equals(endpoint, ServerEndpoint.NOT_FOUND)) {
+            return getContextPath();
+          }
+          return super.expectedHttpRoute(endpoint, method);
+        });
+  }
+
+  @Override
+  protected Vertx setupServer()
+      throws ExecutionException, InterruptedException, TimeoutException, NoSuchMethodException {
+    Vertx server =
+        Vertx.vertx(
+            new VertxOptions()
+            // Useful for debugging:
+            // .setBlockedThreadCheckInterval(Integer.MAX_VALUE)
+            );
+    CompletableFuture<Void> future = new CompletableFuture<>();
+
+    server.deployVerticle(
+        verticle().getName(),
+        new DeploymentOptions()
+            .setConfig(
+                new JsonObject().put(AbstractVertxWebServer.CONFIG_HTTP_SERVER_PORT, (Object) port))
+            .setInstances(3),
+        res -> {
+          if (!res.succeeded()) {
+            throw new IllegalStateException("Cannot deploy server Verticle", res.cause());
+          }
+          future.complete(null);
+        });
+
+    future.get(30, TimeUnit.SECONDS);
+    return server;
+  }
+
+  @Override
+  protected void stopServer(Vertx server) throws Exception {
+    server.close();
+  }
+
+  protected abstract Class<? extends AbstractVerticle> verticle();
+}

instrumentation/vertx/vertx-web-3.0/testing/src/main/groovy/server/AbstractVertxHttpServerTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package server;
+package io.opentelemetry.javaagent.instrumentation.vertx;
 
 import static io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest.controller;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_HEADERS;