Merge branch 'main' into docs/experimental-snippet

Author: laurit

.fossa.yml

@@ -721,6 +721,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:okhttp:okhttp-3.0:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:openai:openai-java-1.1:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:openai:openai-java-1.1:library'
     - type: gradle
       path: ./
       target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'

.github/renovate.json5

@@ -143,6 +143,16 @@
       ],
       enabled: false,
     },
+    {
+      // wiremock 3+ requires Java 11+
+      matchUpdateTypes: [
+        'major',
+      ],
+      enabled: false,
+      matchPackageNames: [
+        'com.github.tomakehurst:wiremock-jre8'
+      ],
+    },
     {
       // intentionally using Spring Boot 2 in this smoke tests
       // new versions of Spring Boot 3 are tested with

.github/workflows/auto-license-report.yml

@@ -43,7 +43,7 @@ jobs:
       - id: create-patch
         name: Create patch file
         run: |
-          git add -N licenses
+          git add -N --ignore-removal licenses
           git diff > patch
           if [ -s patch ]; then
             echo "exists=true" >> "$GITHUB_OUTPUT"

.github/workflows/auto-update-pull-request.yml

@@ -70,6 +70,7 @@ jobs:
         if: steps.unzip-patch.outputs.exists == 'true'
         run: |
           git apply "${{ runner.temp }}/patch"
+          git add licenses
           git commit -a -m "./gradlew ${{ steps.gradle-task.outputs.name }}"
           git push
 

.github/workflows/build-common.yml

@@ -194,8 +194,7 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: Build
-        # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-        run: ./gradlew check spdxSbom -x javadoc -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
+        run: ./gradlew check javadoc sourcesJar spdxSbom -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
       - name: Check for jApiCmp diffs
         # The jApiCmp diff compares current to latest, which isn't appropriate for release branches
@@ -512,12 +511,10 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: Local publish of artifacts
-        # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-        run: ./gradlew publishToMavenLocal -x javadoc
+        run: ./gradlew publishToMavenLocal
 
       - name: Local publish of gradle plugins
-        # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-        run: ./gradlew publishToMavenLocal -x javadoc
+        run: ./gradlew publishToMavenLocal
         working-directory: gradle-plugins
 
       - name: Build distro

.github/workflows/codeql.yml

@@ -38,6 +38,12 @@ jobs:
 
       # don't need to free disk space (which takes time) since running on larger machine
 
+      - name: Set up JDK 11
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: temurin
+          java-version: 11
+
       - name: Set up JDK for running Gradle
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:

CHANGELOG.md

@@ -2,6 +2,50 @@
 
 ## Unreleased
 
+## Version 2.18.0 (2025-07-17)
+
+### 🌟 New javaagent instrumentation
+
+- Add initial instrumentation for OpenAI client
+  ([#14221](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14221))
+
+### 🌟 New library instrumentation
+
+- Add initial instrumentation for OpenAI client
+  ([#14221](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14221))
+
+### 📈 Enhancements
+
+- Implement stable semantic conventions for `code.*` attributes with opt-in support
+  ([#13860](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13860))
+- Add span kind configuration support for method instrumentation and declarative tooling
+  ([#14014](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14014))
+- Add support for vendor-specific declarative configuration properties
+  ([#14016](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14016))
+- Add auto-instrumentation support for AWS Secrets Manager SDK v1
+  ([#14027](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14027))
+- Add `aws.sns.topic.arn` semantic convention support for AWS SNS SDK v1 and v2
+  ([#14035](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14035))
+- Remove `thread.name` attribute from experimental JVM metrics
+  ([#14061](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14061))
+- Enhance and align Jetty JMX metrics with OpenTelemetry semantic conventions
+  ([#14067](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14067))
+- Add support for latest spring-cloud-aws versions
+  ([#14207](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14207))
+- Add JDBC parameter capture support for `PreparedStatement.setObject()` method
+  ([#14219](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14219))
+- Add `aws.lambda.resource.mapping.id` and experimental Lambda attributes for AWS Lambda SDK
+  ([#14229](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14229))
+- Clear context class loader from OpenTelemetry internal threads to prevent leaks
+  ([#14241](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14241))
+
+### 🛠️ Bug fixes
+
+- Fix JDBC URL parser StringIndexOutOfBoundsException with malformed connection strings
+  ([#14151](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14151))
+- Fix empty units in JMX state metrics definitions
+  ([#14194](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14194))
+
 ## Version 2.17.0 (2025-06-20)
 
 ### Migration notes

benchmark-overhead/Dockerfile.petclinic

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.27_6-jdk@sha256:2fd4e5e0ba72f725016e757a5688ce14fda6a792da566fca62ef6ff73f50df35 as app-build
+FROM eclipse-temurin:11.0.27_6-jdk@sha256:cbc64d6d1a253561c029fd951575c449d70558063d5f898ab0b6213bc1fb0109 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
@@ -13,7 +13,7 @@ RUN git checkout 8aa4d49
 RUN ./mvnw package -Dmaven.test.skip=true
 RUN cp target/spring-petclinic-rest*.jar /app/spring-petclinic-rest.jar
 
-FROM bellsoft/liberica-openjdk-alpine:21.0.7@sha256:143e4c24da2872fad6803fcbde5d335bbbe47dddb8ebf20fd916c02bdc7f463b
+FROM bellsoft/liberica-openjdk-alpine:21.0.8@sha256:c4052811bba52c7a06ebde235c839108bf723dfab3c65066f61145a252480b16
 COPY --from=app-build /app/spring-petclinic-rest.jar /app/spring-petclinic-rest.jar
 WORKDIR /app
 EXPOSE 9966

benchmark-overhead/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("java")
-  id("com.diffplug.spotless") version "7.1.0"
+  id("com.diffplug.spotless") version "7.2.1"
 }
 
 spotless {
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-  implementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
+  implementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
 
   testImplementation("org.testcontainers:testcontainers:1.21.3")
   testImplementation("org.testcontainers:postgresql:1.21.3")

buildscripts/checkstyle.xml

@@ -254,6 +254,7 @@
       <property name="arrayInitIndent" value="2"/>
     </module>
     -->
+    <!-- handled by error prone
     <module name="AbbreviationAsWordInName">
       <property name="ignoreFinal" value="false"/>
       <property name="allowedAbbreviationLength" value="0"/>
@@ -262,6 +263,7 @@
                     PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
                     RECORD_COMPONENT_DEF"/>
     </module>
+    -->
     <module name="OverloadMethodsDeclarationOrder"/>
     <!-- there are only a few violations of this, and they all appear to be for good reasons
     <module name="VariableDeclarationUsageDistance"/>