Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom from 1.23.0 to 1.24.0 #2963

Merged
merged 4 commits into from
Mar 16, 2023
Merged

Bump io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom from 1.23.0 to 1.24.0 #2963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e67697a
Bump io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom
dependabot[bot] Mar 16, 2023
645f329
./gradlew resolveAndLockAll --write-locks
Mar 16, 2023
01fcb1c
Merge remote-tracking branch 'origin/main' into dependabot/gradle/io.…
heyams Mar 16, 2023
2392e99
Fix shading
heyams Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/agent-bootstrap/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ com.squareup.moshi:moshi:1.11.0=runtimeClasspath
com.squareup.okio:okio:1.17.5=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-for-testing/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-profiler/agent-alerting-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-profiler/agent-alerting/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-tooling/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ io.netty:netty-transport-native-kqueue:4.1.90.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.90.Final=runtimeClasspath
io.netty:netty-transport:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.1.5=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/agent/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/azure-monitor-exporter/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ io.netty:netty-transport-native-kqueue:4.1.90.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.90.Final=runtimeClasspath
io.netty:netty-transport:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.1.5=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/instrumentation/azure-functions-worker-stub/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/instrumentation/azure-functions/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/instrumentation/methods/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/instrumentation/micrometer-1.0/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/runtime-attach/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.18.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
net.bytebuddy:byte-buddy-agent:1.11.18=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion classic-sdk/core/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion classic-sdk/web/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions

val otelVersion = "1.23.1"
val otelInstrumentationVersion = "1.23.0"
val otelInstrumentationVersion = "1.24.0"
val otelInstrumentationAlphaVersion = "1.23.0-alpha"
val otelContribAlphaVersion = "1.18.0-alpha"

Expand Down
2 changes: 1 addition & 1 deletion etw/java/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.90.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
Expand Down
2 changes: 2 additions & 0 deletions ...yShading/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ public List<String> getUnexpectedEntries() throws IOException {
expectedEntries.add("META-INF/licenses/.*");
expectedEntries.add("META-INF/LICENSE");
expectedEntries.add("META-INF/MANIFEST\\.MF");
expectedEntries.add("META-INF/native-image/");
expectedEntries.add("META-INF/native-image/.*");
expectedEntries.add("applicationinsights\\.appsvc\\.logback\\.xml");
expectedEntries.add("applicationinsights\\.console\\.logback\\.xml");
expectedEntries.add("applicationinsights\\.file\\.logback\\.xml");
Expand Down