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 submodule #1628

Merged
merged 2 commits into from
Apr 15, 2021
Merged

Update submodule #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80127a9
Update submodule
trask Apr 15, 2021
657c8e3
Update submodule
trask Apr 15, 2021
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 ...in/java/com/microsoft/applicationinsights/agent/internal/wasbootstrap/ConfigOverride.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static Config getConfig(Configuration config) {
properties.put("otel.instrumentation.opentelemetry-annotations.enabled", "false");
}
if (!config.preview.instrumentation.azureSdk.enabled) {
properties.put("otel.instrumentation.azure-sdk.enabled", "false");
properties.put("otel.instrumentation.azure-core.enabled", "false");
}
properties.put("otel.propagators", DelegatingPropagatorProvider.NAME);
// AI exporter is configured manually
Expand Down
2 changes: 1 addition & 1 deletion agent/instrumentation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-apache-httpclient-5.0', version: versions.opentelemetryInstrumentationAlpha
implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-applicationinsights-web-2.3', version: versions.opentelemetryInstrumentationAlpha
implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-azure-functions', version: versions.opentelemetryInstrumentationAlpha
implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-azure-sdk', version: versions.opentelemetryInstrumentationAlpha
implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-azure-core-1.14', version: versions.opentelemetryInstrumentationAlpha
implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-cassandra-3.0', version: versions.opentelemetryInstrumentationAlpha
implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-cassandra-4.0', version: versions.opentelemetryInstrumentationAlpha
implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-classloaders', version: versions.opentelemetryInstrumentationAlpha
Expand Down
2 changes: 1 addition & 1 deletion agent/instrumentation/gradle/dependency-locks/compileClasspath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpcl
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-5.0:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-applicationinsights-web-2.3:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-core-1.14:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-functions:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-sdk:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-cassandra-3.0:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-cassandra-4.0:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-classloaders:1.0.0+ai.patch.1-alpha
Expand Down
2 changes: 1 addition & 1 deletion agent/instrumentation/gradle/dependency-locks/runtimeClasspath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpcl
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-5.0:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-applicationinsights-web-2.3:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-core-1.14:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-functions:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-sdk:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-cassandra-3.0:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-cassandra-4.0:1.0.0+ai.patch.1-alpha
io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-classloaders:1.0.0+ai.patch.1-alpha
Expand Down
2 changes: 1 addition & 1 deletion otel
Open in desktop
Submodule otel updated 5 files
+9 −0 instrumentation/azure-core-1.14/javaagent/azure-core-1.14-javaagent.gradle
+1 −1 ...aagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azuresdk/AzureSdkInstrumentationModule.java
+0 −0 instrumentation/azure-core-1.14/javaagent/src/test/groovy/AzureSdkTest.groovy
+1 −8 javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/InstrumentationModule.java
+1 −1 settings.gradle