Skip to content

Commit a3c9be4

Browse files
trasktrask
authored
Update OpenTelemetry versions (#4429)
1 parent 9051491 commit a3c9be4

File tree

24 files changed

+163
-114
lines changed

24 files changed

+163
-114
lines changed

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.37=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.4=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-bootstrap/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,22 @@
2828
import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
2929
import io.opentelemetry.instrumentation.api.internal.InstrumenterBuilderAccess;
3030
import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil;
31+
import io.opentelemetry.instrumentation.api.internal.InternalInstrumenterCustomizer;
32+
import io.opentelemetry.instrumentation.api.internal.InternalInstrumenterCustomizerProvider;
33+
import io.opentelemetry.instrumentation.api.internal.InternalInstrumenterCustomizerUtil;
3134
import io.opentelemetry.instrumentation.api.internal.SchemaUrlProvider;
3235
import io.opentelemetry.instrumentation.api.internal.SpanKey;
3336
import io.opentelemetry.instrumentation.api.internal.SpanKeyProvider;
3437
import java.util.ArrayList;
3538
import java.util.List;
3639
import java.util.Set;
40+
import java.util.function.Function;
3741
import java.util.logging.Logger;
3842
import java.util.stream.Collectors;
3943
import java.util.stream.Stream;
4044
import javax.annotation.Nullable;
4145

42-
// copied from OpenTelemetry Instrumentation 2.6.0
46+
// copied from OpenTelemetry Instrumentation 2.19.0
4347

4448
/**
4549
* A builder of an {@link Instrumenter}.
@@ -59,7 +63,7 @@ public final class InstrumenterBuilder<REQUEST, RESPONSE> {
5963

6064
final OpenTelemetry openTelemetry;
6165
final String instrumentationName;
62-
final SpanNameExtractor<? super REQUEST> spanNameExtractor;
66+
SpanNameExtractor<? super REQUEST> spanNameExtractor;
6367

6468
final List<SpanLinksExtractor<? super REQUEST>> spanLinksExtractors = new ArrayList<>();
6569
final List<AttributesExtractor<? super REQUEST, ? super RESPONSE>> attributesExtractors =
@@ -293,6 +297,8 @@ public Instrumenter<REQUEST, RESPONSE> buildInstrumenter(
293297
private Instrumenter<REQUEST, RESPONSE> buildInstrumenter(
294298
InstrumenterConstructor<REQUEST, RESPONSE> constructor,
295299
SpanKindExtractor<? super REQUEST> spanKindExtractor) {
300+
applyCustomizers(this);
301+
296302
this.spanKindExtractor = spanKindExtractor;
297303
return constructor.create(this);
298304
}
@@ -387,6 +393,49 @@ private void propagateOperationListenersToOnEnd() {
387393
propagateOperationListenersToOnEnd = true;
388394
}
389395

396+
private static <REQUEST, RESPONSE> void applyCustomizers(
397+
InstrumenterBuilder<REQUEST, RESPONSE> builder) {
398+
for (InternalInstrumenterCustomizerProvider provider :
399+
InternalInstrumenterCustomizerUtil.getInstrumenterCustomizerProviders()) {
400+
provider.customize(
401+
new InternalInstrumenterCustomizer<REQUEST, RESPONSE>() {
402+
@Override
403+
public String getInstrumentationName() {
404+
return builder.instrumentationName;
405+
}
406+
407+
@Override
408+
public void addAttributesExtractor(AttributesExtractor<REQUEST, RESPONSE> extractor) {
409+
builder.addAttributesExtractor(extractor);
410+
}
411+
412+
@Override
413+
public void addAttributesExtractors(
414+
Iterable<? extends AttributesExtractor<REQUEST, RESPONSE>> extractors) {
415+
builder.addAttributesExtractors(extractors);
416+
}
417+
418+
@Override
419+
public void addOperationMetrics(OperationMetrics operationMetrics) {
420+
builder.addOperationMetrics(operationMetrics);
421+
}
422+
423+
@Override
424+
public void addContextCustomizer(ContextCustomizer<REQUEST> customizer) {
425+
builder.addContextCustomizer(customizer);
426+
}
427+
428+
@Override
429+
public void setSpanNameExtractor(
430+
Function<SpanNameExtractor<? super REQUEST>, SpanNameExtractor<? super REQUEST>>
431+
spanNameExtractorTransformer) {
432+
builder.spanNameExtractor =
433+
spanNameExtractorTransformer.apply(builder.spanNameExtractor);
434+
}
435+
});
436+
}
437+
}
438+
390439
private interface InstrumenterConstructor<RQ, RS> {
391440
Instrumenter<RQ, RS> create(InstrumenterBuilder<RQ, RS> builder);
392441

‎agent/agent-for-testing/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.37=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.4=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.37=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.41.0=runtimeClasspath
77
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
1212
org.junit:junit-bom:5.13.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath

‎agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.37=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.41.0=runtimeClasspath
77
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
1212
org.junit:junit-bom:5.13.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath

‎agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.37=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.4=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-profiler/agent-alerting-api/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.37=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.4=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-profiler/agent-alerting/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-json:1.5.0=runtimeClasspath
55
com.azure:azure-sdk-bom:1.2.37=runtimeClasspath
66
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
77
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
1212
org.junit:junit-bom:5.13.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath

‎agent/agent-profiler/agent-diagnostics-api/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.37=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.4=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.37=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.4=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

0 commit comments

Comments
 (0)