build: fixes animal-sniffer phase and runs on all JDKs (#1389)

Signed-off-by: Adrian Cole <adrian@tetrate.io>
openzipkin · Dec 18, 2023 · 90537d6 · 90537d6
1 parent 677244a
commit 90537d6
Show file tree

Hide file tree

Showing 30 changed files with 98 additions and 49 deletions.
diff --git a/brave/pom.xml b/brave/pom.xml
@@ -34,6 +34,9 @@
 
     <!-- disable errorprone cast warning as PendingSpans internally hacks equals -->
     <errorprone.args>-Xep:EqualsUnsafeCast:OFF</errorprone.args>
+
+    <!-- The brave jar needs to be Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -134,7 +137,6 @@
       <properties>
         <!-- The brave jar needs to be Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/brave/src/main/java/brave/internal/Platform.java b/brave/src/main/java/brave/internal/Platform.java
@@ -167,7 +167,7 @@ public Clock clock() {
   }
 
   static class Jre9 extends Jre7 {
-    @Override public long currentTimeMicroseconds() {
+    @IgnoreJRERequirement @Override public long currentTimeMicroseconds() {
       java.time.Instant instant = java.time.Clock.systemUTC().instant();
       return (instant.getEpochSecond() * 1000000) + (instant.getNano() / 1000);
     }

diff --git a/context/jfr/pom.xml b/context/jfr/pom.xml
@@ -30,9 +30,22 @@
     <module.name>brave.context.jfr</module.name>
 
     <main.basedir>${project.basedir}/../..</main.basedir>
+    <!-- for add-modules -->
     <main.java.version>11</main.java.version>
+    <!-- 12 not 11 as there is no java11 published -->
+    <main.signature.artifact>java12</main.signature.artifact>
   </properties>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.jvnet</groupId>
+      <artifactId>animal-sniffer-annotation</artifactId>
+      <version>1.0</version>
+      <!-- annotations are not runtime retention, so don't need a runtime dep -->
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -45,15 +58,6 @@
           </compilerArgs>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/context/jfr/src/main/java/brave/context/jfr/JfrScopeDecorator.java b/context/jfr/src/main/java/brave/context/jfr/JfrScopeDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2023 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
@@ -13,15 +13,16 @@
  */
 package brave.context.jfr;
 
-import brave.internal.Nullable;
 import brave.baggage.BaggageFields;
+import brave.internal.Nullable;
 import brave.propagation.CurrentTraceContext.Scope;
 import brave.propagation.CurrentTraceContext.ScopeDecorator;
 import brave.propagation.TraceContext;
 import jdk.jfr.Category;
 import jdk.jfr.Description;
 import jdk.jfr.Event;
 import jdk.jfr.Label;
+import org.jvnet.animal_sniffer.IgnoreJRERequirement;
 
 /**
  * Adds {@linkplain Event} properties "traceId", "parentId" and "spanId" when a {@link
@@ -55,6 +56,7 @@ public static ScopeDecorator get() {
   @Category("Zipkin")
   @Label("Scope")
   @Description("Zipkin event representing a span being placed in scope")
+  @IgnoreJRERequirement
   static final class ScopeEvent extends Event {
     @Label("Trace Id") String traceId;
     @Label("Parent Id") String parentId;

diff --git a/context/log4j12/pom.xml b/context/log4j12/pom.xml
@@ -30,6 +30,9 @@
     <module.name>brave.context.log4j12</module.name>
 
     <main.basedir>${project.basedir}/../..</main.basedir>
+
+    <!-- log4j is Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -47,7 +50,6 @@
       <properties>
         <!-- log4j is Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/context/log4j2/pom.xml b/context/log4j2/pom.xml
@@ -30,6 +30,9 @@
     <module.name>brave.context.log4j2</module.name>
 
     <main.basedir>${project.basedir}/../..</main.basedir>
+
+    <!-- log4j2 <= 2.3.2 is 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -47,7 +50,6 @@
       <properties>
         <!-- log4j2 <= 2.3.2 is 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/context/rxjava2/pom.xml b/context/rxjava2/pom.xml
@@ -30,6 +30,9 @@
     <module.name>brave.context.rxjava2</module.name>
 
     <main.basedir>${project.basedir}/../..</main.basedir>
+
+    <!-- RxJava 2.x continues support for Java 1.6 and Android 2.3+ -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -66,7 +69,6 @@
       <properties>
         <!-- RxJava 2.x continues support for Java 1.6 and Android 2.3+ -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/context/slf4j/pom.xml b/context/slf4j/pom.xml
@@ -30,6 +30,9 @@
     <module.name>brave.context.slf4j</module.name>
 
     <main.basedir>${project.basedir}/../..</main.basedir>
+
+    <!-- SLF4J is 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -47,7 +50,6 @@
       <properties>
         <!-- SLF4J is 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/instrumentation/dubbo-rpc/pom.xml b/instrumentation/dubbo-rpc/pom.xml
@@ -45,6 +45,9 @@
       --add-opens java.base/java.lang.reflect=ALL-UNNAMED
       --add-opens java.base/java.math=ALL-UNNAMED
     </maven-failsafe-plugin.argLine>
+
+    <!-- Dubbo is 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -81,7 +84,6 @@
       <properties>
         <!-- Dubbo is 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/instrumentation/grpc/pom.xml b/instrumentation/grpc/pom.xml
@@ -39,6 +39,9 @@
     <!-- disable mutability warning as TagContextBinaryMarshaller intentionally returns mixed -->
     <errorprone.args>-Xep:MixedMutabilityReturnType:OFF</errorprone.args>
 
+    <!-- grpc-java < 1.15 supports Java 6 https://github.com/grpc/grpc-java/issues/3961 Current versions support Java 7 even though TLS typically implies Java 8+ -->
+    <main.signature.artifact>java16</main.signature.artifact>
+
     <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
   </properties>
 
@@ -124,7 +127,6 @@
       <properties>
         <!-- grpc-java < 1.15 supports Java 6 https://github.com/grpc/grpc-java/issues/3961 Current versions support Java 7 even though TLS typically implies Java 8+ -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/instrumentation/http-tests-jakarta/pom.xml b/instrumentation/http-tests-jakarta/pom.xml
@@ -27,8 +27,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/../..</main.basedir>
-    <main.java.version>11</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
     <!-- disable errorprone warning that "return this" is not synchronized! -->
     <errorprone.args>-Xep:UnsynchronizedOverridesSynchronized:OFF</errorprone.args>
   </properties>
@@ -88,15 +86,6 @@
           </archive>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/instrumentation/http/pom.xml b/instrumentation/http/pom.xml
@@ -30,6 +30,9 @@
     <module.name>brave.http</module.name>
 
     <main.basedir>${project.basedir}/../..</main.basedir>
+
+    <!-- The brave jar needs to be Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -55,7 +58,6 @@
       <properties>
         <!-- The brave jar needs to be Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/instrumentation/httpasyncclient/pom.xml b/instrumentation/httpasyncclient/pom.xml
@@ -30,6 +30,9 @@
     <module.name>brave.httpasyncclient</module.name>
 
     <main.basedir>${project.basedir}/../..</main.basedir>
+
+    <!-- httpasyncclient Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -59,7 +62,6 @@
       <properties>
         <!-- httpasyncclient Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/instrumentation/httpclient/pom.xml b/instrumentation/httpclient/pom.xml
@@ -32,6 +32,9 @@
     <main.basedir>${project.basedir}/../..</main.basedir>
 
     <old-httpclient.version>4.3.6</old-httpclient.version>
+
+    <!-- httpclient is Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -105,7 +108,6 @@
       <properties>
         <!-- httpclient is Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/instrumentation/httpclient5/pom.xml b/instrumentation/httpclient5/pom.xml
@@ -34,6 +34,9 @@
 
     <!-- To obey the integration tests, we need to use the version >= 5.2 -->
     <httpclient5.version>5.3</httpclient5.version>
+
+    <!-- HttpClient 5 is Java 1.7 bytecode -->
+    <main.signature.artifact>java17</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -68,7 +71,6 @@
       <properties>
         <!-- HttpClient 5 is Java 1.7 bytecode -->
         <main.java.version>1.7</main.java.version>
-        <main.signature.artifact>java17</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/instrumentation/jaxrs2/pom.xml b/instrumentation/jaxrs2/pom.xml
@@ -30,6 +30,9 @@
     <module.name>brave.jaxrs2</module.name>
 
     <main.basedir>${project.basedir}/../..</main.basedir>
+
+    <!-- JAXRS2 is Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -104,7 +107,6 @@
       <properties>
         <!-- JAXRS2 is Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/instrumentation/jms/pom.xml b/instrumentation/jms/pom.xml
@@ -33,6 +33,9 @@
 
     <!-- disable errorprone override warning as we do this intentionally to allow JMS 1.1 -->
     <errorprone.args>-Xep:MissingOverride:OFF</errorprone.args>
+
+    <!-- JMS is Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -113,7 +116,6 @@
       <properties>
         <!-- JMS is Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/instrumentation/messaging/pom.xml b/instrumentation/messaging/pom.xml
@@ -27,6 +27,9 @@
 
   <properties>
     <main.basedir>${project.basedir}/../..</main.basedir>
+
+    <!-- The brave jar needs to be Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -72,7 +75,6 @@
       <properties>
         <!-- The brave jar needs to be Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/instrumentation/mongodb/pom.xml b/instrumentation/mongodb/pom.xml
@@ -32,6 +32,9 @@
     <main.basedir>${project.basedir}/../..</main.basedir>
 
     <mongodb-driver.version>3.12.14</mongodb-driver.version>
+
+    <!-- mongodb-driver 3.x requires Java 6 -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -61,7 +64,6 @@
       <properties>
         <!-- mongodb-driver 3.x requires Java 6 -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

diff --git a/instrumentation/mysql/pom.xml b/instrumentation/mysql/pom.xml
@@ -30,6 +30,9 @@
     <module.name>brave.mysql</module.name>
 
     <main.basedir>${project.basedir}/../..</main.basedir>
+
+    <!-- mysql-connector-java < v6 requires Java 6 -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -54,7 +57,6 @@
       <properties>
         <!-- mysql-connector-java < v6 requires Java 6 -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>