Skip to content

Commit ed22dc2

Browse files
author
Liudmila Molkova
committed
More fixes
1 parent 67ee3d7 commit ed22dc2

File tree

12 files changed

+22
-35
lines changed

12 files changed

+22
-35
lines changed

‎instrumentation/azure-core/azure-core-1.36/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkInstrumentationModule.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ public void injectClasses(ClassInjector injector) {
5757
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
5858
// this class was introduced in azure-core 1.36
5959
return hasClassesNamed("com.azure.core.util.tracing.TracerProvider")
60-
.and(not(hasClassesNamed("com.azure.core.tracing.opentelemetry.OpenTelemetryTracer")));
60+
.and(not(hasClassesNamed("com.azure.core.tracing.opentelemetry.OpenTelemetryTracer")))
61+
.and(not(hasClassesNamed("com.azure.core.util.LibraryTelemetryOptions")));
6162
}
6263

6364
@Override

‎instrumentation/azure-core/azure-core-1.53/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureHttpClientInstrumentation.java‎ renamed to ‎instrumentation/azure-core/azure-core-1.53/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/AzureHttpClientInstrumentation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.azurecore.v1_36;
6+
package io.opentelemetry.javaagent.instrumentation.azurecore.v1_53;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
9-
import static io.opentelemetry.javaagent.instrumentation.azurecore.v1_36.SuppressNestedClientHelper.disallowNestedClientSpanMono;
10-
import static io.opentelemetry.javaagent.instrumentation.azurecore.v1_36.SuppressNestedClientHelper.disallowNestedClientSpanSync;
9+
import static io.opentelemetry.javaagent.instrumentation.azurecore.v1_53.SuppressNestedClientHelper.disallowNestedClientSpanMono;
10+
import static io.opentelemetry.javaagent.instrumentation.azurecore.v1_53.SuppressNestedClientHelper.disallowNestedClientSpanSync;
1111
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1212
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1313
import static net.bytebuddy.matcher.ElementMatchers.named;

‎instrumentation/azure-core/azure-core-1.53/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkInstrumentationModule.java‎ renamed to ‎instrumentation/azure-core/azure-core-1.53/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/AzureSdkInstrumentationModule.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.azurecore.v1_36;
6+
package io.opentelemetry.javaagent.instrumentation.azurecore.v1_53;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Arrays.asList;
@@ -26,37 +26,37 @@
2626
public class AzureSdkInstrumentationModule extends InstrumentationModule
2727
implements ExperimentalInstrumentationModule {
2828
public AzureSdkInstrumentationModule() {
29-
super("azure-core", "azure-core-1.36");
29+
super("azure-core", "azure-core-1.53");
3030
}
3131

3232
@Override
3333
public void registerHelperResources(HelperResourceBuilder helperResourceBuilder) {
3434
helperResourceBuilder.register(
3535
"META-INF/services/com.azure.core.util.tracing.TracerProvider",
36-
"azure-core-1.36/META-INF/services/com.azure.core.util.tracing.TracerProvider");
36+
"azure-core-1.53/META-INF/services/com.azure.core.util.tracing.TracerProvider");
3737
// some azure sdks (e.g. EventHubs) are still looking up Tracer via service loader
3838
// and not yet using the new TracerProvider
3939
helperResourceBuilder.register(
4040
"META-INF/services/com.azure.core.util.tracing.Tracer",
41-
"azure-core-1.36/META-INF/services/com.azure.core.util.tracing.Tracer");
41+
"azure-core-1.53/META-INF/services/com.azure.core.util.tracing.Tracer");
4242
}
4343

4444
@Override
4545
public void injectClasses(ClassInjector injector) {
4646
injector
4747
.proxyBuilder(
48-
"io.opentelemetry.javaagent.instrumentation.azurecore.v1_36.shaded.com.azure.core.tracing.opentelemetry.OpenTelemetryTracer")
48+
"io.opentelemetry.javaagent.instrumentation.azurecore.v1_53.shaded.com.azure.core.tracing.opentelemetry.OpenTelemetryTracer")
4949
.inject(InjectionMode.CLASS_ONLY);
5050
injector
5151
.proxyBuilder(
52-
"io.opentelemetry.javaagent.instrumentation.azurecore.v1_36.shaded.com.azure.core.tracing.opentelemetry.OpenTelemetryTracerProvider")
52+
"io.opentelemetry.javaagent.instrumentation.azurecore.v1_53.shaded.com.azure.core.tracing.opentelemetry.OpenTelemetryTracerProvider")
5353
.inject(InjectionMode.CLASS_ONLY);
5454
}
5555

5656
@Override
5757
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
58-
// this class was introduced in azure-core 1.36
59-
return hasClassesNamed("com.azure.core.util.tracing.TracerProvider")
58+
// this class was introduced in azure-core 1.53
59+
return hasClassesNamed("com.azure.core.util.LibraryTelemetryOptions")
6060
.and(not(hasClassesNamed("com.azure.core.tracing.opentelemetry.OpenTelemetryTracer")));
6161
}
6262

‎instrumentation/azure-core/azure-core-1.53/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/SuppressNestedClientHelper.java‎ renamed to ‎instrumentation/azure-core/azure-core-1.53/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/SuppressNestedClientHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.azurecore.v1_36;
6+
package io.opentelemetry.javaagent.instrumentation.azurecore.v1_53;
77

88
import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
99

‎instrumentation/azure-core/azure-core-1.53/javaagent/src/main/resources/azure-core-1.36/META-INF/services/com.azure.core.util.tracing.Tracer‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎instrumentation/azure-core/azure-core-1.53/javaagent/src/main/resources/azure-core-1.36/META-INF/services/com.azure.core.util.tracing.TracerProvider‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎instrumentation/azure-core/azure-core-1.53/javaagent/src/main/resources/azure-core-1.53/META-INF/services/com.azure.core.util.tracing.Tracer‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.opentelemetry.javaagent.instrumentation.azurecore.v1_53.shaded.com.azure.core.tracing.opentelemetry.OpenTelemetryTracer

‎instrumentation/azure-core/azure-core-1.53/javaagent/src/main/resources/azure-core-1.53/META-INF/services/com.azure.core.util.tracing.TracerProvider‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.opentelemetry.javaagent.instrumentation.azurecore.v1_53.shaded.com.azure.core.tracing.opentelemetry.OpenTelemetryTracerProvider

‎instrumentation/azure-core/azure-core-1.53/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkTest.java‎ renamed to ‎instrumentation/azure-core/azure-core-1.53/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/AzureSdkTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.azurecore.v1_36;
6+
package io.opentelemetry.javaagent.instrumentation.azurecore.v1_53;
77

88
import static org.assertj.core.api.Assertions.assertThat;
99

@@ -28,7 +28,7 @@ void testHelperClassesInjected() {
2828

2929
assertThat(azTracer.getClass().getName())
3030
.isEqualTo(
31-
"io.opentelemetry.javaagent.instrumentation.azurecore.v1_36.shaded"
31+
"io.opentelemetry.javaagent.instrumentation.azurecore.v1_53.shaded"
3232
+ ".com.azure.core.tracing.opentelemetry.OpenTelemetryTracer");
3333
}
3434

‎instrumentation/azure-core/azure-core-1.53/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkTestOld.java‎ renamed to ‎instrumentation/azure-core/azure-core-1.53/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/AzureSdkTestOld.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.azurecore.v1_36;
6+
package io.opentelemetry.javaagent.instrumentation.azurecore.v1_53;
77

88
import static org.assertj.core.api.Assertions.assertThat;
99

@@ -33,7 +33,7 @@ void testHelperClassesInjected() {
3333

3434
assertThat(azTracer.getClass().getName())
3535
.isEqualTo(
36-
"io.opentelemetry.javaagent.instrumentation.azurecore.v1_36.shaded"
36+
"io.opentelemetry.javaagent.instrumentation.azurecore.v1_53.shaded"
3737
+ ".com.azure.core.tracing.opentelemetry.OpenTelemetryTracer");
3838
}
3939

0 commit comments

Comments
 (0)