Skip to content

Commit

Permalink
Update to OTel 1.15.0 (#2332)
Browse files Browse the repository at this point in the history 
* Update to OTel 1.15.0

* Comments

* Update property names
  • Loading branch information
@trask
trask authored Jun 20, 2022
1 parent c7783a8 commit 0bd5ab1
Show file tree
Hide file tree
Showing 22 changed files with 66 additions and 67 deletions.
6 changes: 3 additions & 3 deletions agent/agent-bootstrap/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
com.squareup.okio:okio:1.17.5=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/agent-for-testing/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/agent-profiler/agent-alerting-api/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/agent-profiler/agent-alerting/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/agent-profiler/agent-profiler-api/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ com.squareup.okio:okio:1.17.5=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.netty:netty-tcnative-boringssl-static:2.0.46.Final=runtimeClasspath
io.netty:netty-tcnative-classes:2.0.46.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
io.projectreactor:reactor-core:3.4.14=runtimeClasspath
org.codehaus.woodstox:stax2-api:4.2.1=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
Expand Down
6 changes: 3 additions & 3 deletions agent/agent-profiler/agent-service-profiler/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ io.netty:netty-transport-native-epoll:4.1.72.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.72.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.72.Final=runtimeClasspath
io.netty:netty-transport:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.0.15=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.0.15=runtimeClasspath
io.projectreactor:reactor-core:3.4.14=runtimeClasspath
Expand Down
6 changes: 3 additions & 3 deletions agent/agent-tooling/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ io.netty:netty-transport-native-epoll:4.1.72.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.72.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.72.Final=runtimeClasspath
io.netty:netty-transport:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.0.15=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.0.15=runtimeClasspath
io.projectreactor:reactor-core:3.4.14=runtimeClasspath
Expand Down
11 changes: 5 additions & 6 deletions ...in/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigPropertySource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,15 @@ public Map<String, String> getProperties() {

String metricsExporter = getProperty("otel.metrics.exporter");
if (metricsExporter == null) {
// currently Application Insights exports metrics directly, not through OpenTelemetry
// exporter (this will change in the future)
// the metrics exporter is configured later in this case
properties.put("otel.metrics.exporter", "none");
} else {
properties.put("otel.metrics.exporter", metricsExporter);
}

String logsExporter = getProperty("otel.logs.exporter");
if (logsExporter == null) {
// currently Application Insights exports logs directly, not through OpenTelemetry
// exporter (this will change in the future)
// the logs exporter is configured later in this case
properties.put("otel.logs.exporter", "none");
} else {
properties.put("otel.logs.exporter", logsExporter);
Expand Down Expand Up @@ -171,7 +169,7 @@ private static void enableInstrumentations(Configuration config, Map<String, Str
properties.put("otel.instrumentation.cxf.enabled", "true");
properties.put("otel.instrumentation.metro.enabled", "true");

properties.put("otel.instrumentation.jboss-logmanager.enabled", "true");
properties.put("otel.instrumentation.jboss-logmanager-appender.enabled", "true");
properties.put("otel.instrumentation.jboss-logmanager-mdc.enabled", "true");
properties.put("otel.instrumentation.jetty.enabled", "true");
properties.put("otel.instrumentation.jetty-httpclient.enabled", "true");
Expand Down Expand Up @@ -254,7 +252,8 @@ private static void enableInstrumentations(Configuration config, Map<String, Str
properties.put("otel.instrumentation.akka-http.enabled", "true");
}
if (config.preview.instrumentation.play.enabled) {
properties.put("otel.instrumentation.play.enabled", "true");
properties.put("otel.instrumentation.play-mvc.enabled", "true");
properties.put("otel.instrumentation.play-ws.enabled", "true");
}
if (config.preview.instrumentation.apacheCamel.enabled) {
properties.put("otel.instrumentation.apache-camel.enabled", "true");
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ private static SdkTracerProviderBuilder configureTracing(
}

String tracesExporter = config.getString("otel.traces.exporter");
if ("none".equals(tracesExporter)) { // "none" is the default set in ConfigOverride
if ("none".equals(tracesExporter)) { // "none" is the default set in AiConfigPropertySource
SpanExporter spanExporter =
createSpanExporter(
telemetryClient,
Expand Down
6 changes: 3 additions & 3 deletions agent/agent/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/azure-monitor-exporter/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ io.netty:netty-transport-native-epoll:4.1.72.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.72.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.72.Final=runtimeClasspath
io.netty:netty-transport:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.0.15=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.0.15=runtimeClasspath
io.projectreactor:reactor-core:3.4.14=runtimeClasspath
Expand Down
6 changes: 3 additions & 3 deletions agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/instrumentation/azure-functions/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/instrumentation/micrometer-1.0/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/instrumentation/netty-4.0/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/instrumentation/netty-4.1/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/instrumentation/servlet/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions dependencyManagement/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ data class DependencySet(val group: String, val version: String, val modules: Li
val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions

val otelVersion = "1.14.0"
val otelVersion = "1.15.0"
// IMPORTANT when updating opentelemetry instrumentation version, be sure to update bytebuddy version to match
val otelInstrumentationVersion = "1.14.0"
val otelInstrumentationAlphaVersion = "1.14.0-alpha"
val otelInstrumentationVersion = "1.15.0"
val otelInstrumentationAlphaVersion = "1.15.0-alpha"
val otelContribAlphaVersion = "1.15.0-alpha"

rootProject.extra["otelVersion"] = otelVersion
Expand Down
6 changes: 3 additions & 3 deletions etw/java/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# This file is expected to be part of source control.
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.72.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.14.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
org.junit:junit-bom:5.7.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
empty=

0 comments on commit 0bd5ab1

Please sign in to comment.