Skip to content

Commit fe34228

Browse files
trasktrask
authored
Update to otel 1.5.0 (#1862)
* Update submodule * Update otel version * Fix build
1 parent 96e92d2 commit fe34228

File tree

16 files changed

+78
-74
lines changed

16 files changed

+78
-74
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ jobs:
3737
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
3838
- name: Build otel-fork
3939
run: |
40-
./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal
41-
./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal
42-
./otel/gradlew --project-dir otel publishToMavenLocal
40+
./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal --stacktrace
41+
./otel/gradlew --project-dir otel :javaagent-extension-api:publishToMavenLocal --stacktrace
42+
./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal --stacktrace
43+
./otel/gradlew --project-dir otel publishToMavenLocal --stacktrace
4344
- name: Test
4445
# TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
4546
run: ./gradlew check --stacktrace
@@ -91,9 +92,10 @@ jobs:
9192
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
9293
- name: Build otel-fork
9394
run: |
94-
./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal
95-
./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal
96-
./otel/gradlew --project-dir otel publishToMavenLocal
95+
./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal --stacktrace
96+
./otel/gradlew --project-dir otel :javaagent-extension-api:publishToMavenLocal --stacktrace
97+
./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal --stacktrace
98+
./otel/gradlew --project-dir otel publishToMavenLocal --stacktrace
9799
- name: Test
98100
# TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
99101
run: ./gradlew ${{ matrix.module }}:smokeTest

‎.github/workflows/pr.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ jobs:
3939
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
4040
- name: Build otel-fork
4141
run: |
42-
./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal
43-
./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal
44-
./otel/gradlew --project-dir otel publishToMavenLocal
42+
./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal --stacktrace
43+
./otel/gradlew --project-dir otel :javaagent-extension-api:publishToMavenLocal --stacktrace
44+
./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal --stacktrace
45+
./otel/gradlew --project-dir otel publishToMavenLocal --stacktrace
4546
- name: Test
4647
# TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
4748
run: ./gradlew check --stacktrace
@@ -93,9 +94,10 @@ jobs:
9394
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
9495
- name: Build otel-fork
9596
run: |
96-
./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal
97-
./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal
98-
./otel/gradlew --project-dir otel publishToMavenLocal
97+
./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal --stacktrace
98+
./otel/gradlew --project-dir otel :javaagent-extension-api:publishToMavenLocal --stacktrace
99+
./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal --stacktrace
100+
./otel/gradlew --project-dir otel publishToMavenLocal --stacktrace
99101
- name: Test
100102
# TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
101103
run: ./gradlew ${{ matrix.module }}:smokeTest

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.5.0-alpha-S
1313
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
1414
io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.5.0-alpha-SNAPSHOT=runtimeClasspath
1515
io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.5.0-alpha-SNAPSHOT=runtimeClasspath
16-
io.opentelemetry:opentelemetry-api-metrics:1.4.1-alpha=runtimeClasspath
17-
io.opentelemetry:opentelemetry-api:1.4.1=runtimeClasspath
18-
io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
19-
io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
20-
io.opentelemetry:opentelemetry-context:1.4.1=runtimeClasspath
21-
io.opentelemetry:opentelemetry-semconv:1.4.1-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
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
com.google.errorprone:error_prone_annotations:2.7.1=runtimeClasspath
55
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
66
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
8-
io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
7+
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
8+
io.opentelemetry:opentelemetry-bom:1.5.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
com.google.errorprone:error_prone_annotations:2.7.1=runtimeClasspath
55
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
66
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
8-
io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
7+
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
8+
io.opentelemetry:opentelemetry-bom:1.5.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
55
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
6-
io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
6+
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
7+
io.opentelemetry:opentelemetry-bom:1.5.0=runtimeClasspath
88
org.junit:junit-bom:5.7.2=runtimeClasspath
99
empty=

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
55
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
6-
io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
6+
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
7+
io.opentelemetry:opentelemetry-bom:1.5.0=runtimeClasspath
88
org.junit:junit-bom:5.7.2=runtimeClasspath
99
empty=

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# This file is expected to be part of source control.
44
com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
55
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
6-
io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
7-
io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
6+
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
7+
io.opentelemetry:opentelemetry-bom:1.5.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ 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
1717
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
18-
io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
19-
io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
18+
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
19+
io.opentelemetry:opentelemetry-bom:1.5.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ 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
3939
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
40-
io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
41-
io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
40+
io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha=runtimeClasspath
41+
io.opentelemetry:opentelemetry-bom:1.5.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)