Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into jmx-wildfly

Author: SylvainJuge

.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/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

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

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"/>

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

@@ -5,6 +5,7 @@ plugins {
 }
 
 dependencies {
+  compileOnly("org.scala-lang:scala-library:2.11.12")
   testCompileOnly("org.scala-lang:scala-library:2.11.12")
 }
 

docs/apidiffs/2.18.0_vs_2.17.0/opentelemetry-instrumentation-annotations.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.18.0.jar against opentelemetry-instrumentation-annotations-2.17.0.jar
+No changes.

docs/apidiffs/2.18.0_vs_2.17.0/opentelemetry-instrumentation-api.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-api-2.18.0.jar against opentelemetry-instrumentation-api-2.17.0.jar
+No changes.

docs/apidiffs/2.18.0_vs_2.17.0/opentelemetry-spring-boot-autoconfigure.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.18.0.jar against opentelemetry-spring-boot-autoconfigure-2.17.0.jar
+No changes.

docs/apidiffs/2.18.0_vs_2.17.0/opentelemetry-spring-boot-starter.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.18.0.jar against opentelemetry-spring-boot-starter-2.17.0.jar
+No changes.

docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.18.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.17.1.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.19.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.18.0.jar
 No changes.