Skip to content

Commit 976cd5c

Browse files
trasktrask
authored
Update to OTel 1.7.0 (#1920)
* Update submodule * Bump versions * Update lock files * Update code * New implementation for half of app id exchange * Remove Java 16 testing * Log4j 1.2 doesn't support Java 17 * Add bootstrap artifact dependencies * Remove hack * Still getting OOM metaspace * more shading * Remove empty file * Fix smoke test * Handle http.scheme, host and target now * http.url -> http.target * Backwards compatible http.url shims * Revert "http.url -> http.target" This reverts commit 57b70aa. * Final submodule bump * Another update * Update submodule again * Add new internal-lambda instrumentation * Java 17 now supports log4j 1.2 mdc(?)
1 parent 531edb0 commit 976cd5c

File tree

37 files changed

+414
-390
lines changed

37 files changed

+414
-390
lines changed

‎.scripts/ot-gradle.cmd‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ pushd %PROJECT_ROOT%
1212

1313
set DEFAULT_OPTIONS=--info --stacktrace --warning-mode=all
1414
rem one branch build has been getting sporadic metaspace out of memory errors
15-
set GRADLE_OPTS=-XX:MaxMetaspaceSize=768m
15+
powershell -Command "(gc gradle.properties) -replace '-XX:MaxMetaspaceSize=512m', '-XX:MaxMetaspaceSize=768m' | Out-File -encoding ASCII gradle.properties"
16+
rem this is just for debugging
17+
type gradle.properties
1618
set GRADLE_CMD=gradlew.bat %DEFAULT_OPTIONS% %*
1719
echo Running '%GRADLE_CMD%' in '%PROJECT_ROOT%'
1820
call %GRADLE_CMD%

‎agent/agent-bootstrap/build.gradle.kts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ plugins {
33
id("ai.sdk-version-file")
44
}
55

6+
val otelInstrumentationAlphaVersion = "1.7.0+ai.patches-alpha"
7+
68
dependencies {
79
implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap") {
810
exclude("org.slf4j", "slf4j-simple")
@@ -13,6 +15,10 @@ dependencies {
1315
implementation("ch.qos.logback:logback-classic")
1416
implementation("ch.qos.logback.contrib:logback-json-classic")
1517

18+
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-jaxrs-bootstrap:$otelInstrumentationAlphaVersion")
19+
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-kafka-clients-0.11-bootstrap:$otelInstrumentationAlphaVersion")
20+
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-undertow-1.4-bootstrap:$otelInstrumentationAlphaVersion")
21+
1622
// not using gson because it has dependency on java.sql.*, which is not available in Java 9+ bootstrap class loader
1723
// only complaint so far about moshi is that it doesn"t give line numbers when there are json formatting errors
1824
implementation("com.squareup.moshi:moshi")

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,24 @@ ch.qos.logback.contrib:logback-json-classic:0.1.5=runtimeClasspath
55
ch.qos.logback.contrib:logback-json-core:0.1.5=runtimeClasspath
66
ch.qos.logback:logback-classic:1.2.3=runtimeClasspath
77
ch.qos.logback:logback-core:1.2.3=runtimeClasspath
8+
com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath
89
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
910
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
1011
com.squareup.okio:okio:1.17.5=runtimeClasspath
11-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.6.0+ai.patches-alpha=runtimeClasspath
12-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.6.0+ai.patches-alpha=runtimeClasspath
13-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.6.0+ai.patches-alpha=runtimeClasspath
14-
io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.6.0+ai.patches-alpha=runtimeClasspath
15-
io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.6.0+ai.patches-alpha=runtimeClasspath
16-
io.opentelemetry:opentelemetry-api-metrics:1.6.0-alpha=runtimeClasspath
17-
io.opentelemetry:opentelemetry-api:1.6.0=runtimeClasspath
18-
io.opentelemetry:opentelemetry-bom-alpha:1.6.0-alpha=runtimeClasspath
19-
io.opentelemetry:opentelemetry-bom:1.6.0=runtimeClasspath
20-
io.opentelemetry:opentelemetry-context:1.6.0=runtimeClasspath
21-
io.opentelemetry:opentelemetry-semconv:1.6.0-alpha=runtimeClasspath
12+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.7.0+ai.patches-alpha=runtimeClasspath
13+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.7.0+ai.patches-alpha=runtimeClasspath
14+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.7.0+ai.patches-alpha=runtimeClasspath
15+
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-jaxrs-bootstrap:1.7.0+ai.patches-alpha=runtimeClasspath
16+
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-kafka-clients-0.11-bootstrap:1.7.0+ai.patches-alpha=runtimeClasspath
17+
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-undertow-1.4-bootstrap:1.7.0+ai.patches-alpha=runtimeClasspath
18+
io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.7.0+ai.patches-alpha=runtimeClasspath
19+
io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.7.0+ai.patches-alpha=runtimeClasspath
20+
io.opentelemetry:opentelemetry-api-metrics:1.7.0-alpha=runtimeClasspath
21+
io.opentelemetry:opentelemetry-api:1.7.0=runtimeClasspath
22+
io.opentelemetry:opentelemetry-bom-alpha:1.7.0-alpha=runtimeClasspath
23+
io.opentelemetry:opentelemetry-bom:1.7.0=runtimeClasspath
24+
io.opentelemetry:opentelemetry-context:1.7.0=runtimeClasspath
25+
io.opentelemetry:opentelemetry-semconv:1.7.0-alpha=runtimeClasspath
2226
org.junit:junit-bom:5.7.2=runtimeClasspath
2327
org.slf4j:slf4j-api:1.7.30=runtimeClasspath
2428
empty=

‎agent/agent-bootstrap/src/main/java/patched/io/opentelemetry/api/common/AttributeKeyImpl.java‎

Lines changed: 0 additions & 104 deletions
This file was deleted.

‎agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# This file is expected to be part of source control.
44
com.google.errorprone:error_prone_annotations:2.9.0=runtimeClasspath
55
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
6-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.6.0+ai.patches-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom-alpha:1.6.0-alpha=runtimeClasspath
8-
io.opentelemetry:opentelemetry-bom:1.6.0=runtimeClasspath
6+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.7.0+ai.patches-alpha=runtimeClasspath
7+
io.opentelemetry:opentelemetry-bom-alpha:1.7.0-alpha=runtimeClasspath
8+
io.opentelemetry:opentelemetry-bom:1.7.0=runtimeClasspath
99
org.junit:junit-bom:5.7.2=runtimeClasspath
1010
org.slf4j:slf4j-api:1.7.30=runtimeClasspath
1111
empty=

‎agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# This file is expected to be part of source control.
44
com.google.errorprone:error_prone_annotations:2.9.0=runtimeClasspath
55
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
6-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.6.0+ai.patches-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom-alpha:1.6.0-alpha=runtimeClasspath
8-
io.opentelemetry:opentelemetry-bom:1.6.0=runtimeClasspath
6+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.7.0+ai.patches-alpha=runtimeClasspath
7+
io.opentelemetry:opentelemetry-bom-alpha:1.7.0-alpha=runtimeClasspath
8+
io.opentelemetry:opentelemetry-bom:1.7.0=runtimeClasspath
99
org.junit:junit-bom:5.7.2=runtimeClasspath
1010
org.slf4j:slf4j-api:1.7.30=runtimeClasspath
1111
empty=

‎agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
5-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.6.0+ai.patches-alpha=runtimeClasspath
6-
io.opentelemetry:opentelemetry-bom-alpha:1.6.0-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom:1.6.0=runtimeClasspath
5+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.7.0+ai.patches-alpha=runtimeClasspath
6+
io.opentelemetry:opentelemetry-bom-alpha:1.7.0-alpha=runtimeClasspath
7+
io.opentelemetry:opentelemetry-bom:1.7.0=runtimeClasspath
88
org.junit:junit-bom:5.7.2=runtimeClasspath
99
empty=

‎agent/agent-profiler/agent-alerting-api/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
5-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.6.0+ai.patches-alpha=runtimeClasspath
6-
io.opentelemetry:opentelemetry-bom-alpha:1.6.0-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom:1.6.0=runtimeClasspath
5+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.7.0+ai.patches-alpha=runtimeClasspath
6+
io.opentelemetry:opentelemetry-bom-alpha:1.7.0-alpha=runtimeClasspath
7+
io.opentelemetry:opentelemetry-bom:1.7.0=runtimeClasspath
88
org.junit:junit-bom:5.7.2=runtimeClasspath
99
empty=

‎agent/agent-profiler/agent-alerting/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
5-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.6.0+ai.patches-alpha=runtimeClasspath
6-
io.opentelemetry:opentelemetry-bom-alpha:1.6.0-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom:1.6.0=runtimeClasspath
5+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.7.0+ai.patches-alpha=runtimeClasspath
6+
io.opentelemetry:opentelemetry-bom-alpha:1.7.0-alpha=runtimeClasspath
7+
io.opentelemetry:opentelemetry-bom:1.7.0=runtimeClasspath
88
org.junit:junit-bom:5.7.2=runtimeClasspath
99
org.slf4j:slf4j-api:1.7.30=runtimeClasspath
1010
empty=

‎agent/agent-profiler/agent-profiler-api/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
1414
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
1515
com.squareup.okio:okio:1.17.5=runtimeClasspath
1616
io.netty:netty-tcnative-boringssl-static:2.0.43.Final=runtimeClasspath
17-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.6.0+ai.patches-alpha=runtimeClasspath
18-
io.opentelemetry:opentelemetry-bom-alpha:1.6.0-alpha=runtimeClasspath
19-
io.opentelemetry:opentelemetry-bom:1.6.0=runtimeClasspath
17+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.7.0+ai.patches-alpha=runtimeClasspath
18+
io.opentelemetry:opentelemetry-bom-alpha:1.7.0-alpha=runtimeClasspath
19+
io.opentelemetry:opentelemetry-bom:1.7.0=runtimeClasspath
2020
io.projectreactor:reactor-core:3.4.10=runtimeClasspath
2121
jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath
2222
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath

0 commit comments

Comments
 (0)