Skip to content

Commit a733d8b

Browse files
trasktrask
committed
Merge branch 'add-attributes-extractor' into all-together
2 parents 2dc00f9 + 4c11036 commit a733d8b

File tree

19 files changed

+145
-21
lines changed

19 files changed

+145
-21
lines changed

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static <REQUEST, RESPONSE> DefaultHttpClientInstrumenterBuilder<REQUEST,
103103
* items. The {@link AttributesExtractor} will be executed after all default extractors.
104104
*/
105105
@CanIgnoreReturnValue
106-
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> addAttributeExtractor(
106+
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> addAttributesExtractor(
107107
AttributesExtractor<? super REQUEST, ? super RESPONSE> attributesExtractor) {
108108
additionalExtractors.add(attributesExtractor);
109109
return this;
@@ -190,15 +190,15 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setSpanNameExtrac
190190
@CanIgnoreReturnValue
191191
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setPeerServiceResolver(
192192
PeerServiceResolver peerServiceResolver) {
193-
return addAttributeExtractor(
193+
return addAttributesExtractor(
194194
HttpClientPeerServiceAttributesExtractor.create(attributesGetter, peerServiceResolver));
195195
}
196196

197197
/** Sets the {@code peer.service} attribute for http client spans. */
198198
@CanIgnoreReturnValue
199199
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setPeerService(
200200
String peerService) {
201-
return addAttributeExtractor(AttributesExtractor.constant(PEER_SERVICE, peerService));
201+
return addAttributesExtractor(AttributesExtractor.constant(PEER_SERVICE, peerService));
202202
}
203203

204204
@CanIgnoreReturnValue

‎instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,27 @@ public final class ApacheHttpClientTelemetryBuilder {
3434
/**
3535
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
3636
* items. The {@link AttributesExtractor} will be executed after all default extractors.
37+
*
38+
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
3739
*/
40+
@Deprecated
3841
@CanIgnoreReturnValue
3942
public ApacheHttpClientTelemetryBuilder addAttributeExtractor(
4043
AttributesExtractor<? super ApacheHttpClientRequest, ? super HttpResponse>
4144
attributesExtractor) {
42-
builder.addAttributeExtractor(attributesExtractor);
45+
builder.addAttributesExtractor(attributesExtractor);
46+
return this;
47+
}
48+
49+
/**
50+
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
51+
* items. The {@link AttributesExtractor} will be executed after all default extractors.
52+
*/
53+
@CanIgnoreReturnValue
54+
public ApacheHttpClientTelemetryBuilder addAttributesExtractor(
55+
AttributesExtractor<? super ApacheHttpClientRequest, ? super HttpResponse>
56+
attributesExtractor) {
57+
builder.addAttributesExtractor(attributesExtractor);
4358
return this;
4459
}
4560

‎instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5TelemetryBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public final class ApacheHttpClient5TelemetryBuilder {
4545
public ApacheHttpClient5TelemetryBuilder addAttributeExtractor(
4646
AttributesExtractor<? super ApacheHttpClient5Request, ? super HttpResponse>
4747
attributesExtractor) {
48-
builder.addAttributeExtractor(attributesExtractor);
48+
builder.addAttributesExtractor(attributesExtractor);
4949
return this;
5050
}
5151

‎instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public ArmeriaTelemetryBuilder setServerStatusExtractor(
104104
@CanIgnoreReturnValue
105105
public ArmeriaTelemetryBuilder addAttributeExtractor(
106106
AttributesExtractor<? super RequestContext, ? super RequestLog> attributesExtractor) {
107-
clientBuilder.addAttributeExtractor(attributesExtractor);
107+
clientBuilder.addAttributesExtractor(attributesExtractor);
108108
serverBuilder.addAttributesExtractor(attributesExtractor);
109109
return this;
110110
}
@@ -121,7 +121,7 @@ public ArmeriaTelemetryBuilder addAttributeExtractor(
121121
@CanIgnoreReturnValue
122122
public ArmeriaTelemetryBuilder addClientAttributeExtractor(
123123
AttributesExtractor<? super ClientRequestContext, ? super RequestLog> attributesExtractor) {
124-
clientBuilder.addAttributeExtractor(attributesExtractor);
124+
clientBuilder.addAttributesExtractor(attributesExtractor);
125125
return this;
126126
}
127127

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,28 @@ public final class GrpcTelemetryBuilder {
5959
/**
6060
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
6161
* items. The {@link AttributesExtractor} will be executed after all default extractors.
62+
*
63+
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
6264
*/
65+
@Deprecated
6366
@CanIgnoreReturnValue
6467
public GrpcTelemetryBuilder addAttributeExtractor(
6568
AttributesExtractor<? super GrpcRequest, ? super Status> attributesExtractor) {
6669
additionalExtractors.add(attributesExtractor);
6770
return this;
6871
}
6972

73+
/**
74+
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
75+
* items. The {@link AttributesExtractor} will be executed after all default extractors.
76+
*/
77+
@CanIgnoreReturnValue
78+
public GrpcTelemetryBuilder addAttributesExtractor(
79+
AttributesExtractor<? super GrpcRequest, ? super Status> attributesExtractor) {
80+
additionalExtractors.add(attributesExtractor);
81+
return this;
82+
}
83+
7084
/**
7185
* Adds an extra client-only {@link AttributesExtractor} to invoke to set attributes to
7286
* instrumented items. The {@link AttributesExtractor} will be executed after all default

‎instrumentation/grpc-1.6/library/src/test/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void sayHello(
9191
.addService(greeter)
9292
.intercept(
9393
GrpcTelemetry.builder(testing.getOpenTelemetry())
94-
.addAttributeExtractor(new CustomAttributesExtractor())
94+
.addAttributesExtractor(new CustomAttributesExtractor())
9595
.addServerAttributeExtractor(new CustomAttributesExtractorV2("serverSideValue"))
9696
.build()
9797
.newServerInterceptor())
@@ -103,7 +103,7 @@ public void sayHello(
103103
ManagedChannelBuilder.forAddress("localhost", server.getPort())
104104
.intercept(
105105
GrpcTelemetry.builder(testing.getOpenTelemetry())
106-
.addAttributeExtractor(new CustomAttributesExtractor())
106+
.addAttributesExtractor(new CustomAttributesExtractor())
107107
.addClientAttributeExtractor(
108108
new CustomAttributesExtractorV2("clientSideValue"))
109109
.build()

‎instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,25 @@ public final class JavaHttpClientTelemetryBuilder {
3333
/**
3434
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
3535
* items. The {@link AttributesExtractor} will be executed after all default extractors.
36+
*
37+
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
3638
*/
39+
@Deprecated
3740
@CanIgnoreReturnValue
3841
public JavaHttpClientTelemetryBuilder addAttributeExtractor(
3942
AttributesExtractor<? super HttpRequest, ? super HttpResponse<?>> attributesExtractor) {
40-
builder.addAttributeExtractor(attributesExtractor);
43+
builder.addAttributesExtractor(attributesExtractor);
44+
return this;
45+
}
46+
47+
/**
48+
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
49+
* items. The {@link AttributesExtractor} will be executed after all default extractors.
50+
*/
51+
@CanIgnoreReturnValue
52+
public JavaHttpClientTelemetryBuilder addAttributesExtractor(
53+
AttributesExtractor<? super HttpRequest, ? super HttpResponse<?>> attributesExtractor) {
54+
builder.addAttributesExtractor(attributesExtractor);
4155
return this;
4256
}
4357

‎instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,25 @@ public JettyClientTelemetryBuilder setSslContextFactory(
4848
/**
4949
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
5050
* items.
51+
*
52+
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
5153
*/
54+
@Deprecated
5255
@CanIgnoreReturnValue
5356
public JettyClientTelemetryBuilder addAttributeExtractor(
5457
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
55-
builder.addAttributeExtractor(attributesExtractor);
58+
builder.addAttributesExtractor(attributesExtractor);
59+
return this;
60+
}
61+
62+
/**
63+
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
64+
* items.
65+
*/
66+
@CanIgnoreReturnValue
67+
public JettyClientTelemetryBuilder addAttributesExtractor(
68+
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
69+
builder.addAttributesExtractor(attributesExtractor);
5670
return this;
5771
}
5872

‎instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,25 @@ public JettyClientTelemetryBuilder setSslContextFactory(SslContextFactory sslCon
4848
/**
4949
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
5050
* items.
51+
*
52+
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
5153
*/
54+
@Deprecated
5255
@CanIgnoreReturnValue
5356
public JettyClientTelemetryBuilder addAttributeExtractor(
5457
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
55-
builder.addAttributeExtractor(attributesExtractor);
58+
builder.addAttributesExtractor(attributesExtractor);
59+
return this;
60+
}
61+
62+
/**
63+
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
64+
* items.
65+
*/
66+
@CanIgnoreReturnValue
67+
public JettyClientTelemetryBuilder addAttributesExtractor(
68+
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
69+
builder.addAttributesExtractor(attributesExtractor);
5670
return this;
5771
}
5872

‎instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/client/AbstractKtorClientTracingBuilder.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ abstract class AbstractKtorClientTracingBuilder(
109109

110110
fun attributeExtractor(extractorBuilder: ExtractorBuilder.() -> Unit = {}) {
111111
val builder = ExtractorBuilder().apply(extractorBuilder).build()
112-
this.clientBuilder.addAttributeExtractor(
112+
this.clientBuilder.addAttributesExtractor(
113113
object : AttributesExtractor<HttpRequestData, HttpResponse> {
114114
override fun onStart(attributes: AttributesBuilder, parentContext: Context, request: HttpRequestData) {
115115
builder.onStart(OnStartData(attributes, parentContext, request))

0 commit comments

Comments
 (0)