Merge branch 'open-telemetry:main' into nocode

Author: johnbley

.github/renovate.json5

@@ -78,6 +78,12 @@
         'com.gradleup.shadow{/,}**',
       ],
     },
+    {
+      groupName: 'guava packages',
+      matchPackageNames: [
+        'com.google.guava{/,}**',
+      ],
+    },
     {
       groupName: 'jackson packages',
       matchPackageNames: [

conventions/build.gradle.kts

@@ -55,7 +55,7 @@ dependencies {
 
   // When updating, update above in plugins too
   implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.2")
-  implementation("com.google.guava:guava:33.4.5-jre")
+  implementation("com.google.guava:guava:33.4.6-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.6")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")

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

@@ -10,6 +10,7 @@ dependencies {
 }
 
 val disableErrorProne = properties["disableErrorProne"]?.toString()?.toBoolean() ?: false
+val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
 
 tasks {
   withType<JavaCompile>().configureEach {
@@ -123,6 +124,16 @@ tasks {
 
         disable("NonFinalStaticField")
 
+        // We get this warning in modules that compile for old java versions
+        disable("StringConcatToTextBlock")
+
+        if (testLatestDeps) {
+          // Some latest dep tests are compiled for java 17 although the base version uses an older
+          // version. Disable rules that suggest using new language features.
+          disable("StatementSwitchToExpressionSwitch")
+          disable("PatternMatchingInstanceof")
+        }
+
         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

@@ -29,7 +29,7 @@ val DEPENDENCY_BOMS = listOf(
 
   "com.fasterxml.jackson:jackson-bom:2.18.3",
   "com.squareup.okio:okio-bom:3.10.2", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
-  "com.google.guava:guava-bom:33.4.0-jre",
+  "com.google.guava:guava-bom:33.4.6-jre",
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
   "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
@@ -38,7 +38,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
-val errorProneVersion = "2.36.0"
+val errorProneVersion = "2.37.0"
 val byteBuddyVersion = "1.17.4"
 val asmVersion = "9.7.1"
 val jmhVersion = "1.37"
@@ -90,7 +90,7 @@ val DEPENDENCIES = listOf(
   "com.github.stefanbirkner:system-lambda:1.2.1",
   "com.github.stefanbirkner:system-rules:1.19.0",
   "uk.org.webcompere:system-stubs-jupiter:2.0.3",
-  "com.uber.nullaway:nullaway:0.12.4",
+  "com.uber.nullaway:nullaway:0.12.5",
   "commons-beanutils:commons-beanutils:1.10.1",
   "commons-cli:commons-cli:1.9.0",
   "commons-codec:commons-codec:1.18.0",

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

@@ -108,18 +108,7 @@ All parameters and fields which can be `null` should be annotated with `@Nullabl
 (specifically `javax.annotation.Nullable`, which is included by the
 `otel.java-conventions` gradle plugin as a `compileOnly` dependency).
 
-There is no need to use `@NonNull`, as this is the default, which should be declared in a
-`package-info.java` file on the root package of each module, e.g.
-
-```java
-@DefaultQualifier(
-    value = NonNull.class,
-    locations = {TypeUseLocation.FIELD, TypeUseLocation.PARAMETER, TypeUseLocation.RETURN})
-package io.opentelemetry.instrumentation.api;
-
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.framework.qual.DefaultQualifier;
-```
+There is no need to use `@NonNull`, as this is the default.
 
 Public APIs should still defensively check for `null` parameters, even if the parameter is not
 annotated with `@Nullable`. Internal APIs do not need to defensively check for `null` parameters.