Skip to content

Commit 6ec10e4

Browse files
trasktrask
authored
Update submodule (#1876)
* Update to latest otel * Update icons for mysql and postgresql * Build * Bump submodule * Update dependencies * Bump submodule * Better kafka telemetry * Add placeholder for better dependency name * Add fallback for missing db.statement * Bump version * Better extension support * Bump submodule * Fix nullable * Fix hard-coded version number * Package-protected and docs
1 parent 1505c4a commit 6ec10e4

File tree

30 files changed

+431
-344
lines changed

30 files changed

+431
-344
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ jobs:
3636
path: ~/.gradle/wrapper
3737
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
3838
- name: Build otel-fork
39-
run: ./otel/gradlew --project-dir otel publishToMavenLocal --stacktrace
39+
working-directory: otel
40+
run: ./gradlew publishToMavenLocal --stacktrace
4041
- name: Test
4142
# TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
4243
run: ./gradlew check --stacktrace
@@ -87,7 +88,8 @@ jobs:
8788
path: ~/.gradle/wrapper
8889
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
8990
- name: Build otel-fork
90-
run: ./otel/gradlew --project-dir otel publishToMavenLocal --stacktrace
91+
working-directory: otel
92+
run: ./gradlew publishToMavenLocal --stacktrace
9193
- name: Test
9294
# TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
9395
run: ./gradlew ${{ matrix.module }}:smokeTest

‎.github/workflows/pr.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ jobs:
3838
path: ~/.gradle/wrapper
3939
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
4040
- name: Build otel-fork
41-
run: ./otel/gradlew --project-dir otel publishToMavenLocal --stacktrace
41+
working-directory: otel
42+
run: ./gradlew publishToMavenLocal --stacktrace
4243
- name: Test
4344
# TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
4445
run: ./gradlew check --stacktrace
@@ -89,7 +90,8 @@ jobs:
8990
path: ~/.gradle/wrapper
9091
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
9192
- name: Build otel-fork
92-
run: ./otel/gradlew --project-dir otel publishToMavenLocal --stacktrace
93+
working-directory: otel
94+
run: ./gradlew publishToMavenLocal --stacktrace
9395
- name: Test
9496
# TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
9597
run: ./gradlew ${{ matrix.module }}:smokeTest

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ ch.qos.logback:logback-core:1.2.3=runtimeClasspath
88
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
99
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
1010
com.squareup.okio:okio:1.17.5=runtimeClasspath
11-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.5.0+ai.patches-alpha=runtimeClasspath
12-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.5.0+ai.patches-alpha=runtimeClasspath
13-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0+ai.patches-alpha=runtimeClasspath
14-
io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.5.0+ai.patches-alpha=runtimeClasspath
15-
io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.5.0+ai.patches-alpha=runtimeClasspath
16-
io.opentelemetry:opentelemetry-api-metrics:1.5.0-alpha=runtimeClasspath
17-
io.opentelemetry:opentelemetry-api:1.5.0=runtimeClasspath
18-
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
19-
io.opentelemetry:opentelemetry-bom:1.5.0=runtimeClasspath
20-
io.opentelemetry:opentelemetry-context:1.5.0=runtimeClasspath
21-
io.opentelemetry:opentelemetry-semconv:1.5.0-alpha=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
2222
org.junit:junit-bom:5.7.2=runtimeClasspath
2323
org.slf4j:slf4j-api:1.7.30=runtimeClasspath
2424
empty=

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.google.errorprone:error_prone_annotations:2.7.1=runtimeClasspath
4+
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.5.0+ai.patches-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
8-
io.opentelemetry:opentelemetry-bom:1.5.0=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
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.google.errorprone:error_prone_annotations:2.7.1=runtimeClasspath
4+
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.5.0+ai.patches-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
8-
io.opentelemetry:opentelemetry-bom:1.5.0=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
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.5.0+ai.patches-alpha=runtimeClasspath
6-
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom:1.5.0=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
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.5.0+ai.patches-alpha=runtimeClasspath
6-
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom:1.5.0=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
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.5.0+ai.patches-alpha=runtimeClasspath
6-
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom:1.5.0=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
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.39.Final=runtimeClasspath
17-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0+ai.patches-alpha=runtimeClasspath
18-
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
19-
io.opentelemetry:opentelemetry-bom:1.5.0=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
2020
io.projectreactor:reactor-core:3.4.6=runtimeClasspath
2121
jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath
2222
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ io.netty:netty-transport-native-epoll:4.1.65.Final=runtimeClasspath
3636
io.netty:netty-transport-native-kqueue:4.1.65.Final=runtimeClasspath
3737
io.netty:netty-transport-native-unix-common:4.1.65.Final=runtimeClasspath
3838
io.netty:netty-transport:4.1.65.Final=runtimeClasspath
39-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0+ai.patches-alpha=runtimeClasspath
40-
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
41-
io.opentelemetry:opentelemetry-bom:1.5.0=runtimeClasspath
39+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.6.0+ai.patches-alpha=runtimeClasspath
40+
io.opentelemetry:opentelemetry-bom-alpha:1.6.0-alpha=runtimeClasspath
41+
io.opentelemetry:opentelemetry-bom:1.6.0=runtimeClasspath
4242
io.projectreactor.netty:reactor-netty-core:1.0.7=runtimeClasspath
4343
io.projectreactor.netty:reactor-netty-http-brave:1.0.7=runtimeClasspath
4444
io.projectreactor.netty:reactor-netty-http:1.0.7=runtimeClasspath

0 commit comments

Comments
 (0)