fix errors

Author: laurit

conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts

@@ -123,6 +123,9 @@ tasks {
 
         disable("NonFinalStaticField")
 
+        // We get this warning in modules that compile for old java versions
+        disable("StringConcatToTextBlock")
+
         if (name.contains("Jmh") || name.contains("Test")) {
           // Allow underscore in test-type method names
           disable("MemberName")

custom-checks/src/test/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadocTest.java

@@ -12,13 +12,47 @@ class OtelInternalJavadocTest {
 
   @Test
   void test() {
-    doTest("internal/InternalJavadocPositiveCases.java");
-    doTest("internal/InternalJavadocNegativeCases.java");
+    doTest(
+        "internal/InternalJavadocPositiveCases.java",
+        """
+package io.opentelemetry.javaagent.customchecks.internal;
+
+// BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers
+public class InternalJavadocPositiveCases {
+
+  // BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers
+  public static class One {}
+
+  /** Doesn't have the disclaimer. */
+  // BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers
+  public static class Two {}
+}
+""");
+    doTest(
+        "internal/InternalJavadocNegativeCases.java",
+        """
+package io.opentelemetry.javaagent.customchecks.internal;
+
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public class InternalJavadocNegativeCases {
+
+  /**
+   * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+   * any time.
+   */
+  public static class One {}
+
+  static class Two {}
+}
+""");
   }
 
-  private static void doTest(String path) {
+  private static void doTest(String path, String... lines) {
     CompilationTestHelper.newInstance(OtelInternalJavadoc.class, OtelInternalJavadocTest.class)
-        .addSourceFile(path)
+        .addSourceLines(path, lines)
         .doTest();
   }
 }

custom-checks/src/test/resources/io/opentelemetry/javaagent/customchecks/internal/InternalJavadocNegativeCases.java

@@ -74,6 +74,7 @@ public String getUrlQuery(HttpRequest request) {
   }
 
   @Override
+  @SuppressWarnings("UnnecessaryDefaultInEnumSwitch")
   public String getNetworkProtocolName(HttpRequest request, @Nullable HttpResponse httpResponse) {
     return switch (request.getVersion()) {
       case HTTP_0_9, HTTP_1_0, HTTP_1_1, HTTP_2_0 -> "http";
@@ -82,6 +83,7 @@ public String getNetworkProtocolName(HttpRequest request, @Nullable HttpResponse
   }
 
   @Override
+  @SuppressWarnings("UnnecessaryDefaultInEnumSwitch")
   public String getNetworkProtocolVersion(
       HttpRequest request, @Nullable HttpResponse httpResponse) {
     return switch (request.getVersion()) {

custom-checks/src/test/resources/io/opentelemetry/javaagent/customchecks/internal/InternalJavadocPositiveCases.java

@@ -18,6 +18,7 @@ public Node newNode(Settings settings) {
         InternalSettingsPreparer.prepareEnvironment(settings, null),
         Collections.singleton(Netty4Plugin.class)) {
 
+      @SuppressWarnings({"UnusedMethod", "UnusedVariable"})
       protected void registerDerivedNodeNameWithLogger(String s) {}
     };
   }

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerHttpAttributesGetter.java

@@ -65,10 +65,9 @@ public boolean equals(@Nullable Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof Customer)) {
+    if (!(obj instanceof Customer other)) {
       return false;
     }
-    Customer other = (Customer) obj;
     return Objects.equals(id, other.id)
         && Objects.equals(firstName, other.firstName)
         && Objects.equals(lastName, other.lastName);

instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/elasticsearch6Test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6NodeFactory.java

@@ -86,14 +86,14 @@ public String getNetworkProtocolVersion(Request request, @Nullable Response unus
   public InetSocketAddress getNetworkPeerInetSocketAddress(
       Request request, @Nullable Response unused) {
     SocketAddress address = request.getConnectionMetaData().getRemoteSocketAddress();
-    return address instanceof InetSocketAddress ? (InetSocketAddress) address : null;
+    return address instanceof InetSocketAddress inetSocketAddress ? inetSocketAddress : null;
   }
 
   @Nullable
   @Override
   public InetSocketAddress getNetworkLocalInetSocketAddress(
       Request request, @Nullable Response unused) {
     SocketAddress address = request.getConnectionMetaData().getLocalSocketAddress();
-    return address instanceof InetSocketAddress ? (InetSocketAddress) address : null;
+    return address instanceof InetSocketAddress inetSocketAddress ? inetSocketAddress : null;
   }
 }

instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/java/spring/jpa/Customer.java

@@ -19,8 +19,7 @@ public final class ThreadGrouper {
   @Nullable
   public String groupedName(RecordedEvent ev) {
     Object thisField = ev.getValue("eventThread");
-    if (thisField instanceof RecordedThread) {
-      RecordedThread thread = (RecordedThread) thisField;
+    if (thisField instanceof RecordedThread thread) {
       return thread.getJavaName();
     }
     return null;

instrumentation/jetty/jetty-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HttpAttributesGetter.java

@@ -128,8 +128,8 @@ private static void doIfAvailable(
       return;
     }
     Object value = event.getValue(field);
-    if (value instanceof RecordedObject) {
-      closure.accept((RecordedObject) value);
+    if (value instanceof RecordedObject recordedObject) {
+      closure.accept(recordedObject);
     }
   }