Speeds up dubbo tests, aligns conventions and bumps deps (#1432)

Signed-off-by: Adrian Cole <adrian@tetrate.io>

brave-bom/pom.xml

@@ -293,7 +293,7 @@
 
           <plugin>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>

brave/pom.xml

@@ -77,7 +77,7 @@
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-core</artifactId>
-      <version>1.12.3</version>
+      <version>1.12.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

instrumentation/benchmarks/pom.xml

@@ -30,7 +30,7 @@
     <main.basedir>${project.basedir}/../..</main.basedir>
     <jmh.version>1.37</jmh.version>
     <!-- Note: versions above 2.2 move to jakarta package -->
-    <undertow-servlet.version>2.2.30.Final</undertow-servlet.version>
+    <undertow-servlet.version>2.2.31.Final</undertow-servlet.version>
   </properties>
 
   <!-- All dependencies are marked test, because benchmarks are a form of test.
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-xray-recorder-sdk-core</artifactId>
-      <version>2.15.1</version>
+      <version>2.15.2</version>
       <scope>test</scope>
     </dependency>
 

instrumentation/dubbo/pom.xml

@@ -30,7 +30,7 @@
 
     <main.basedir>${project.basedir}/../..</main.basedir>
 
-    <dubbo.version>3.3.0-beta.1</dubbo.version>
+    <dubbo.version>3.3.0-beta.2</dubbo.version>
     <!-- add opens to avoid below in JRE 21:
          com.alibaba.com.caucho.hessian.io.JavaSerializer -->
     <maven-failsafe-plugin.argLine>

instrumentation/dubbo/src/test/java/brave/dubbo/TestServer.java

@@ -23,7 +23,6 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.config.ApplicationConfig;
-import org.apache.dubbo.config.Constants;
 import org.apache.dubbo.config.ProtocolConfig;
 import org.apache.dubbo.config.RegistryConfig;
 import org.apache.dubbo.config.ServiceConfig;
@@ -42,16 +41,17 @@ class TestServer {
     if (linkLocalIp != null) {
       // avoid dubbo's logic which might pick docker ip
       System.setProperty(CommonConstants.DUBBO_IP_TO_BIND, linkLocalIp);
-      System.setProperty(Constants.DUBBO_IP_TO_REGISTRY, linkLocalIp);
+      System.setProperty(CommonConstants.DubboProperty.DUBBO_IP_TO_REGISTRY, linkLocalIp);
     }
+    // reduce dubbo shutdown timeout to 1s
+    System.setProperty(CommonConstants.SHUTDOWN_WAIT_KEY, "1000");
     service = new ServiceConfig<>();
     service.setApplication(application);
     service.setRegistry(new RegistryConfig(RegistryConfig.NO_AVAILABLE));
     service.setProtocol(new ProtocolConfig("dubbo", PickUnusedPort.get()));
   }
 
   public void initService() {
-
     service.setInterface(GreeterService.class);
     service.setRef((method, parameterTypes, args) -> {
       requestQueue.add(extractor.extract(RpcContext.getContext().getAttachments()));

instrumentation/grpc/pom.xml

@@ -33,8 +33,8 @@
     <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
     <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
 
-    <old-grpc.version>1.2.0</old-grpc.version>
-    <old-protoc.version>3.2.0</old-protoc.version>
+    <floor-grpc.version>1.2.0</floor-grpc.version>
+    <floor-protoc.version>3.2.0</floor-protoc.version>
 
     <!-- disable mutability warning as TagContextBinaryMarshaller intentionally returns mixed -->
     <errorprone.args>-Xep:MixedMutabilityReturnType:OFF</errorprone.args>
@@ -183,7 +183,7 @@
                 <DynamicDependency>
                   <groupId>io.grpc</groupId>
                   <artifactId>grpc-all</artifactId>
-                  <version>${old-grpc.version}</version>
+                  <version>${floor-grpc.version}</version>
                   <repositoryType>MAIN</repositoryType>
                   <type>jar</type>
                 </DynamicDependency>

instrumentation/grpc/src/it/grpc12/README.md → instrumentation/grpc/src/it/grpc_floor/README.md

@@ -1,4 +1,4 @@
-# grpc12
+# grpc_floor
 This tests that GrpcTracing does not require gRPC >1.2
 
 Note: this uses manually generated protoc sources to remove a compile dependency on protoc.

instrumentation/grpc/src/it/grpc12/pom.xml → instrumentation/grpc/src/it/grpc_floor/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2013-2023 The OpenZipkin Authors
+    Copyright 2013-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -20,9 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>@project.groupId@</groupId>
-  <artifactId>grpc12</artifactId>
+  <artifactId>grpc_floor</artifactId>
   <version>@project.version@</version>
-  <name>grpc12</name>
+  <name>grpc_floor</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-all</artifactId>
-      <version>@old-grpc.version@</version>
+      <version>@floor-grpc.version@</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

instrumentation/grpc/src/it/grpc12/src/test/java/brave/grpc12/ITTracingClientInterceptor.java → instrumentation/grpc/src/it/grpc_floor/src/test/java/brave/grpc12/ITTracingClientInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package brave.grpc12;
+package brave.grpc_floor;
 
 import brave.grpc.BaseITTracingClientInterceptor;
 import io.grpc.ManagedChannelBuilder;

instrumentation/grpc/src/it/grpc12/src/test/java/brave/grpc12/ITTracingServerInterceptor.java → instrumentation/grpc/src/it/grpc_floor/src/test/java/brave/grpc12/ITTracingServerInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package brave.grpc12;
+package brave.grpc_floor;
 
 import brave.grpc.BaseITTracingServerInterceptor;
 import io.grpc.ManagedChannelBuilder;

instrumentation/httpclient/pom.xml

@@ -31,7 +31,7 @@
 
     <main.basedir>${project.basedir}/../..</main.basedir>
 
-    <old-httpclient.version>4.3.6</old-httpclient.version>
+    <floor-httpclient.version>4.3.6</floor-httpclient.version>
   </properties>
 
   <dependencies>
@@ -82,14 +82,14 @@
             <DynamicDependency>
               <groupId>org.apache.httpcomponents</groupId>
               <artifactId>httpclient</artifactId>
-              <version>${old-httpclient.version}</version>
+              <version>${floor-httpclient.version}</version>
               <repositoryType>MAIN</repositoryType>
               <type>jar</type>
             </DynamicDependency>
             <DynamicDependency>
               <groupId>org.apache.httpcomponents</groupId>
               <artifactId>httpclient-cache</artifactId>
-              <version>${old-httpclient.version}</version>
+              <version>${floor-httpclient.version}</version>
               <repositoryType>MAIN</repositoryType>
               <type>jar</type>
             </DynamicDependency>

instrumentation/httpclient/src/it/httpclient_v43/README.md → instrumentation/httpclient/src/it/httpclient_floor/README.md

@@ -1,2 +1,2 @@
-# httpclient_v43
+# httpclient_floor
 This tests that TracingHttpClientBuilder can be used with httpclient 4.3

instrumentation/httpclient/src/it/httpclient_v43/pom.xml → instrumentation/httpclient/src/it/httpclient_floor/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2013-2023 The OpenZipkin Authors
+    Copyright 2013-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -20,9 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>@project.groupId@</groupId>
-  <artifactId>httpclient_v43</artifactId>
+  <artifactId>httpclient_floor</artifactId>
   <version>@project.version@</version>
-  <name>httpclient_v43</name>
+  <name>httpclient_floor</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,12 +42,12 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>@old-httpclient.version@</version>
+      <version>@floor-httpclient.version@</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient-cache</artifactId>
-      <version>@old-httpclient.version@</version>
+      <version>@floor-httpclient.version@</version>
     </dependency>
 
     <dependency>

instrumentation/httpclient/src/it/httpclient_v43/src/test/java/brave/httpclient_v43/ITTracingCachingHttpClientBuilder.java → instrumentation/httpclient/src/it/httpclient_floor/src/test/java/brave/httpclient_v43/ITTracingCachingHttpClientBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package brave.httpclient_v43;
+package brave.httpclient_floor;
 
 class ITTracingCachingHttpClientBuilder
   extends brave.httpclient.ITTracingCachingHttpClientBuilder {

instrumentation/httpclient/src/it/httpclient_v43/src/test/java/brave/httpclient_v43/ITTracingHttpClientBuilder.java → instrumentation/httpclient/src/it/httpclient_floor/src/test/java/brave/httpclient_v43/ITTracingHttpClientBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package brave.httpclient_v43;
+package brave.httpclient_floor;
 
 class ITTracingHttpClientBuilder extends brave.httpclient.ITTracingHttpClientBuilder {
 }

instrumentation/kafka-clients/pom.xml

@@ -31,7 +31,7 @@
 
     <main.basedir>${project.basedir}/../..</main.basedir>
 
-    <old-kafka-clients.version>1.0.0</old-kafka-clients.version>
+    <kafka-clients-floor.version>1.0.0</kafka-clients-floor.version>
 
     <!-- disable errorprone override warning as we do this intentionally to allow old clients -->
     <errorprone.args>-Xep:MissingOverride:OFF</errorprone.args>
@@ -92,7 +92,7 @@
             <DynamicDependency>
               <groupId>org.apache.kafka</groupId>
               <artifactId>kafka-clients</artifactId>
-              <version>${old-kafka-clients.version}</version>
+              <version>${kafka-clients-floor.version}</version>
               <repositoryType>MAIN</repositoryType>
               <type>jar</type>
             </DynamicDependency>

instrumentation/kafka-clients/src/it/kafka1/README.md → instrumentation/kafka-clients/src/it/kafka_floor/README.md

@@ -1,2 +1,2 @@
-# kafka1
+# kafka_floor
 This tests that KafkaPropagation can be used with kafka-client v<2

instrumentation/kafka-clients/src/it/kafka1/pom.xml → instrumentation/kafka-clients/src/it/kafka_floor/pom.xml

@@ -20,9 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>@project.groupId@</groupId>
-  <artifactId>kafka-clients-kafka1</artifactId>
+  <artifactId>kafka-clients-kafka_floor</artifactId>
   <version>@project.version@</version>
-  <name>kafka-clients-kafka1</name>
+  <name>kafka-clients-kafka_floor</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>
-      <version>@old-kafka-clients.version@</version>
+      <version>@kafka-clients-floor.version@</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>

instrumentation/kafka-clients/src/it/kafka1/src/test/java/brave/kafka1/clients/ITKafkaTracing.java → instrumentation/kafka-clients/src/it/kafka_floor/src/test/java/brave/kafka1/clients/ITKafkaTracing.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package brave.kafka1.clients;
+package brave.kafka_floor.clients;
 
 class ITKafkaTracing extends brave.kafka.clients.ITKafkaTracing {
 }

instrumentation/kafka-clients/src/test/java/brave/kafka/clients/KafkaContainer.java

@@ -32,7 +32,7 @@ final class KafkaContainer extends GenericContainer<KafkaContainer> {
   static final int KAFKA_PORT = 19092;
 
   KafkaContainer() {
-    super(parse("ghcr.io/openzipkin/zipkin-kafka:3.1.0"));
+    super(parse("ghcr.io/openzipkin/zipkin-kafka:3.1.1"));
     waitStrategy = Wait.forHealthcheck();
     // Kafka broker listener port (19092) needs to be exposed for test cases to access it.
     addFixedExposedPort(KAFKA_PORT, KAFKA_PORT, InternetProtocol.TCP);

instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaContainer.java

@@ -32,7 +32,7 @@ final class KafkaContainer extends GenericContainer<KafkaContainer> {
   static final int KAFKA_PORT = 19092;
 
   KafkaContainer() {
-    super(parse("ghcr.io/openzipkin/zipkin-kafka:3.1.0"));
+    super(parse("ghcr.io/openzipkin/zipkin-kafka:3.1.1"));
     waitStrategy = Wait.forHealthcheck();
     // Kafka broker listener port (19092) needs to be exposed for test cases to access it.
     addFixedExposedPort(KAFKA_PORT, KAFKA_PORT, InternetProtocol.TCP);

instrumentation/okhttp3/pom.xml

@@ -31,8 +31,8 @@
 
     <main.basedir>${project.basedir}/../..</main.basedir>
     <!-- Last version before Call.timeout was added -->
-    <old-okhttp.version>3.11.0</old-okhttp.version>
-    <retrofit.version>2.9.0</retrofit.version>
+    <okhttp-floor.version>3.11.0</okhttp-floor.version>
+    <retrofit.version>2.11.0</retrofit.version>
   </properties>
 
   <dependencies>
@@ -83,7 +83,7 @@
             <DynamicDependency>
               <groupId>com.squareup.okhttp3</groupId>
               <artifactId>mockwebserver</artifactId>
-              <version>${old-okhttp.version}</version>
+              <version>${okhttp-floor.version}</version>
               <repositoryType>MAIN</repositoryType>
               <type>jar</type>
             </DynamicDependency>

instrumentation/okhttp3/src/it/okhttp3_v3/README.md → instrumentation/okhttp3/src/it/okhttp3_floor/README.md

@@ -1,2 +1,2 @@
-# okhttp3_v3
+# okhttp3_floor
 This tests that TracingCallFactory can be used with okhttp3 <3.12

instrumentation/okhttp3/src/it/okhttp3_v3/pom.xml → instrumentation/okhttp3/src/it/okhttp3_floor/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2013-2023 The OpenZipkin Authors
+    Copyright 2013-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -20,9 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>@project.groupId@</groupId>
-  <artifactId>okhttp3_v3</artifactId>
+  <artifactId>okhttp3_floor</artifactId>
   <version>@project.version@</version>
-  <name>okhttp3_v3</name>
+  <name>okhttp3_floor</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>@old-okhttp.version@</version>
+      <version>@okhttp-floor.version@</version>
       <scope>provided</scope>
     </dependency>