Merge branch 'main' into prefactor-db-info

Author: trask

.github/labeler.yml

@@ -7,4 +7,5 @@ test native:
           - instrumentation/spring/**
           - smoke-tests-otel-starter/**
           - dependencyManagement/build.gradle.kts
+          - settings.gradle.kts
       - all-globs-to-all-files: '!instrumentation/spring/**/javaagent/**'

.github/renovate.json5

@@ -18,7 +18,7 @@
         'patch',
       ],
       schedule: [
-        'before 8am on Tuesday',
+        '* 0-7 * * 2', // weekly, before 8am on Tuesday
       ],
     },
     {
@@ -29,8 +29,8 @@
         'dockerfile',
         'custom.regex',
       ],
-      extends: [
-        'schedule:weekly',
+      schedule: [
+        '* 0-7 * * 2', // weekly, before 8am on Tuesday
       ],
       groupName: 'weekly update',
     },

docs/contributing/style-guide.md

@@ -84,7 +84,7 @@ Public non-internal non-test classes should be declared `final` where possible.
 instrumentation code is not public API.
 "Test" here includes `src/test/` directories and any module whose directory name starts or ends
 with `testing` or `tests` (e.g., `testing/`, `testing-common/`, `testing-apps/`,
-`quarkus2-testing/`, `smoke-tests/`).
+`quarkus-2.0-testing/`, `smoke-tests/`).
 
 Methods should only be declared `final` if they are in public non-internal non-test non-final classes.
 

instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringTemplateTest.java

@@ -18,7 +18,6 @@
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.COUCHBASE;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Named.named;
 
 import com.couchbase.client.java.Bucket;
@@ -84,8 +83,10 @@ void setUpTemplates() {
   }
 
   @AfterAll
-  void cleanUp() {
-    assertAll(cleanup.stream().map(closeable -> closeable::close));
+  void cleanUp() throws Exception {
+    for (AutoCloseable closeable : cleanup) {
+      closeable.close();
+    }
   }
 
   private static Stream<Arguments> templates() {

instrumentation/oshi/library/src/test/java/io/opentelemetry/instrumentation/oshi/ProcessMetricsTest.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.instrumentation.oshi;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertAll;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -30,8 +29,10 @@ static void setUp() {
   }
 
   @AfterAll
-  static void tearDown() {
-    assertAll(observables.stream().map(observable -> observable::close));
+  static void tearDown() throws Exception {
+    for (AutoCloseable observable : observables) {
+      observable.close();
+    }
   }
 
   @Override

instrumentation/oshi/library/src/test/java/io/opentelemetry/instrumentation/oshi/SystemMetricsTest.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.instrumentation.oshi;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertAll;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -30,8 +29,10 @@ static void setUp() {
   }
 
   @AfterAll
-  static void tearDown() {
-    assertAll(observables.stream().map(observable -> observable::close));
+  static void tearDown() throws Exception {
+    for (AutoCloseable observable : observables) {
+      observable.close();
+    }
   }
 
   @Override

instrumentation/quarkus-resteasy-reactive/javaagent/build.gradle.kts

@@ -9,6 +9,12 @@ muzzle {
     // renamed to quarkus-rest in 3.9.0
     versions.set("(,3.9.0)")
   }
+  pass {
+    group.set("io.quarkus")
+    module.set("quarkus-rest")
+    versions.set("[3.9.0,)")
+    assertInverse.set(true)
+  }
 }
 
 dependencies {

…eactive/quarkus2-plugin/build.gradle.kts …tive/quarkus-2.0-plugin/build.gradle.ktsinstrumentation/quarkus-resteasy-reactive/quarkus2-plugin/build.gradle.kts renamed to instrumentation/quarkus-resteasy-reactive/quarkus-2.0-plugin/build.gradle.kts instrumentation/quarkus-resteasy-reactive/quarkus2-plugin/build.gradle.kts renamed to instrumentation/quarkus-resteasy-reactive/quarkus-2.0-plugin/build.gradle.kts

@@ -9,14 +9,15 @@ repositories {
 
 dependencies {
   implementation(gradleApi())
+  implementation("io.opentelemetry.instrumentation:quarkus-common-plugin")
   implementation("io.quarkus:quarkus-gradle-model:2.16.7.Final")
 }
 
 gradlePlugin {
   plugins {
-    create("quarkus2Plugin") {
-      id = "io.opentelemetry.instrumentation.quarkus2"
-      implementationClass = "io.opentelemetry.instrumentation.quarkus2plugin.Quarkus2Plugin"
+    create("quarkus20Plugin") {
+      id = "io.opentelemetry.instrumentation.quarkus-2.0"
+      implementationClass = "io.opentelemetry.instrumentation.quarkus.v2_0.plugin.Quarkus2Plugin"
     }
   }
 }

…ation/quarkus2plugin/Quarkus2Plugin.java …/quarkus/v2_0/plugin/Quarkus2Plugin.javainstrumentation/quarkus-resteasy-reactive/quarkus2-plugin/src/main/java/io/opentelemetry/instrumentation/quarkus2plugin/Quarkus2Plugin.java renamed to instrumentation/quarkus-resteasy-reactive/quarkus-2.0-plugin/src/main/java/io/opentelemetry/instrumentation/quarkus/v2_0/plugin/Quarkus2Plugin.java instrumentation/quarkus-resteasy-reactive/quarkus2-plugin/src/main/java/io/opentelemetry/instrumentation/quarkus2plugin/Quarkus2Plugin.java renamed to instrumentation/quarkus-resteasy-reactive/quarkus-2.0-plugin/src/main/java/io/opentelemetry/instrumentation/quarkus/v2_0/plugin/Quarkus2Plugin.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.quarkus2plugin;
+package io.opentelemetry.instrumentation.quarkus.v2_0.plugin;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;

…/tooling/dependency/DependencyUtils.java …/tooling/dependency/DependencyUtils.javainstrumentation/quarkus-resteasy-reactive/quarkus2-plugin/src/main/java/io/quarkus/gradle/tooling/dependency/DependencyUtils.java renamed to instrumentation/quarkus-resteasy-reactive/quarkus-2.0-plugin/src/main/java/io/quarkus/gradle/tooling/dependency/DependencyUtils.java instrumentation/quarkus-resteasy-reactive/quarkus2-plugin/src/main/java/io/quarkus/gradle/tooling/dependency/DependencyUtils.java renamed to instrumentation/quarkus-resteasy-reactive/quarkus-2.0-plugin/src/main/java/io/quarkus/gradle/tooling/dependency/DependencyUtils.java

@@ -56,6 +56,7 @@
 import io.quarkus.maven.dependency.ArtifactKey;
 import io.quarkus.maven.dependency.GACTV;
 
+// Based on https://github.com/quarkusio/quarkus/blob/2.16.7.Final/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/dependency/DependencyUtils.java
 public class DependencyUtils {
 
   private static final String COPY_CONFIGURATION_NAME = "quarkusDependency";
@@ -110,17 +111,8 @@ public static ExtensionDependency getExtensionInfoOrNull(Project project, Resolv
           : projectDep.getExtensions().findByType(SourceSetContainer.class);
       final String classifier = artifact.getClassifier();
       boolean isIncludedBuild = false;
-      /*
-      if ((!componentIdentifier.getBuild().isCurrentBuild() || sourceSets == null)
-          && (classifier == null || classifier.isEmpty())) {
-        var includedBuild = ToolingUtils.includedBuild(project, componentIdentifier);
-        if (includedBuild instanceof IncludedBuildInternal) {
-          projectDep = ToolingUtils.includedBuildProject((IncludedBuildInternal) includedBuild, componentIdentifier);
-          sourceSets = projectDep == null ? null : projectDep.getExtensions().findByType(SourceSetContainer.class);
-          isIncludedBuild = true;
-        }
-      }
-       */
+      // Upstream uses componentIdentifier.getBuild().isCurrentBuild() and ToolingUtils to resolve
+      // included build projects here; removed since it is not needed in our build
       if (sourceSets != null) {
         SourceSet mainSourceSet = sourceSets.findByName(SourceSet.MAIN_SOURCE_SET_NAME);
         if (mainSourceSet == null) {