Skip to content

Commit 4ce03e4

Browse files
lauritlaurit
authored
Delete deprecated library instrumentation methods (#13575)
1 parent cc34116 commit 4ce03e4

File tree

13 files changed

+0
-207
lines changed

13 files changed

+0
-207
lines changed

‎instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,6 @@ public final class GrpcTelemetryBuilder {
5757
this.openTelemetry = openTelemetry;
5858
}
5959

60-
/**
61-
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
62-
* items. The {@link AttributesExtractor} will be executed after all default extractors.
63-
*
64-
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
65-
*/
66-
@Deprecated
67-
@CanIgnoreReturnValue
68-
public GrpcTelemetryBuilder addAttributeExtractor(
69-
AttributesExtractor<? super GrpcRequest, ? super Status> attributesExtractor) {
70-
additionalExtractors.add(attributesExtractor);
71-
return this;
72-
}
73-
7460
/**
7561
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
7662
* items. The {@link AttributesExtractor} will be executed after all default extractors.

‎instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryBuilder.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,6 @@ public KafkaTelemetryBuilder addProducerAttributesExtractors(
4646
return this;
4747
}
4848

49-
/** Use {@link #addConsumerProcessAttributesExtractors(AttributesExtractor)} instead. */
50-
@Deprecated
51-
@CanIgnoreReturnValue
52-
public KafkaTelemetryBuilder addConsumerAttributesExtractors(
53-
AttributesExtractor<KafkaProcessRequest, Void> extractor) {
54-
return addConsumerProcessAttributesExtractors(extractor);
55-
}
56-
5749
@CanIgnoreReturnValue
5850
public KafkaTelemetryBuilder addConsumerProcessAttributesExtractors(
5951
AttributesExtractor<KafkaProcessRequest, Void> extractor) {

‎instrumentation/kafka/kafka-clients/kafka-clients-common-0.11/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaInstrumenterFactory.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,6 @@ public KafkaInstrumenterFactory setCaptureExperimentalSpanAttributes(
6262
return this;
6363
}
6464

65-
/**
66-
* @deprecated if you have a need for this configuration option please open an issue in the <a
67-
* href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues">opentelemetry-java-instrumentation</a>
68-
* repository.
69-
*/
70-
@Deprecated
71-
@CanIgnoreReturnValue
72-
public KafkaInstrumenterFactory setPropagationEnabled(boolean propagationEnabled) {
73-
return this;
74-
}
75-
7665
@CanIgnoreReturnValue
7766
public KafkaInstrumenterFactory setMessagingReceiveInstrumentationEnabled(
7867
boolean messagingReceiveInstrumentationEnabled) {

‎instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,6 @@ public final class NettyClientTelemetryBuilder {
3939
NettyClientInstrumenterBuilderFactory.create("io.opentelemetry.netty-4.1", openTelemetry);
4040
}
4141

42-
/**
43-
* @deprecated Use {@link Experimental#setEmitExperimentalTelemetry(NettyClientTelemetryBuilder,
44-
* boolean)} instead.
45-
*/
46-
@Deprecated
47-
@CanIgnoreReturnValue
48-
public NettyClientTelemetryBuilder setEmitExperimentalHttpClientEvents(
49-
boolean emitExperimentalHttpClientEvents) {
50-
this.emitExperimentalHttpClientEvents = emitExperimentalHttpClientEvents;
51-
return this;
52-
}
53-
5442
/**
5543
* Configures the HTTP request headers that will be captured as span attributes.
5644
*
@@ -105,22 +93,6 @@ public NettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
10593
return this;
10694
}
10795

108-
/**
109-
* Configures the instrumentation to emit experimental HTTP client metrics.
110-
*
111-
* @param emitExperimentalHttpClientMetrics {@code true} if the experimental HTTP client metrics
112-
* are to be emitted.
113-
* @deprecated Use {@link Experimental#setEmitExperimentalTelemetry(NettyClientTelemetryBuilder,
114-
* boolean)} instead.
115-
*/
116-
@Deprecated
117-
@CanIgnoreReturnValue
118-
public NettyClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
119-
boolean emitExperimentalHttpClientMetrics) {
120-
builder.setEmitExperimentalHttpClientTelemetry(emitExperimentalHttpClientMetrics);
121-
return this;
122-
}
123-
12496
/** Sets custom {@link SpanNameExtractor} via transform function. */
12597
@CanIgnoreReturnValue
12698
public NettyClientTelemetryBuilder setSpanNameExtractor(

‎instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -99,22 +99,6 @@ public NettyServerTelemetryBuilder setKnownMethods(Collection<String> knownMetho
9999
return this;
100100
}
101101

102-
/**
103-
* Configures the instrumentation to emit experimental HTTP server metrics.
104-
*
105-
* @param emitExperimentalHttpServerMetrics {@code true} if the experimental HTTP server metrics
106-
* are to be emitted.
107-
* @deprecated Use {@link Experimental#setEmitExperimentalTelemetry(NettyServerTelemetryBuilder,
108-
* boolean)} instead.
109-
*/
110-
@Deprecated
111-
@CanIgnoreReturnValue
112-
public NettyServerTelemetryBuilder setEmitExperimentalHttpServerMetrics(
113-
boolean emitExperimentalHttpServerMetrics) {
114-
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
115-
return this;
116-
}
117-
118102
/** Returns a new {@link NettyServerTelemetry} with the given configuration. */
119103
public NettyServerTelemetry build() {
120104
return new NettyServerTelemetry(

‎instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/QuartzTelemetryBuilder.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,6 @@ public final class QuartzTelemetryBuilder {
3535
this.openTelemetry = openTelemetry;
3636
}
3737

38-
/**
39-
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
40-
* items. The {@link AttributesExtractor} will be executed after all default extractors.
41-
*
42-
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
43-
*/
44-
@Deprecated
45-
@CanIgnoreReturnValue
46-
public QuartzTelemetryBuilder addAttributeExtractor(
47-
AttributesExtractor<? super JobExecutionContext, ? super Void> attributesExtractor) {
48-
additionalExtractors.add(attributesExtractor);
49-
return this;
50-
}
51-
5238
/**
5339
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
5440
* items. The {@link AttributesExtractor} will be executed after all default extractors.

‎instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,6 @@ public final class R2dbcTelemetryBuilder {
2525
instrumenterBuilder = new R2dbcInstrumenterBuilder(openTelemetry);
2626
}
2727

28-
/**
29-
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
30-
*/
31-
@Deprecated
32-
@CanIgnoreReturnValue
33-
public R2dbcTelemetryBuilder addAttributeExtractor(
34-
AttributesExtractor<DbExecution, Void> attributesExtractor) {
35-
instrumenterBuilder.addAttributesExtractor(attributesExtractor);
36-
return this;
37-
}
38-
3928
@CanIgnoreReturnValue
4029
public R2dbcTelemetryBuilder addAttributesExtractor(
4130
AttributesExtractor<DbExecution, Void> attributesExtractor) {

‎instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,6 @@ public RestletTelemetryBuilder setKnownMethods(Collection<String> knownMethods)
8484
return this;
8585
}
8686

87-
/**
88-
* Configures the instrumentation to emit experimental HTTP server metrics.
89-
*
90-
* @param emitExperimentalHttpServerMetrics {@code true} if the experimental HTTP server metrics
91-
* are to be emitted.
92-
* @deprecated Use {@link Experimental#setEmitExperimentalTelemetry(RestletTelemetryBuilder,
93-
* boolean)} instead.
94-
*/
95-
@Deprecated
96-
@CanIgnoreReturnValue
97-
public RestletTelemetryBuilder setEmitExperimentalHttpServerMetrics(
98-
boolean emitExperimentalHttpServerMetrics) {
99-
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
100-
return this;
101-
}
102-
10387
/** Sets custom {@link SpanNameExtractor} via transform function. */
10488
@CanIgnoreReturnValue
10589
public RestletTelemetryBuilder setSpanNameExtractor(

‎instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,6 @@ public RestletTelemetryBuilder setKnownMethods(Collection<String> knownMethods)
8484
return this;
8585
}
8686

87-
/**
88-
* Configures the instrumentation to emit experimental HTTP server metrics.
89-
*
90-
* @param emitExperimentalHttpServerMetrics {@code true} if the experimental HTTP server metrics
91-
* are to be emitted.
92-
* @deprecated Use {@link Experimental#setEmitExperimentalTelemetry(RestletTelemetryBuilder,
93-
* boolean)} instead.
94-
*/
95-
@Deprecated
96-
@CanIgnoreReturnValue
97-
public RestletTelemetryBuilder setEmitExperimentalHttpServerMetrics(
98-
boolean emitExperimentalHttpServerMetrics) {
99-
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
100-
return this;
101-
}
102-
10387
/** Sets custom {@link SpanNameExtractor} via transform function. */
10488
@CanIgnoreReturnValue
10589
public RestletTelemetryBuilder setSpanNameExtractor(

‎instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaTelemetryBuilder.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,6 @@ public SpringKafkaTelemetryBuilder setCaptureExperimentalSpanAttributes(
4242
return this;
4343
}
4444

45-
/**
46-
* @deprecated if you have a need for this configuration option please open an issue in the <a
47-
* href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues">opentelemetry-java-instrumentation</a>
48-
* repository.
49-
*/
50-
@Deprecated
51-
@CanIgnoreReturnValue
52-
public SpringKafkaTelemetryBuilder setPropagationEnabled(boolean propagationEnabled) {
53-
return this;
54-
}
55-
5645
/**
5746
* Set whether to capture the consumer message receive telemetry in messaging instrumentation.
5847
*

0 commit comments

Comments
 (0)