Skip to content

Commit 13a184a

Browse files
zeitlingerzeitlinger
committed
format
1 parent e939286 commit 13a184a

File tree

26 files changed

+181
-126
lines changed

26 files changed

+181
-126
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public DefaultHttpClientTelemetryBuilder<REQUEST, RESPONSE> addAttributeExtracto
8383
@CanIgnoreReturnValue
8484
public DefaultHttpClientTelemetryBuilder<REQUEST, RESPONSE> setStatusExtractor(
8585
Function<
86-
SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
86+
SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
8787
? extends SpanStatusExtractor<? super REQUEST, ? super RESPONSE>>
8888
statusExtractor) {
8989
this.statusExtractorTransformer = statusExtractor;
@@ -177,7 +177,8 @@ public Instrumenter<REQUEST, RESPONSE> instrumenter(
177177
InstrumenterBuilder<REQUEST, RESPONSE> builder =
178178
Instrumenter.<REQUEST, RESPONSE>builder(
179179
openTelemetry, instrumentationName, spanNameExtractor)
180-
.setSpanStatusExtractor(statusExtractorTransformer.apply(HttpSpanStatusExtractor.create(attributesGetter)))
180+
.setSpanStatusExtractor(
181+
statusExtractorTransformer.apply(HttpSpanStatusExtractor.create(attributesGetter)))
181182
.addAttributesExtractor(httpAttributesExtractorBuilder.build())
182183
.addAttributesExtractors(additionalExtractors)
183184
.addOperationMetrics(HttpClientMetrics.get());

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

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public final class DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> {
4444
private final List<AttributesExtractor<? super REQUEST, ? super RESPONSE>> additionalExtractors =
4545
new ArrayList<>();
4646
private Function<
47-
SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
47+
SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
4848
? extends SpanStatusExtractor<? super REQUEST, ? super RESPONSE>>
4949
statusExtractorTransformer = Function.identity();
5050
private final HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE>
@@ -58,8 +58,10 @@ public final class DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> {
5858
private boolean emitExperimentalHttpServerMetrics = false;
5959

6060
public DefaultHttpServerTelemetryBuilder(
61-
String instrumentationName, OpenTelemetry openTelemetry, HttpServerAttributesGetter<REQUEST, RESPONSE> attributesGetter,
62-
Optional<TextMapGetter<REQUEST>> headerSetter) {
61+
String instrumentationName,
62+
OpenTelemetry openTelemetry,
63+
HttpServerAttributesGetter<REQUEST, RESPONSE> attributesGetter,
64+
Optional<TextMapGetter<REQUEST>> headerSetter) {
6365
this.instrumentationName = instrumentationName;
6466
this.openTelemetry = openTelemetry;
6567
httpAttributesExtractorBuilder = HttpServerAttributesExtractor.builder(attributesGetter);
@@ -83,7 +85,7 @@ public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> addAttributesExtract
8385
@CanIgnoreReturnValue
8486
public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setStatusExtractor(
8587
Function<
86-
SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
88+
SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
8789
? extends SpanStatusExtractor<? super REQUEST, ? super RESPONSE>>
8890
statusExtractor) {
8991
this.statusExtractorTransformer = statusExtractor;
@@ -96,7 +98,8 @@ public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setStatusExtractor(
9698
* @param requestHeaders A list of HTTP header names.
9799
*/
98100
@CanIgnoreReturnValue
99-
public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(List<String> requestHeaders) {
101+
public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
102+
List<String> requestHeaders) {
100103
httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
101104
return this;
102105
}
@@ -107,7 +110,8 @@ public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedRequestHe
107110
* @param responseHeaders A list of HTTP header names.
108111
*/
109112
@CanIgnoreReturnValue
110-
public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(List<String> responseHeaders) {
113+
public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
114+
List<String> responseHeaders) {
111115
httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
112116
return this;
113117
}
@@ -126,7 +130,8 @@ public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedResponseH
126130
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set)
127131
*/
128132
@CanIgnoreReturnValue
129-
public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setKnownMethods(Set<String> knownMethods) {
133+
public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setKnownMethods(
134+
Set<String> knownMethods) {
130135
httpAttributesExtractorBuilder.setKnownMethods(knownMethods);
131136
httpSpanNameExtractorBuilder.setKnownMethods(knownMethods);
132137
httpServerRouteBuilder.setKnownMethods(knownMethods);
@@ -156,19 +161,19 @@ public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setSpanNameExtractor
156161
}
157162

158163
public Instrumenter<REQUEST, RESPONSE> instrumenter() {
159-
return instrumenter(b -> {});
160-
}
164+
return instrumenter(b -> {});
165+
}
161166

162-
public Instrumenter<REQUEST, RESPONSE> instrumenter(
163-
Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> instrumenterBuilderConsumer) {
167+
public Instrumenter<REQUEST, RESPONSE> instrumenter(
168+
Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> instrumenterBuilderConsumer) {
164169

165-
InstrumenterBuilder<REQUEST, RESPONSE> builder = instrumenterBuilder(
166-
instrumenterBuilderConsumer);
170+
InstrumenterBuilder<REQUEST, RESPONSE> builder =
171+
instrumenterBuilder(instrumenterBuilderConsumer);
167172

168-
if (headerSetter.isPresent()) {
169-
return builder.buildServerInstrumenter(headerSetter.get());
170-
}
171-
return builder.buildInstrumenter(SpanKindExtractor.alwaysServer());
173+
if (headerSetter.isPresent()) {
174+
return builder.buildServerInstrumenter(headerSetter.get());
175+
}
176+
return builder.buildInstrumenter(SpanKindExtractor.alwaysServer());
172177
}
173178

174179
public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder(
@@ -179,7 +184,8 @@ public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder(
179184
InstrumenterBuilder<REQUEST, RESPONSE> builder =
180185
Instrumenter.<REQUEST, RESPONSE>builder(
181186
openTelemetry, instrumentationName, spanNameExtractor)
182-
.setSpanStatusExtractor(statusExtractorTransformer.apply(HttpSpanStatusExtractor.create(attributesGetter)))
187+
.setSpanStatusExtractor(
188+
statusExtractorTransformer.apply(HttpSpanStatusExtractor.create(attributesGetter)))
183189
.addAttributesExtractor(httpAttributesExtractorBuilder.build())
184190
.addAttributesExtractors(additionalExtractors)
185191
.addContextCustomizer(httpServerRouteBuilder.build())

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ private HttpServerInstrumenterBuilder() {}
2222
public static <REQUEST, RESPONSE> DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> configure(
2323
CoreCommonConfig config, Object builder) {
2424
DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> defaultBuilder = unwrapBuilder(builder);
25-
set(config::getKnownHttpRequestMethods, defaultBuilder::setKnownMethods);
26-
set(config::getServerRequestHeaders, defaultBuilder::setCapturedRequestHeaders);
27-
set(config::getServerResponseHeaders, defaultBuilder::setCapturedResponseHeaders);
28-
set(
29-
config::shouldEmitExperimentalHttpServerTelemetry,
30-
defaultBuilder::setEmitExperimentalHttpServerMetrics);
25+
set(config::getKnownHttpRequestMethods, defaultBuilder::setKnownMethods);
26+
set(config::getServerRequestHeaders, defaultBuilder::setCapturedRequestHeaders);
27+
set(config::getServerResponseHeaders, defaultBuilder::setCapturedResponseHeaders);
28+
set(
29+
config::shouldEmitExperimentalHttpServerTelemetry,
30+
defaultBuilder::setEmitExperimentalHttpServerMetrics);
3131
return defaultBuilder;
3232
}
3333

‎instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public final class AkkaHttpServerSingletons {
1717
private static final Instrumenter<HttpRequest, HttpResponse> INSTRUMENTER;
1818

1919
static {
20-
INSTRUMENTER = JavaagentHttpServerInstrumenterBuilder.create(
20+
INSTRUMENTER =
21+
JavaagentHttpServerInstrumenterBuilder.create(
2122
AkkaHttpUtil.instrumentationName(),
2223
new AkkaHttpServerAttributesGetter(),
2324
Optional.of(AkkaHttpServerHeaders.INSTANCE));

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
public final class ApacheHttpClientTelemetryBuilder {
2222

2323
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-4.3";
24-
private final DefaultHttpClientTelemetryBuilder<ApacheHttpClientRequest, HttpResponse> clientBuilder;
24+
private final DefaultHttpClientTelemetryBuilder<ApacheHttpClientRequest, HttpResponse>
25+
clientBuilder;
2526

2627
ApacheHttpClientTelemetryBuilder(OpenTelemetry openTelemetry) {
2728
clientBuilder =

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
public final class ApacheHttpClient5TelemetryBuilder {
2222

2323
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-5.2";
24-
private final DefaultHttpClientTelemetryBuilder<ApacheHttpClient5Request, HttpResponse> clientBuilder;
24+
private final DefaultHttpClientTelemetryBuilder<ApacheHttpClient5Request, HttpResponse>
25+
clientBuilder;
2526

2627
ApacheHttpClient5TelemetryBuilder(OpenTelemetry openTelemetry) {
2728
clientBuilder =

‎instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaSingletons.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ public final class ArmeriaSingletons {
3030

3131
CLIENT_DECORATOR = telemetry.newClientDecorator();
3232
Function<? super HttpService, ? extends HttpService> libraryDecorator =
33-
telemetry
34-
.newServiceDecorator()
35-
.compose(ResponseCustomizingDecorator::new);
33+
telemetry.newServiceDecorator().compose(ResponseCustomizingDecorator::new);
3634
SERVER_DECORATOR = service -> new ServerDecorator(service, libraryDecorator.apply(service));
3735
}
3836

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

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,18 @@ public final class ArmeriaTelemetryBuilder {
4040

4141
@SuppressWarnings({"rawtypes", "unchecked"})
4242
ArmeriaTelemetryBuilder(OpenTelemetry openTelemetry) {
43-
clientBuilder = new DefaultHttpClientTelemetryBuilder<>(INSTRUMENTATION_NAME,
44-
openTelemetry,
45-
(HttpClientAttributesGetter)ArmeriaHttpClientAttributesGetter.INSTANCE,
46-
Optional.of(ClientRequestContextSetter.INSTANCE));
47-
serverBuilder = new DefaultHttpServerTelemetryBuilder<>(INSTRUMENTATION_NAME, openTelemetry,
48-
(HttpServerAttributesGetter)ArmeriaHttpServerAttributesGetter.INSTANCE, Optional.of(RequestContextGetter.INSTANCE));
43+
clientBuilder =
44+
new DefaultHttpClientTelemetryBuilder<>(
45+
INSTRUMENTATION_NAME,
46+
openTelemetry,
47+
(HttpClientAttributesGetter) ArmeriaHttpClientAttributesGetter.INSTANCE,
48+
Optional.of(ClientRequestContextSetter.INSTANCE));
49+
serverBuilder =
50+
new DefaultHttpServerTelemetryBuilder<>(
51+
INSTRUMENTATION_NAME,
52+
openTelemetry,
53+
(HttpServerAttributesGetter) ArmeriaHttpServerAttributesGetter.INSTANCE,
54+
Optional.of(RequestContextGetter.INSTANCE));
4955
}
5056

5157
@SuppressWarnings({"unchecked", "rawtypes"})
@@ -55,8 +61,8 @@ public ArmeriaTelemetryBuilder setStatusExtractor(
5561
SpanStatusExtractor<RequestContext, RequestLog>,
5662
? extends SpanStatusExtractor<? super RequestContext, ? super RequestLog>>
5763
statusExtractor) {
58-
clientBuilder.setStatusExtractor((Function)statusExtractor);
59-
serverBuilder.setStatusExtractor((Function)statusExtractor);
64+
clientBuilder.setStatusExtractor((Function) statusExtractor);
65+
serverBuilder.setStatusExtractor((Function) statusExtractor);
6066
return this;
6167
}
6268

@@ -69,7 +75,7 @@ public ArmeriaTelemetryBuilder setStatusExtractor(
6975
public ArmeriaTelemetryBuilder addAttributeExtractor(
7076
AttributesExtractor<? super RequestContext, ? super RequestLog> attributesExtractor) {
7177
clientBuilder.addAttributeExtractor(attributesExtractor);
72-
serverBuilder.addAttributesExtractor((AttributesExtractor)attributesExtractor);
78+
serverBuilder.addAttributesExtractor((AttributesExtractor) attributesExtractor);
7379
return this;
7480
}
7581

@@ -193,7 +199,7 @@ public ArmeriaTelemetryBuilder setClientSpanNameExtractor(
193199
SpanNameExtractor<RequestContext>,
194200
? extends SpanNameExtractor<? super RequestContext>>
195201
clientSpanNameExtractor) {
196-
clientBuilder.setSpanNameExtractor((Function)clientSpanNameExtractor);
202+
clientBuilder.setSpanNameExtractor((Function) clientSpanNameExtractor);
197203
return this;
198204
}
199205

@@ -205,18 +211,19 @@ public ArmeriaTelemetryBuilder setServerSpanNameExtractor(
205211
SpanNameExtractor<RequestContext>,
206212
? extends SpanNameExtractor<? super RequestContext>>
207213
serverSpanNameExtractor) {
208-
serverBuilder.setSpanNameExtractor((Function)serverSpanNameExtractor);
214+
serverBuilder.setSpanNameExtractor((Function) serverSpanNameExtractor);
209215
return this;
210216
}
211217

212218
public ArmeriaTelemetry build() {
213219
return new ArmeriaTelemetry(
214-
clientBuilder.instrumenter(clientInstrumenterBuilder -> {
215-
if (peerService != null) {
216-
clientInstrumenterBuilder.addAttributesExtractor(
217-
AttributesExtractor.constant(PEER_SERVICE, peerService));
218-
}
219-
}),
220+
clientBuilder.instrumenter(
221+
clientInstrumenterBuilder -> {
222+
if (peerService != null) {
223+
clientInstrumenterBuilder.addAttributesExtractor(
224+
AttributesExtractor.constant(PEER_SERVICE, peerService));
225+
}
226+
}),
220227
serverBuilder.instrumenter());
221228
}
222229
}

‎instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlySingletons.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,22 @@ public final class GrizzlySingletons {
1717
private static final Instrumenter<HttpRequestPacket, HttpResponsePacket> INSTRUMENTER;
1818

1919
static {
20-
INSTRUMENTER = JavaagentHttpServerInstrumenterBuilder.createWithCustomizer(
21-
"io.opentelemetry.grizzly-2.3",
22-
new GrizzlyHttpAttributesGetter(),
23-
Optional.of(HttpRequestHeadersGetter.INSTANCE),
24-
builder ->
25-
builder
26-
.addContextCustomizer(
27-
(context, request, attributes) ->
28-
new AppServerBridge.Builder()
29-
.captureServletAttributes()
30-
.recordException()
31-
.init(context))
32-
.addContextCustomizer(
33-
(context, httpRequestPacket, startAttributes) -> GrizzlyErrorHolder.init(
34-
context)));
20+
INSTRUMENTER =
21+
JavaagentHttpServerInstrumenterBuilder.createWithCustomizer(
22+
"io.opentelemetry.grizzly-2.3",
23+
new GrizzlyHttpAttributesGetter(),
24+
Optional.of(HttpRequestHeadersGetter.INSTANCE),
25+
builder ->
26+
builder
27+
.addContextCustomizer(
28+
(context, request, attributes) ->
29+
new AppServerBridge.Builder()
30+
.captureServletAttributes()
31+
.recordException()
32+
.init(context))
33+
.addContextCustomizer(
34+
(context, httpRequestPacket, startAttributes) ->
35+
GrizzlyErrorHolder.init(context)));
3536
}
3637

3738
public static Instrumenter<HttpRequestPacket, HttpResponsePacket> instrumenter() {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ public JavaHttpClientTelemetryBuilder setSpanNameExtractor(
110110

111111
public JavaHttpClientTelemetry build() {
112112
return new JavaHttpClientTelemetry(
113-
clientBuilder.instrumenter(), new HttpHeadersSetter(clientBuilder.getOpenTelemetry().getPropagators()));
113+
clientBuilder.instrumenter(),
114+
new HttpHeadersSetter(clientBuilder.getOpenTelemetry().getPropagators()));
114115
}
115116
}

0 commit comments

Comments
 (0)