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

Update to OpenTelemetry 1.16.0 #2408

Merged
merged 10 commits into from
Jul 20, 2022
Merged

Update to OpenTelemetry 1.16.0 #2408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dc5e3bf
Simplify
trask Jul 20, 2022
34766b7
Regenerate lockfiles
trask Jul 20, 2022
336a0a4
Update to 1.16.0
trask Jul 20, 2022
584e60c
Updates
trask Jul 20, 2022
f5b6910
Fix
trask Jul 20, 2022
ec7eff2
Fix
trask Jul 20, 2022
8acfa64
Fix
trask Jul 20, 2022
fd0699a
Remove deprecated API usages
trask Jul 20, 2022
b00b62c
Merge remote-tracking branch 'origin/main' into update-otel
trask Jul 20, 2022
a6037c3
Update contrib version
trask Jul 20, 2022
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
6 changes: 3 additions & 3 deletions agent/agent-bootstrap/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
com.squareup.okio:okio:1.17.5=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
org.junit:junit-bom:5.8.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
Open in desktop
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.azure:azure-sdk-bom:1.2.3=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
org.junit:junit-bom:5.8.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions 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 @@ -4,9 +4,9 @@
com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.14.0=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
org.junit:junit-bom:5.8.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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.14.0=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
org.junit:junit-bom:5.8.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
Open in desktop
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.azure:azure-sdk-bom:1.2.3=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
org.junit:junit-bom:5.8.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions 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 @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
org.junit:junit-bom:5.8.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/agent-profiler/agent-alerting/gradle.lockfile
View file
Open in desktop
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.azure:azure-sdk-bom:1.2.3=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
org.junit:junit-bom:5.8.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
empty=
10 changes: 10 additions & 0 deletions agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
org.junit:junit-bom:5.8.2=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/agent-profiler/agent-profiler-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ com.fasterxml.woodstox:woodstox-core:6.2.7=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
com.squareup.okio:okio:1.17.5=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
io.projectreactor:reactor-core:3.4.17=runtimeClasspath
org.codehaus.woodstox:stax2-api:4.2.1=runtimeClasspath
org.junit:junit-bom:5.8.2=runtimeClasspath
Expand Down
6 changes: 3 additions & 3 deletions agent/agent-profiler/agent-service-profiler/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ io.netty:netty-transport-native-epoll:4.1.76.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.76.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.76.Final=runtimeClasspath
io.netty:netty-transport:4.1.76.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.0.18=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.0.18=runtimeClasspath
io.projectreactor:reactor-core:3.4.17=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent-tooling/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ dependencies {
compileOnly(project(":agent:agent-bootstrap"))
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")

compileOnly("com.google.auto.value:auto-value-annotations")
annotationProcessor("com.google.auto.value:auto-value")

testImplementation(project(":agent:agent-bootstrap"))
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")

testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("com.azure:azure-core-test")
Expand Down
7 changes: 3 additions & 4 deletions agent/agent-tooling/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ io.netty:netty-transport-native-epoll:4.1.76.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.76.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.76.Final=runtimeClasspath
io.netty:netty-transport:4.1.76.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.0.18=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.0.18=runtimeClasspath
io.projectreactor:reactor-core:3.4.17=runtimeClasspath
Expand All @@ -65,7 +65,6 @@ org.apache.commons:commons-lang3:3.11=runtimeClasspath
org.apache.commons:commons-text:1.9=runtimeClasspath
org.codehaus.woodstox:stax2-api:4.2.1=runtimeClasspath
org.junit:junit-bom:5.8.2=runtimeClasspath
org.ow2.asm:asm:9.1=runtimeClasspath
org.reactivestreams:reactive-streams:1.0.3=runtimeClasspath
org.slf4j:jcl-over-slf4j:1.7.36=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
Expand Down
4 changes: 1 addition & 3 deletions ...c/main/java/com/microsoft/applicationinsights/agent/internal/init/AfterAgentListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import com.google.auto.service.AutoService;
import com.microsoft.applicationinsights.agent.internal.httpclient.LazyHttpClient;
import io.opentelemetry.instrumentation.api.config.Config;
import io.opentelemetry.javaagent.extension.AgentListener;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;

Expand All @@ -37,8 +36,7 @@ public static void setAppIdSupplier(AppIdSupplier appIdSupplier) {
}

@Override
public void afterAgent(
Config config, AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
// only safe now to resolve app id because SSL initialization
// triggers loading of java.util.logging (starting with Java 8u231)
// and JBoss/Wildfly need to install their own JUL manager before JUL is initialized.
Expand Down
14 changes: 8 additions & 6 deletions ...c/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
import com.google.auto.service.AutoService;
import com.microsoft.applicationinsights.agent.internal.configuration.Configuration;
import com.microsoft.applicationinsights.agent.internal.legacyheaders.DelegatingPropagatorProvider;
import io.opentelemetry.javaagent.extension.config.ConfigCustomizer;
import io.opentelemetry.javaagent.extension.config.ConfigPropertySource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;

@AutoService(ConfigCustomizer.class)
public class AiConfigCustomizer implements ConfigCustomizer {
@AutoService(ConfigPropertySource.class)
public class AiConfigCustomizer implements ConfigPropertySource {

@Override
public Map<String, String> defaultProperties() {
public Map<String, String> getProperties() {
Configuration config = FirstEntryPoint.getConfiguration();

Map<String, String> properties = new HashMap<>();
Expand Down Expand Up @@ -198,7 +198,9 @@ private static void enableInstrumentations(Configuration config, Map<String, Str
properties.put("otel.instrumentation.netty-4.1.enabled", "true");

properties.put("otel.instrumentation.okhttp.enabled", "true");
properties.put("otel.instrumentation.opentelemetry-annotations.enabled", "true");
properties.put("otel.instrumentation.opentelemetry-extension-annotations.enabled", "true");
properties.put(
"otel.instrumentation.opentelemetry-instrumentation-annotations.enabled", "true");
properties.put("otel.instrumentation.opentelemetry-api.enabled", "true");
properties.put("otel.instrumentation.opentelemetry-instrumentation-api.enabled", "true");
properties.put("otel.instrumentation.reactor.enabled", "true");
Expand All @@ -207,7 +209,6 @@ private static void enableInstrumentations(Configuration config, Map<String, Str

properties.put("otel.instrumentation.servlet.enabled", "true");
properties.put("otel.instrumentation.spring-core.enabled", "true");
properties.put("otel.instrumentation.spring-jms.enabled", "true");
properties.put("otel.instrumentation.spring-web.enabled", "true");
properties.put("otel.instrumentation.spring-webmvc.enabled", "true");
properties.put("otel.instrumentation.spring-webflux.enabled", "true");
Expand All @@ -232,6 +233,7 @@ private static void enableInstrumentations(Configuration config, Map<String, Str
}
if (config.instrumentation.jms.enabled) {
properties.put("otel.instrumentation.jms.enabled", "true");
properties.put("otel.instrumentation.spring-jms.enabled", "true");
}
if (config.instrumentation.kafka.enabled) {
properties.put("otel.instrumentation.kafka.enabled", "true");
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/microsoft/applicationinsights/agent/internal/init/AiIgnoreMatcherProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
package com.microsoft.applicationinsights.agent.internal.init;

import com.google.auto.service.AutoService;
import io.opentelemetry.instrumentation.api.config.Config;
import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder;
import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;

@AutoService(IgnoredTypesConfigurer.class)
public class AiIgnoreMatcherProvider implements IgnoredTypesConfigurer {

@Override
public void configure(Config config, IgnoredTypesBuilder builder) {
public void configure(IgnoredTypesBuilder builder, ConfigProperties config) {
builder.ignoreClass("com.microsoft.applicationinsights.agent.");
}
}
6 changes: 3 additions & 3 deletions agent/agent/gradle.lockfile
View file
Open in desktop
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.azure:azure-sdk-bom:1.2.3=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
org.junit:junit-bom:5.8.2=runtimeClasspath
empty=
4 changes: 2 additions & 2 deletions agent/azure-monitor-exporter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ dependencies {

compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")

testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")

testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("com.azure:azure-core-test")
Expand Down
6 changes: 3 additions & 3 deletions agent/azure-monitor-exporter/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ io.netty:netty-transport-native-epoll:4.1.76.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.76.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.76.Final=runtimeClasspath
io.netty:netty-transport:4.1.76.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.0.18=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.0.18=runtimeClasspath
io.projectreactor:reactor-core:3.4.17=runtimeClasspath
Expand Down
5 changes: 1 addition & 4 deletions agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ plugins {

id("ai.java-conventions")
id("ai.javaagent-instrumentation")

id("io.opentelemetry.instrumentation.muzzle-generation") version "1.15.0-alpha"
id("io.opentelemetry.instrumentation.muzzle-check") version "1.15.0-alpha"
}

muzzle {
Expand All @@ -31,7 +28,7 @@ dependencies {

// TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:$otelInstrumentationAlphaVersion")
add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
}
6 changes: 3 additions & 3 deletions 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 @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
org.junit:junit-bom:5.8.2=runtimeClasspath
empty=
5 changes: 1 addition & 4 deletions agent/instrumentation/azure-functions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
plugins {
id("ai.java-conventions")
id("ai.javaagent-instrumentation")

id("io.opentelemetry.instrumentation.muzzle-generation") version "1.15.0-alpha"
id("io.opentelemetry.instrumentation.muzzle-check") version "1.15.0-alpha"
}

muzzle {
Expand All @@ -17,7 +14,7 @@ val otelInstrumentationAlphaVersion: String by project
dependencies {
// TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:$otelInstrumentationAlphaVersion")
add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
}
Loading