Skip to content

Commit 3b946f0

Browse files
Duncan-tree-zhouDuncan-tree-zhou
committed
mrege main and fix conflicts
2 parents 4033cb5 + ddf3a0b commit 3b946f0

File tree

195 files changed

+6334
-1303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+6334
-1303
lines changed

‎.fossa.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,12 @@ targets:
721721
- type: gradle
722722
path: ./
723723
target: ':instrumentation:okhttp:okhttp-3.0:library'
724+
- type: gradle
725+
path: ./
726+
target: ':instrumentation:openai:openai-java-1.1:javaagent'
727+
- type: gradle
728+
path: ./
729+
target: ':instrumentation:openai:openai-java-1.1:library'
724730
- type: gradle
725731
path: ./
726732
target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'
@@ -769,6 +775,9 @@ targets:
769775
- type: gradle
770776
path: ./
771777
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.50:javaagent'
778+
- type: gradle
779+
path: ./
780+
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.52:javaagent'
772781
- type: gradle
773782
path: ./
774783
target: ':instrumentation:opentelemetry-instrumentation-annotations:opentelemetry-instrumentation-annotations-1.16:javaagent'

‎.github/workflows/build-common.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ jobs:
194194
cache-read-only: ${{ inputs.cache-read-only }}
195195

196196
- name: Build
197-
# javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
198-
run: ./gradlew check spdxSbom -x javadoc -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
197+
run: ./gradlew check javadoc sourcesJar spdxSbom -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
199198

200199
- name: Check for jApiCmp diffs
201200
# The jApiCmp diff compares current to latest, which isn't appropriate for release branches
@@ -512,12 +511,10 @@ jobs:
512511
cache-read-only: ${{ inputs.cache-read-only }}
513512

514513
- name: Local publish of artifacts
515-
# javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
516-
run: ./gradlew publishToMavenLocal -x javadoc
514+
run: ./gradlew publishToMavenLocal
517515

518516
- name: Local publish of gradle plugins
519-
# javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
520-
run: ./gradlew publishToMavenLocal -x javadoc
517+
run: ./gradlew publishToMavenLocal
521518
working-directory: gradle-plugins
522519

523520
- name: Build distro

‎CHANGELOG.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,50 @@
22

33
## Unreleased
44

5+
## Version 2.18.0 (2025-07-17)
6+
7+
### 🌟 New javaagent instrumentation
8+
9+
- Add initial instrumentation for OpenAI client
10+
([#14221](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14221))
11+
12+
### 🌟 New library instrumentation
13+
14+
- Add initial instrumentation for OpenAI client
15+
([#14221](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14221))
16+
17+
### 📈 Enhancements
18+
19+
- Implement stable semantic conventions for `code.*` attributes with opt-in support
20+
([#13860](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13860))
21+
- Add span kind configuration support for method instrumentation and declarative tooling
22+
([#14014](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14014))
23+
- Add support for vendor-specific declarative configuration properties
24+
([#14016](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14016))
25+
- Add auto-instrumentation support for AWS Secrets Manager SDK v1
26+
([#14027](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14027))
27+
- Add `aws.sns.topic.arn` semantic convention support for AWS SNS SDK v1 and v2
28+
([#14035](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14035))
29+
- Remove `thread.name` attribute from experimental JVM metrics
30+
([#14061](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14061))
31+
- Enhance and align Jetty JMX metrics with OpenTelemetry semantic conventions
32+
([#14067](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14067))
33+
- Add support for latest spring-cloud-aws versions
34+
([#14207](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14207))
35+
- Add JDBC parameter capture support for `PreparedStatement.setObject()` method
36+
([#14219](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14219))
37+
- Add `aws.lambda.resource.mapping.id` and experimental Lambda attributes for AWS Lambda SDK
38+
([#14229](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14229))
39+
- Clear context class loader from OpenTelemetry internal threads to prevent leaks
40+
([#14241](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14241))
41+
42+
### 🛠️ Bug fixes
43+
44+
- Fix JDBC URL parser StringIndexOutOfBoundsException with malformed connection strings
45+
([#14151](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14151))
46+
- Fix empty units in JMX state metrics definitions
47+
([#14194](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14194))
48+
549
## Version 2.17.0 (2025-06-20)
650

751
### Migration notes

‎buildscripts/checkstyle.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
<property name="arrayInitIndent" value="2"/>
255255
</module>
256256
-->
257+
<!-- handled by error prone
257258
<module name="AbbreviationAsWordInName">
258259
<property name="ignoreFinal" value="false"/>
259260
<property name="allowedAbbreviationLength" value="0"/>
@@ -262,6 +263,7 @@
262263
PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
263264
RECORD_COMPONENT_DEF"/>
264265
</module>
266+
-->
265267
<module name="OverloadMethodsDeclarationOrder"/>
266268
<!-- there are only a few violations of this, and they all appear to be for good reasons
267269
<module name="VariableDeclarationUsageDistance"/>

‎conventions/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ dependencies {
5959
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
6060
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8")
6161
implementation("org.apache.httpcomponents:httpclient:4.5.14")
62-
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.0.2")
62+
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.1")
6363
implementation("org.owasp:dependency-check-gradle:12.1.3")
6464
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
6565
implementation("org.spdx:spdx-gradle-plugin:0.9.0")

‎conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ tasks.withType<ShadowJar>().configureEach {
2929
relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
3030
relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
3131
relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
32+
relocate("io.opentelemetry.common", "io.opentelemetry.javaagent.shaded.io.opentelemetry.common")
3233
}
3334

3435
// relocate(the OpenTelemetry extensions that are used by instrumentation modules)

‎conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ tasks {
140140
if ((project.path.endsWith(":testing") || name.contains("Test")) && !project.name.equals("custom-checks")) {
141141
// This check causes too many failures, ignore the ones in tests
142142
disable("OtelCanIgnoreReturnValueSuggester")
143+
disable("OtelInternalJavadoc")
143144
}
144145
}
145146
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule {
143143
with(ctx.details) {
144144
if (id.group == "io.netty" && id.name != "netty") {
145145
if (id.version.startsWith("4.1.")) {
146-
belongsTo("io.netty:netty-bom:4.1.122.Final", false)
146+
belongsTo("io.netty:netty-bom:4.1.123.Final", false)
147147
} else if (id.version.startsWith("4.0.")) {
148148
belongsTo("io.netty:netty-bom:4.0.56.Final", false)
149149
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
}
66

77
dependencies {
8+
compileOnly("org.scala-lang:scala-library:2.11.12")
89
testCompileOnly("org.scala-lang:scala-library:2.11.12")
910
}
1011

‎dependencyManagement/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
data class DependencySet(val group: String, val version: String, val modules: List<String>)
66

77
// this line is managed by .github/scripts/update-sdk-version.sh
8-
val otelSdkVersion = "1.51.0"
8+
val otelSdkVersion = "1.52.0"
99
val otelContribVersion = "1.47.0-alpha"
1010
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
1111

@@ -97,7 +97,7 @@ val DEPENDENCIES = listOf(
9797
"commons-collections:commons-collections:3.2.2",
9898
"commons-digester:commons-digester:2.1",
9999
"commons-fileupload:commons-fileupload:1.6.0",
100-
"commons-io:commons-io:2.19.0",
100+
"commons-io:commons-io:2.20.0",
101101
"commons-lang:commons-lang:2.6",
102102
"commons-logging:commons-logging:1.3.5",
103103
"commons-validator:commons-validator:1.10.0",

0 commit comments

Comments
 (0)