Merge branch 'main' into feature/logstash-markers

Author: laurit

.github/workflows/pr-smoke-test-quarkus-images.yml

@@ -15,5 +15,6 @@ jobs:
     with:
       project: ":smoke-tests:images:quarkus"
       cache-read-only: true
-      # Quarkus 2.0+ does not support Java 8
+      # Quarkus 3.7+ requires Java 17+
       skip-java-8: true
+      skip-java-11: true

.github/workflows/publish-smoke-test-quarkus-images.yml

@@ -15,8 +15,9 @@ jobs:
     with:
       project: ":smoke-tests:images:quarkus"
       publish: true
-      # Quarkus 2.0+ does not support Java 8
+      # Quarkus 3.7+ requires Java 17+
       skip-java-8: true
+      skip-java-11: true
 
   workflow-notification:
     needs:

.github/workflows/reusable-native-tests.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - id: read-java
         run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
-      - uses: graalvm/setup-graalvm@6f327093bb6a42fe5eac053d21b168c46aa46f22 # v1.2.4.1
+      - uses: graalvm/setup-graalvm@557ffcf459751b4d92319ee255bf3bec9b73964c # v1.2.5.1
         with:
           version: "latest"
           java-version: "${{ steps.read-java.outputs.version }}"

.github/workflows/reusable-smoke-test-images.yml

@@ -22,6 +22,9 @@ on:
       skip-java-8:
         type: boolean
         required: false
+      skip-java-11:
+        type: boolean
+        required: false
       skip-java-17:
         type: boolean
         required: false
@@ -70,6 +73,7 @@ jobs:
         run: ./gradlew ${{ inputs.project }}:${{ inputs.publish && 'jib' || 'jibDockerBuild' }} -Ptag=${{ env.TAG }} -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain
 
       - name: Build Java 11 Docker image
+        if: "!inputs.skip-java-11"
         run: ./gradlew ${{ inputs.project }}:${{ inputs.publish && 'jib' || 'jibDockerBuild' }} -Ptag=${{ env.TAG }} -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
 
       - name: Build Java 17 Docker image

README.md

@@ -80,9 +80,9 @@ java -javaagent:path/to/opentelemetry-javaagent.jar \
      -jar myapp.jar
 ```
 
-By default, the OpenTelemetry Java agent uses
+By default, the OpenTelemetry Java agent uses the
 [OTLP exporter](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/otlp)
-configured to send data to
+configured to send data to an
 [OpenTelemetry collector](https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/otlpreceiver/README.md)
 at `http://localhost:4318`.
 
@@ -197,6 +197,6 @@ Thanks to all the people who already contributed!
 
 [config-sdk]: https://opentelemetry.io/docs/languages/java/configuration/
 
-[manual]: https://opentelemetry.io/docs/instrumentation/java/manual/
+[manual]: https://opentelemetry.io/docs/languages/java/instrumentation/#manual-instrumentation
 
-[suppress]: https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/#suppressing-specific-auto-instrumentation
+[suppress]: https://opentelemetry.io/docs/zero-code/java/agent/disable/

conventions/build.gradle.kts

@@ -57,14 +57,14 @@ dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
   implementation("com.google.guava:guava:33.3.1-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
-  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.4")
+  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.5")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
   implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:3.18.1")
   implementation("org.owasp:dependency-check-gradle:11.1.0")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.1")
   implementation("org.spdx:spdx-gradle-plugin:0.8.0")
   // When updating, also update dependencyManagement/build.gradle.kts
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.15.7")
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.15.10")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")

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

@@ -434,7 +434,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 = "10.19.0"
+  toolVersion = "10.20.0"
   maxWarnings = 0
 }
 

dependencyManagement/build.gradle.kts

@@ -41,7 +41,7 @@ val DEPENDENCY_BOMS = listOf(
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
 val errorProneVersion = "2.35.1"
-val byteBuddyVersion = "1.15.7"
+val byteBuddyVersion = "1.15.10"
 val asmVersion = "9.7.1"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"

examples/distro/build.gradle

@@ -13,7 +13,7 @@ buildscript {
   }
   dependencies {
     classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
-    classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.4"
+    classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.5"
     classpath "io.opentelemetry.instrumentation:gradle-plugins:2.10.0-alpha-SNAPSHOT"
   }
 }

examples/extension/build.gradle

@@ -10,7 +10,7 @@ plugins {
   into a single jar.
   See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
    */
-  id "com.gradleup.shadow" version "8.3.4"
+  id "com.gradleup.shadow" version "8.3.5"
   id "com.diffplug.spotless" version "6.25.0"
 
   id "io.opentelemetry.instrumentation.muzzle-generation" version "2.10.0-alpha-SNAPSHOT"