Merge branch 'main' into feat/support-jfinal

Author: steverao

.fossa.yml

@@ -340,6 +340,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:armeria:armeria-grpc-1.14:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:async-http-client:async-http-client-1-common:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:async-http-client:async-http-client-1.8:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:async-http-client:async-http-client-1.9:javaagent'

.github/renovate.json5

@@ -159,6 +159,16 @@
         'com.github.tomakehurst:wiremock-jre8'
       ],
     },
+    {
+      // snakeyaml-engine 3+ requires Java 11+
+      matchUpdateTypes: [
+        'major',
+      ],
+      enabled: false,
+      matchPackageNames: [
+        'org.snakeyaml:snakeyaml-engine'
+      ],
+    },
     {
       // vaadin 14 tests require node 16
       matchPackageNames: [

benchmark-overhead/Dockerfile.petclinic

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.28_6-jdk@sha256:15eedd1722fc6abe55ffa1da22f581ae4fc21f18da78e911767c10f9b2cfd985 as app-build
+FROM eclipse-temurin:11.0.29_7-jdk@sha256:7a7110c39048dcdea4dec1629503459ef6d428a60aeede5a0dda102bf0f29173 as app-build
 
 # This is the base image that will contain a built version of the spring-petclinic-rest
 # application. Installing the dependencies and maven compiling the application is time

benchmark-overhead/README.md

@@ -79,6 +79,7 @@ Currently, we test:
 - no agent versus latest released agent
 - no agent versus latest snapshot
 - latest release vs. latest snapshot
+- latest snapshot with indy enabled
 
 Additional configurations can be created by submitting a PR against the `Configs` class.
 

benchmark-overhead/src/test/java/io/opentelemetry/agents/Agent.java

@@ -22,6 +22,12 @@ public class Agent {
       new Agent("latest", "latest mainstream release", OTEL_LATEST);
   public static final Agent LATEST_SNAPSHOT =
       new Agent("snapshot", "latest available snapshot version from main");
+  public static final Agent LATEST_SNAPSHOT_INDY =
+      new Agent(
+          "snapshot-indy",
+          "latest available snapshot version from main with indy enabled",
+          null,
+          Collections.singletonList("-Dotel.javaagent.experimental.indy=true"));
 
   private final String name;
   private final String description;

benchmark-overhead/src/test/java/io/opentelemetry/agents/AgentResolver.java

@@ -24,7 +24,7 @@ public Optional<Path> resolve(Agent agent) throws Exception {
     if (Agent.NONE.equals(agent)) {
       return Optional.empty();
     }
-    if (Agent.LATEST_SNAPSHOT.equals(agent)) {
+    if (Agent.LATEST_SNAPSHOT.equals(agent) || Agent.LATEST_SNAPSHOT_INDY.equals(agent)) {
       return snapshotResolver.resolve();
     }
     if (agent.hasUrl()) {

benchmark-overhead/src/test/java/io/opentelemetry/config/Configs.java

@@ -15,7 +15,8 @@ public enum Configs {
       TestConfig.builder()
           .name("release")
           .description("compares no agent, latest stable, and latest snapshot agents")
-          .withAgents(Agent.NONE, Agent.LATEST_RELEASE, Agent.LATEST_SNAPSHOT)
+          .withAgents(
+              Agent.NONE, Agent.LATEST_RELEASE, Agent.LATEST_SNAPSHOT, Agent.LATEST_SNAPSHOT_INDY)
           .warmupSeconds(60)
           .build());
 

conventions/build.gradle.kts

@@ -59,11 +59,11 @@ dependencies {
   implementation("com.gradleup.shadow:shadow-gradle-plugin:9.2.2")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
   implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2.2")
-  implementation("org.owasp:dependency-check-gradle:12.1.8")
+  implementation("org.owasp:dependency-check-gradle:12.1.9")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
   implementation("org.spdx:spdx-gradle-plugin:0.9.0")
   // When updating, also update dependencyManagement/build.gradle.kts
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.17.8")
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.18.1")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")

conventions/src/main/kotlin/io.opentelemetry.instrumentation.library-instrumentation.gradle.kts

@@ -10,3 +10,11 @@ dependencies {
 
   testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
 }
+
+testing {
+  suites.withType(JvmTestSuite::class).configureEach {
+    dependencies {
+      implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
+    }
+  }
+}

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

@@ -422,7 +422,7 @@ codenarc {
 checkstyle {
   configFile = rootProject.file("buildscripts/checkstyle.xml")
   // this version should match the version of google_checks.xml used as basis for above configuration
-  toolVersion = "12.1.1"
+  toolVersion = "12.1.2"
   maxWarnings = 0
 }
 
@@ -467,7 +467,7 @@ configurations.configureEach {
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")).using(project(":javaagent-extension-api"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")).using(project(":javaagent-tooling"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-agent-for-testing")).using(project(":testing:agent-for-testing"))
-      substitute(module("io.opentelemetry.javaagent:opentelemetry-testing-common")).using(project(":testing-common"))
+      substitute(module("io.opentelemetry.javaagent:opentelemetry-testing-common")).using(project(":testing-common:with-shaded-dependencies"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-muzzle")).using(project(":muzzle"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent")).using(project(":javaagent"))
     }