Skip to content

Commit 271a54c

Browse files
zeitlingerzeitlinger
committed
format
1 parent da607a4 commit 271a54c

File tree

12 files changed

+82
-58
lines changed

12 files changed

+82
-58
lines changed

‎instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorServerTracing.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class KtorServerTracing private constructor(
4848
fun setStatusExtractor(
4949
extractor: (SpanStatusExtractor<ApplicationRequest, ApplicationResponse>) -> SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>
5050
) {
51-
serverBuilder.setStatusExtractor{ prevExtractor ->
51+
serverBuilder.setStatusExtractor { prevExtractor ->
5252
SpanStatusExtractor { spanStatusBuilder: SpanStatusBuilder,
5353
request: ApplicationRequest,
5454
response: ApplicationResponse?,

‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorServerTracing.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,16 @@ class KtorServerTracing private constructor(
5959
}
6060

6161
fun spanStatusExtractor(extract: SpanStatusData.(SpanStatusExtractor<ApplicationRequest, ApplicationResponse>) -> Unit) {
62-
serverBuilder.setStatusExtractor{ prevExtractor ->
62+
serverBuilder.setStatusExtractor { prevExtractor ->
6363
SpanStatusExtractor { spanStatusBuilder: SpanStatusBuilder,
6464
request: ApplicationRequest,
6565
response: ApplicationResponse?,
6666
throwable: Throwable? ->
6767
@Suppress("UNCHECKED_CAST")
68-
extract(SpanStatusData(spanStatusBuilder, request, response, throwable), prevExtractor as SpanStatusExtractor<ApplicationRequest, ApplicationResponse>)
68+
extract(
69+
SpanStatusData(spanStatusBuilder, request, response, throwable),
70+
prevExtractor as SpanStatusExtractor<ApplicationRequest, ApplicationResponse>
71+
)
6972
}
7073
}
7174
}

‎instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerSingletons.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ public final class PekkoHttpServerSingletons {
1717
private static final Instrumenter<HttpRequest, HttpResponse> INSTRUMENTER;
1818

1919
static {
20-
INSTRUMENTER = JavaagentHttpServerInstrumenterBuilder.create(
21-
PekkoHttpUtil.instrumentationName(),
22-
new PekkoHttpServerAttributesGetter(),
23-
Optional.of(PekkoHttpServerHeaders.INSTANCE));
20+
INSTRUMENTER =
21+
JavaagentHttpServerInstrumenterBuilder.create(
22+
PekkoHttpUtil.instrumentationName(),
23+
new PekkoHttpServerAttributesGetter(),
24+
Optional.of(PekkoHttpServerHeaders.INSTANCE));
2425
}
2526

2627
public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {

‎instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,18 @@ public final class RatpackTelemetryBuilder {
3131
private final DefaultHttpServerTelemetryBuilder<Request, Response> serverBuilder;
3232

3333
RatpackTelemetryBuilder(OpenTelemetry openTelemetry) {
34-
clientBuilder = new DefaultHttpClientTelemetryBuilder<>(INSTRUMENTATION_NAME,
35-
openTelemetry,
36-
RatpackHttpClientAttributesGetter.INSTANCE,
37-
Optional.of(RequestHeaderSetter.INSTANCE));
38-
serverBuilder = new DefaultHttpServerTelemetryBuilder<>(INSTRUMENTATION_NAME, openTelemetry,
39-
RatpackHttpAttributesGetter.INSTANCE, Optional.of(RatpackGetter.INSTANCE));
34+
clientBuilder =
35+
new DefaultHttpClientTelemetryBuilder<>(
36+
INSTRUMENTATION_NAME,
37+
openTelemetry,
38+
RatpackHttpClientAttributesGetter.INSTANCE,
39+
Optional.of(RequestHeaderSetter.INSTANCE));
40+
serverBuilder =
41+
new DefaultHttpServerTelemetryBuilder<>(
42+
INSTRUMENTATION_NAME,
43+
openTelemetry,
44+
RatpackHttpAttributesGetter.INSTANCE,
45+
Optional.of(RatpackGetter.INSTANCE));
4046
}
4147

4248
/**
@@ -47,8 +53,8 @@ public final class RatpackTelemetryBuilder {
4753
@CanIgnoreReturnValue
4854
public RatpackTelemetryBuilder addAttributeExtractor(
4955
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
50-
clientBuilder.addAttributeExtractor((AttributesExtractor)attributesExtractor);
51-
serverBuilder.addAttributesExtractor((AttributesExtractor)attributesExtractor);
56+
clientBuilder.addAttributeExtractor((AttributesExtractor) attributesExtractor);
57+
serverBuilder.addAttributesExtractor((AttributesExtractor) attributesExtractor);
5258
return this;
5359
}
5460

‎instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public final class ReactorNettySingletons {
3636
new ReactorNettyHttpClientAttributesGetter(),
3737
HttpClientRequestHeadersSetter.INSTANCE);
3838

39-
NettyClientInstrumenterBuilder builder = new NettyClientInstrumenterBuilder(
40-
INSTRUMENTATION_NAME, GlobalOpenTelemetry.get());
41-
HttpClientInstrumenterBuilder.configure(CommonConfig.get(), builder);
39+
NettyClientInstrumenterBuilder builder =
40+
new NettyClientInstrumenterBuilder(INSTRUMENTATION_NAME, GlobalOpenTelemetry.get());
41+
HttpClientInstrumenterBuilder.configure(CommonConfig.get(), builder);
4242
NettyClientInstrumenterFactory instrumenterFactory =
4343
new NettyClientInstrumenterFactory(
44-
builder,
44+
builder,
4545
connectionTelemetryEnabled
4646
? NettyConnectionInstrumentationFlag.ENABLED
4747
: NettyConnectionInstrumentationFlag.DISABLED,

‎instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RestletSingletons.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ public final class RestletSingletons {
1919
private static final Instrumenter<Request, Response> INSTRUMENTER;
2020

2121
static {
22-
INSTRUMENTER = JavaagentHttpServerInstrumenterBuilder.create(
23-
RestletTelemetry.builder(GlobalOpenTelemetry.get()));
22+
INSTRUMENTER =
23+
JavaagentHttpServerInstrumenterBuilder.create(
24+
RestletTelemetry.builder(GlobalOpenTelemetry.get()));
2425
}
2526

2627
public static Instrumenter<Request, Response> instrumenter() {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ public final class RestletTelemetryBuilder {
2626
private final DefaultHttpServerTelemetryBuilder<Request, Response> serverBuilder;
2727

2828
RestletTelemetryBuilder(OpenTelemetry openTelemetry) {
29-
serverBuilder = new DefaultHttpServerTelemetryBuilder<>(INSTRUMENTATION_NAME, openTelemetry, RestletHttpAttributesGetter.INSTANCE, Optional.of(RestletHeadersGetter.INSTANCE));
29+
serverBuilder =
30+
new DefaultHttpServerTelemetryBuilder<>(
31+
INSTRUMENTATION_NAME,
32+
openTelemetry,
33+
RestletHttpAttributesGetter.INSTANCE,
34+
Optional.of(RestletHeadersGetter.INSTANCE));
3035
}
3136

3237
/**

‎instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletInstrumenterBuilder.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,14 @@ public Instrumenter<ServletRequestContext<REQUEST>, ServletResponseContext<RESPO
4545
HttpServerAttributesGetter<ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>>
4646
httpAttributesGetter) {
4747

48-
DefaultHttpServerTelemetryBuilder<ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>> serverBuilder = new DefaultHttpServerTelemetryBuilder<>(
49-
instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter,
50-
Optional.of(new ServletRequestGetter<>(accessor)));
48+
DefaultHttpServerTelemetryBuilder<
49+
ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>>
50+
serverBuilder =
51+
new DefaultHttpServerTelemetryBuilder<>(
52+
instrumentationName,
53+
GlobalOpenTelemetry.get(),
54+
httpAttributesGetter,
55+
Optional.of(new ServletRequestGetter<>(accessor)));
5156
serverBuilder.setSpanNameExtractor(e -> spanNameExtractor);
5257
return JavaagentHttpServerInstrumenterBuilder.createWithCustomizer(
5358
serverBuilder,
@@ -63,8 +68,7 @@ public Instrumenter<ServletRequestContext<REQUEST>, ServletResponseContext<RESPO
6368
}
6469

6570
builder
66-
.addAttributesExtractor(
67-
new ServletAdditionalAttributesExtractor<>(accessor))
71+
.addAttributesExtractor(new ServletAdditionalAttributesExtractor<>(accessor))
6872
.setErrorCauseExtractor(new ServletErrorCauseExtractor<>(accessor));
6973
});
7074
}

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/client/WebClientHelper.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
public final class WebClientHelper {
2020

21-
private static final Instrumenter<ClientRequest, ClientResponse> instrumenter = JavaagentHttpClientInstrumenterBuilder.create(
22-
"io.opentelemetry.spring-webflux-5.3",
23-
WebClientHttpAttributesGetter.INSTANCE,
24-
Optional.empty()
25-
);
21+
private static final Instrumenter<ClientRequest, ClientResponse> instrumenter =
22+
JavaagentHttpClientInstrumenterBuilder.create(
23+
"io.opentelemetry.spring-webflux-5.3",
24+
WebClientHttpAttributesGetter.INSTANCE,
25+
Optional.empty());
2626

2727
public static void addFilter(List<ExchangeFilterFunction> exchangeFilterFunctions) {
2828
for (ExchangeFilterFunction filterFunction : exchangeFilterFunctions) {

‎instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@ public final class SpringWebMvcTelemetryBuilder {
2323

2424
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-webmvc-5.3";
2525

26-
private final DefaultHttpServerTelemetryBuilder<HttpServletRequest, HttpServletResponse> serverBuilder;
26+
private final DefaultHttpServerTelemetryBuilder<HttpServletRequest, HttpServletResponse>
27+
serverBuilder;
2728

2829
SpringWebMvcTelemetryBuilder(OpenTelemetry openTelemetry) {
29-
serverBuilder = new DefaultHttpServerTelemetryBuilder<>(
30-
INSTRUMENTATION_NAME,
31-
openTelemetry,
32-
SpringWebMvcHttpAttributesGetter.INSTANCE,
33-
Optional.of(JavaxHttpServletRequestGetter.INSTANCE));
30+
serverBuilder =
31+
new DefaultHttpServerTelemetryBuilder<>(
32+
INSTRUMENTATION_NAME,
33+
openTelemetry,
34+
SpringWebMvcHttpAttributesGetter.INSTANCE,
35+
Optional.of(JavaxHttpServletRequestGetter.INSTANCE));
3436
}
3537

3638
/**
@@ -70,8 +72,8 @@ public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders(List<String> resp
7072
@CanIgnoreReturnValue
7173
public SpringWebMvcTelemetryBuilder setSpanNameExtractor(
7274
Function<
73-
SpanNameExtractor<HttpServletRequest>,
74-
? extends SpanNameExtractor<? super HttpServletRequest>>
75+
SpanNameExtractor<HttpServletRequest>,
76+
? extends SpanNameExtractor<? super HttpServletRequest>>
7577
spanNameExtractor) {
7678
serverBuilder.setSpanNameExtractor(spanNameExtractor);
7779
return this;

0 commit comments

Comments
 (0)