Skip to content

Commit 18a63a5

Browse files
trasktrask
committed
names
1 parent 62e09db commit 18a63a5

File tree

8 files changed

+36
-31
lines changed

8 files changed

+36
-31
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
5454

5555
private final List<AttributesExtractor<? super REQUEST, ? super RESPONSE>> additionalExtractors =
5656
new ArrayList<>();
57-
private UnaryOperator<SpanStatusExtractor<REQUEST, RESPONSE>> statusExtractorTransformer =
57+
private UnaryOperator<SpanStatusExtractor<REQUEST, RESPONSE>> statusExtractorCustomizer =
5858
UnaryOperator.identity();
5959
private final HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE>
6060
httpAttributesExtractorBuilder;
6161
private final HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter;
6262
private final HttpSpanNameExtractorBuilder<REQUEST> httpSpanNameExtractorBuilder;
6363

6464
@Nullable private final TextMapSetter<REQUEST> headerSetter;
65-
private UnaryOperator<SpanNameExtractor<REQUEST>> spanNameExtractorTransformer =
65+
private UnaryOperator<SpanNameExtractor<REQUEST>> spanNameExtractorCustomizer =
6666
UnaryOperator.identity();
6767
private boolean emitExperimentalHttpClientTelemetry = false;
6868
private Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer = b -> {};
@@ -124,7 +124,7 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setStatusExtracto
124124
@CanIgnoreReturnValue
125125
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setStatusExtractorCustomizer(
126126
UnaryOperator<SpanStatusExtractor<REQUEST, RESPONSE>> statusExtractorCustomizer) {
127-
this.statusExtractorTransformer = statusExtractorCustomizer;
127+
this.statusExtractorCustomizer = statusExtractorCustomizer;
128128
return this;
129129
}
130130

@@ -217,7 +217,7 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setSpanNameExtrac
217217
@CanIgnoreReturnValue
218218
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setSpanNameExtractorCustomizer(
219219
UnaryOperator<SpanNameExtractor<REQUEST>> spanNameExtractorCustomizer) {
220-
this.spanNameExtractorTransformer = spanNameExtractorCustomizer;
220+
this.spanNameExtractorCustomizer = spanNameExtractorCustomizer;
221221
return this;
222222
}
223223

@@ -252,13 +252,13 @@ public Instrumenter<REQUEST, RESPONSE> build() {
252252
Context.current(), request, attributesGetter));
253253
}
254254
SpanNameExtractor<? super REQUEST> spanNameExtractor =
255-
spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());
255+
spanNameExtractorCustomizer.apply(httpSpanNameExtractorBuilder.build());
256256

257257
InstrumenterBuilder<REQUEST, RESPONSE> builder =
258258
Instrumenter.<REQUEST, RESPONSE>builder(
259259
openTelemetry, instrumentationName, spanNameExtractor)
260260
.setSpanStatusExtractor(
261-
statusExtractorTransformer.apply(HttpSpanStatusExtractor.create(attributesGetter)))
261+
statusExtractorCustomizer.apply(HttpSpanStatusExtractor.create(attributesGetter)))
262262
.addAttributesExtractor(httpAttributesExtractorBuilder.build())
263263
.addAttributesExtractors(additionalExtractors)
264264
.addOperationMetrics(HttpClientMetrics.get())

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
4747

4848
private final List<AttributesExtractor<? super REQUEST, ? super RESPONSE>> additionalExtractors =
4949
new ArrayList<>();
50-
private UnaryOperator<SpanStatusExtractor<REQUEST, RESPONSE>> statusExtractorTransformer =
50+
private UnaryOperator<SpanStatusExtractor<REQUEST, RESPONSE>> statusExtractorCustomizer =
5151
UnaryOperator.identity();
5252
private final HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE>
5353
httpAttributesExtractorBuilder;
5454
private final HttpSpanNameExtractorBuilder<REQUEST> httpSpanNameExtractorBuilder;
5555

5656
@Nullable private final TextMapGetter<REQUEST> headerGetter;
57-
private UnaryOperator<SpanNameExtractor<REQUEST>> spanNameExtractorTransformer =
57+
private UnaryOperator<SpanNameExtractor<REQUEST>> spanNameExtractorCustomizer =
5858
UnaryOperator.identity();
5959
private final HttpServerRouteBuilder<REQUEST> httpServerRouteBuilder;
6060
private final HttpServerAttributesGetter<REQUEST, RESPONSE> attributesGetter;
@@ -119,7 +119,7 @@ public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setStatusExtracto
119119
@CanIgnoreReturnValue
120120
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setStatusExtractorCustomizer(
121121
UnaryOperator<SpanStatusExtractor<REQUEST, RESPONSE>> statusExtractorCustomizer) {
122-
this.statusExtractorTransformer = statusExtractorCustomizer;
122+
this.statusExtractorCustomizer = statusExtractorCustomizer;
123123
return this;
124124
}
125125

@@ -201,7 +201,7 @@ public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setSpanNameExtrac
201201
@CanIgnoreReturnValue
202202
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setSpanNameExtractorCustomizer(
203203
UnaryOperator<SpanNameExtractor<REQUEST>> spanNameExtractorCustomizer) {
204-
this.spanNameExtractorTransformer = spanNameExtractorCustomizer;
204+
this.spanNameExtractorCustomizer = spanNameExtractorCustomizer;
205205
return this;
206206
}
207207

@@ -223,13 +223,13 @@ public Instrumenter<REQUEST, RESPONSE> build() {
223223

224224
public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder() {
225225
SpanNameExtractor<? super REQUEST> spanNameExtractor =
226-
spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());
226+
spanNameExtractorCustomizer.apply(httpSpanNameExtractorBuilder.build());
227227

228228
InstrumenterBuilder<REQUEST, RESPONSE> builder =
229229
Instrumenter.<REQUEST, RESPONSE>builder(
230230
openTelemetry, instrumentationName, spanNameExtractor)
231231
.setSpanStatusExtractor(
232-
statusExtractorTransformer.apply(HttpSpanStatusExtractor.create(attributesGetter)))
232+
statusExtractorCustomizer.apply(HttpSpanStatusExtractor.create(attributesGetter)))
233233
.addAttributesExtractor(httpAttributesExtractorBuilder.build())
234234
.addAttributesExtractors(additionalExtractors)
235235
.addContextCustomizer(httpServerRouteBuilder.build())

‎instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public final class DubboTelemetryBuilder {
3838
@Nullable private String peerService;
3939
private final List<AttributesExtractor<DubboRequest, Result>> attributesExtractors =
4040
new ArrayList<>();
41-
private UnaryOperator<SpanNameExtractor<DubboRequest>> clientSpanNameExtractorTransformer =
41+
private UnaryOperator<SpanNameExtractor<DubboRequest>> clientSpanNameExtractorCustomizer =
4242
UnaryOperator.identity();
43-
private UnaryOperator<SpanNameExtractor<DubboRequest>> serverSpanNameExtractorTransformer =
43+
private UnaryOperator<SpanNameExtractor<DubboRequest>> serverSpanNameExtractorCustomizer =
4444
UnaryOperator.identity();
4545

4646
DubboTelemetryBuilder(OpenTelemetry openTelemetry) {
@@ -82,7 +82,7 @@ public DubboTelemetryBuilder setClientSpanNameExtractor(
8282
@CanIgnoreReturnValue
8383
public DubboTelemetryBuilder setClientSpanNameExtractorCustomizer(
8484
UnaryOperator<SpanNameExtractor<DubboRequest>> clientSpanNameExtractorCustomizer) {
85-
this.clientSpanNameExtractorTransformer = clientSpanNameExtractorCustomizer;
85+
this.clientSpanNameExtractorCustomizer = clientSpanNameExtractorCustomizer;
8686
return this;
8787
}
8888

@@ -105,7 +105,7 @@ public DubboTelemetryBuilder setServerSpanNameExtractor(
105105
@CanIgnoreReturnValue
106106
public DubboTelemetryBuilder setServerSpanNameExtractorCustomizer(
107107
UnaryOperator<SpanNameExtractor<DubboRequest>> serverSpanNameExtractorCustomizer) {
108-
this.serverSpanNameExtractorTransformer = serverSpanNameExtractorCustomizer;
108+
this.serverSpanNameExtractorCustomizer = serverSpanNameExtractorCustomizer;
109109
return this;
110110
}
111111

@@ -117,9 +117,9 @@ public DubboTelemetry build() {
117117
SpanNameExtractor<DubboRequest> spanNameExtractor =
118118
RpcSpanNameExtractor.create(rpcAttributesGetter);
119119
SpanNameExtractor<DubboRequest> clientSpanNameExtractor =
120-
clientSpanNameExtractorTransformer.apply(spanNameExtractor);
120+
clientSpanNameExtractorCustomizer.apply(spanNameExtractor);
121121
SpanNameExtractor<DubboRequest> serverSpanNameExtractor =
122-
serverSpanNameExtractorTransformer.apply(spanNameExtractor);
122+
serverSpanNameExtractorCustomizer.apply(spanNameExtractor);
123123
DubboClientNetworkAttributesGetter netClientAttributesGetter =
124124
new DubboClientNetworkAttributesGetter();
125125
DubboNetworkServerAttributesGetter netServerAttributesGetter =

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public ArmeriaClientTelemetryBuilder setStatusExtractor(
5454
*/
5555
@CanIgnoreReturnValue
5656
public ArmeriaClientTelemetryBuilder setStatusExtractorCustomizer(
57-
UnaryOperator<SpanStatusExtractor<ClientRequestContext, RequestLog>> statusExtractorCustomizer) {
57+
UnaryOperator<SpanStatusExtractor<ClientRequestContext, RequestLog>>
58+
statusExtractorCustomizer) {
5859
builder.setStatusExtractorCustomizer(statusExtractorCustomizer);
5960
return this;
6061
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public ArmeriaServerTelemetryBuilder setStatusExtractor(
5252
*/
5353
@CanIgnoreReturnValue
5454
public ArmeriaServerTelemetryBuilder setStatusExtractorCustomizer(
55-
UnaryOperator<SpanStatusExtractor<ServiceRequestContext, RequestLog>> statusExtractorCustomizer) {
55+
UnaryOperator<SpanStatusExtractor<ServiceRequestContext, RequestLog>>
56+
statusExtractorCustomizer) {
5657
builder.setStatusExtractorCustomizer(statusExtractorCustomizer);
5758
return this;
5859
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ public final class GrpcTelemetryBuilder {
3939
private final OpenTelemetry openTelemetry;
4040
@Nullable private String peerService;
4141

42-
private UnaryOperator<SpanNameExtractor<GrpcRequest>> clientSpanNameExtractorTransformer =
42+
private UnaryOperator<SpanNameExtractor<GrpcRequest>> clientSpanNameExtractorCustomizer =
4343
UnaryOperator.identity();
44-
private UnaryOperator<SpanNameExtractor<GrpcRequest>> serverSpanNameExtractorTransformer =
44+
private UnaryOperator<SpanNameExtractor<GrpcRequest>> serverSpanNameExtractorCustomizer =
4545
UnaryOperator.identity();
4646
private final List<AttributesExtractor<? super GrpcRequest, ? super Status>>
4747
additionalExtractors = new ArrayList<>();
@@ -113,7 +113,7 @@ public GrpcTelemetryBuilder setClientSpanNameExtractor(
113113
@CanIgnoreReturnValue
114114
public GrpcTelemetryBuilder setClientSpanNameExtractorCustomizer(
115115
UnaryOperator<SpanNameExtractor<GrpcRequest>> clientSpanNameExtractorCustomizer) {
116-
this.clientSpanNameExtractorTransformer = clientSpanNameExtractorCustomizer;
116+
this.clientSpanNameExtractorCustomizer = clientSpanNameExtractorCustomizer;
117117
return this;
118118
}
119119

@@ -136,7 +136,7 @@ public GrpcTelemetryBuilder setServerSpanNameExtractor(
136136
@CanIgnoreReturnValue
137137
public GrpcTelemetryBuilder setServerSpanNameExtractorCustomizer(
138138
UnaryOperator<SpanNameExtractor<GrpcRequest>> serverSpanNameExtractorCustomizer) {
139-
this.serverSpanNameExtractorTransformer = serverSpanNameExtractorCustomizer;
139+
this.serverSpanNameExtractorCustomizer = serverSpanNameExtractorCustomizer;
140140
return this;
141141
}
142142

@@ -189,9 +189,9 @@ public GrpcTelemetryBuilder setCapturedServerRequestMetadata(
189189
public GrpcTelemetry build() {
190190
SpanNameExtractor<GrpcRequest> originalSpanNameExtractor = new GrpcSpanNameExtractor();
191191
SpanNameExtractor<? super GrpcRequest> clientSpanNameExtractor =
192-
clientSpanNameExtractorTransformer.apply(originalSpanNameExtractor);
192+
clientSpanNameExtractorCustomizer.apply(originalSpanNameExtractor);
193193
SpanNameExtractor<? super GrpcRequest> serverSpanNameExtractor =
194-
serverSpanNameExtractorTransformer.apply(originalSpanNameExtractor);
194+
serverSpanNameExtractorCustomizer.apply(originalSpanNameExtractor);
195195

196196
InstrumenterBuilder<GrpcRequest, Status> clientInstrumenterBuilder =
197197
Instrumenter.builder(openTelemetry, INSTRUMENTATION_NAME, clientSpanNameExtractor);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public final class R2dbcTelemetryBuilder {
2121

2222
private final R2dbcInstrumenterBuilder instrumenterBuilder;
2323
private boolean statementSanitizationEnabled = true;
24-
private UnaryOperator<SpanNameExtractor<DbExecution>> spanNameExtractorTransformer =
24+
private UnaryOperator<SpanNameExtractor<DbExecution>> spanNameExtractorCustomizer =
2525
UnaryOperator.identity();
2626
private final SqlCommenterBuilder sqlCommenterBuilder = SqlCommenter.builder();
2727

@@ -70,7 +70,7 @@ public R2dbcTelemetryBuilder setSpanNameExtractor(
7070
@CanIgnoreReturnValue
7171
public R2dbcTelemetryBuilder setSpanNameExtractorCustomizer(
7272
UnaryOperator<SpanNameExtractor<DbExecution>> spanNameExtractorCustomizer) {
73-
this.spanNameExtractorTransformer = spanNameExtractorCustomizer;
73+
this.spanNameExtractorCustomizer = spanNameExtractorCustomizer;
7474
return this;
7575
}
7676

@@ -79,7 +79,7 @@ public R2dbcTelemetryBuilder setSpanNameExtractorCustomizer(
7979
*/
8080
public R2dbcTelemetry build() {
8181
return new R2dbcTelemetry(
82-
instrumenterBuilder.build(spanNameExtractorTransformer, statementSanitizationEnabled),
82+
instrumenterBuilder.build(spanNameExtractorCustomizer, statementSanitizationEnabled),
8383
sqlCommenterBuilder.build());
8484
}
8585
}

‎instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetryBuilder.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public ServletTelemetryBuilder setStatusExtractor(
7575
*/
7676
@CanIgnoreReturnValue
7777
public ServletTelemetryBuilder setStatusExtractorCustomizer(
78-
UnaryOperator<SpanStatusExtractor<HttpServletRequest, HttpServletResponse>> statusExtractorCustomizer) {
78+
UnaryOperator<SpanStatusExtractor<HttpServletRequest, HttpServletResponse>>
79+
statusExtractorCustomizer) {
7980
builder.setStatusExtractorCustomizer(
8081
convertSpanStatusExtractor(
8182
statusExtractorCustomizer,
@@ -173,7 +174,9 @@ public ServletTelemetryBuilder setSpanNameExtractorCustomizer(
173174
UnaryOperator<SpanNameExtractor<HttpServletRequest>> spanNameExtractorCustomizer) {
174175
builder.setSpanNameExtractorCustomizer(
175176
convertSpanNameExtractor(
176-
spanNameExtractorCustomizer, ServletRequestContext::new, ServletRequestContext::request));
177+
spanNameExtractorCustomizer,
178+
ServletRequestContext::new,
179+
ServletRequestContext::request));
177180
return this;
178181
}
179182

0 commit comments

Comments
 (0)