Skip to content

Commit 8bdbe2e

Browse files
trasktrask
authored
Apply static factory ordering rule (open-telemetry#17842)
1 parent 366ef01 commit 8bdbe2e

File tree

45 files changed

+302
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+302
-302
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,6 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
6464
private boolean emitExperimentalHttpClientTelemetry = false;
6565
private Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer = b -> {};
6666

67-
private DefaultHttpClientInstrumenterBuilder(
68-
String instrumentationName,
69-
OpenTelemetry openTelemetry,
70-
HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter,
71-
@Nullable TextMapSetter<REQUEST> headerSetter) {
72-
this.instrumentationName = requireNonNull(instrumentationName, "instrumentationName");
73-
this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry");
74-
this.attributesGetter = requireNonNull(attributesGetter, "attributesGetter");
75-
httpSpanNameExtractorBuilder = HttpSpanNameExtractor.builder(attributesGetter);
76-
httpAttributesExtractorBuilder = HttpClientAttributesExtractor.builder(attributesGetter);
77-
this.headerSetter = headerSetter;
78-
}
79-
8067
public static <REQUEST, RESPONSE> DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> create(
8168
String instrumentationName,
8269
OpenTelemetry openTelemetry,
@@ -97,6 +84,19 @@ public static <REQUEST, RESPONSE> DefaultHttpClientInstrumenterBuilder<REQUEST,
9784
requireNonNull(headerSetter, "headerSetter"));
9885
}
9986

87+
private DefaultHttpClientInstrumenterBuilder(
88+
String instrumentationName,
89+
OpenTelemetry openTelemetry,
90+
HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter,
91+
@Nullable TextMapSetter<REQUEST> headerSetter) {
92+
this.instrumentationName = requireNonNull(instrumentationName, "instrumentationName");
93+
this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry");
94+
this.attributesGetter = requireNonNull(attributesGetter, "attributesGetter");
95+
httpSpanNameExtractorBuilder = HttpSpanNameExtractor.builder(attributesGetter);
96+
httpAttributesExtractorBuilder = HttpClientAttributesExtractor.builder(attributesGetter);
97+
this.headerSetter = headerSetter;
98+
}
99+
100100
/**
101101
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
102102
* items. The {@link AttributesExtractor} will be executed after all default extractors.

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,6 @@ public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
6464
private boolean emitExperimentalHttpServerTelemetry = false;
6565
private Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer = b -> {};
6666

67-
private DefaultHttpServerInstrumenterBuilder(
68-
String instrumentationName,
69-
OpenTelemetry openTelemetry,
70-
HttpServerAttributesGetter<REQUEST, RESPONSE> attributesGetter,
71-
@Nullable TextMapGetter<REQUEST> headerGetter) {
72-
this.instrumentationName = requireNonNull(instrumentationName, "instrumentationName");
73-
this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry");
74-
this.attributesGetter = requireNonNull(attributesGetter, "attributesGetter");
75-
httpAttributesExtractorBuilder = HttpServerAttributesExtractor.builder(attributesGetter);
76-
httpSpanNameExtractorBuilder = HttpSpanNameExtractor.builder(attributesGetter);
77-
httpServerRouteBuilder = HttpServerRoute.builder(attributesGetter);
78-
this.headerGetter = headerGetter;
79-
}
80-
8167
public static <REQUEST, RESPONSE> DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> create(
8268
String instrumentationName,
8369
OpenTelemetry openTelemetry,
@@ -98,6 +84,20 @@ public static <REQUEST, RESPONSE> DefaultHttpServerInstrumenterBuilder<REQUEST,
9884
requireNonNull(headerGetter, "headerGetter"));
9985
}
10086

87+
private DefaultHttpServerInstrumenterBuilder(
88+
String instrumentationName,
89+
OpenTelemetry openTelemetry,
90+
HttpServerAttributesGetter<REQUEST, RESPONSE> attributesGetter,
91+
@Nullable TextMapGetter<REQUEST> headerGetter) {
92+
this.instrumentationName = requireNonNull(instrumentationName, "instrumentationName");
93+
this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry");
94+
this.attributesGetter = requireNonNull(attributesGetter, "attributesGetter");
95+
httpAttributesExtractorBuilder = HttpServerAttributesExtractor.builder(attributesGetter);
96+
httpSpanNameExtractorBuilder = HttpSpanNameExtractor.builder(attributesGetter);
97+
httpServerRouteBuilder = HttpServerRoute.builder(attributesGetter);
98+
this.headerGetter = headerGetter;
99+
}
100+
101101
/**
102102
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
103103
* items.

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/internal/SqlCommenter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ public final class SqlCommenter {
2020
private final BiFunction<Object, Boolean, TextMapPropagator> propagator;
2121
private final Predicate<Object> prepend;
2222

23+
public static SqlCommenterBuilder builder() {
24+
return new SqlCommenterBuilder();
25+
}
26+
2327
SqlCommenter(
2428
boolean enabled,
2529
BiFunction<Object, Boolean, TextMapPropagator> propagator,
@@ -29,10 +33,6 @@ public final class SqlCommenter {
2933
this.prepend = prepend;
3034
}
3135

32-
public static SqlCommenterBuilder builder() {
33-
return new SqlCommenterBuilder();
34-
}
35-
3636
public static SqlCommenter noop() {
3737
return builder().build();
3838
}

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientServicePeerAttributesExtractor.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,6 @@ public final class HttpClientServicePeerAttributesExtractor<REQUEST, RESPONSE>
3030
private final HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter;
3131
private final ServicePeerResolver servicePeerResolver;
3232

33-
// visible for tests
34-
HttpClientServicePeerAttributesExtractor(
35-
AddressAndPortExtractor<REQUEST> addressAndPortExtractor,
36-
HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter,
37-
ServicePeerResolver servicePeerResolver) {
38-
this.addressAndPortExtractor = addressAndPortExtractor;
39-
this.attributesGetter = attributesGetter;
40-
this.servicePeerResolver = servicePeerResolver;
41-
}
42-
4333
/**
4434
* Returns a new {@link HttpClientServicePeerAttributesExtractor} that will use the passed {@code
4535
* attributesGetter} to extract server address and port (with fallback to the HTTP Host header).
@@ -62,6 +52,16 @@ public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(
6252
addressAndPortExtractor, attributesGetter, servicePeerResolver);
6353
}
6454

55+
// visible for tests
56+
HttpClientServicePeerAttributesExtractor(
57+
AddressAndPortExtractor<REQUEST> addressAndPortExtractor,
58+
HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter,
59+
ServicePeerResolver servicePeerResolver) {
60+
this.addressAndPortExtractor = addressAndPortExtractor;
61+
this.attributesGetter = attributesGetter;
62+
this.servicePeerResolver = servicePeerResolver;
63+
}
64+
6565
@Override
6666
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {}
6767

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcSizeAttributesExtractor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ public final class RpcSizeAttributesExtractor<REQUEST, RESPONSE>
1919

2020
private final RpcAttributesGetter<REQUEST, RESPONSE> getter;
2121

22-
RpcSizeAttributesExtractor(RpcAttributesGetter<REQUEST, RESPONSE> getter) {
23-
this.getter = getter;
24-
}
25-
2622
/**
2723
* Returns a new {@link RpcSizeAttributesExtractor} that will use the passed {@code
2824
* attributesGetter} instance to determine the request and response size.
@@ -32,6 +28,10 @@ public static <REQUEST, RESPONSE> RpcSizeAttributesExtractor<REQUEST, RESPONSE>
3228
return new RpcSizeAttributesExtractor<>(attributesGetter);
3329
}
3430

31+
RpcSizeAttributesExtractor(RpcAttributesGetter<REQUEST, RESPONSE> getter) {
32+
this.getter = getter;
33+
}
34+
3535
@Override
3636
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {}
3737

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/service/peer/ServicePeerAttributesExtractor.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ public final class ServicePeerAttributesExtractor<REQUEST, RESPONSE>
2424
private final ServerAttributesGetter<REQUEST> attributesGetter;
2525
private final ServicePeerResolver servicePeerResolver;
2626

27-
// visible for tests
28-
ServicePeerAttributesExtractor(
29-
ServerAttributesGetter<REQUEST> attributesGetter, ServicePeerResolver servicePeerResolver) {
30-
this.attributesGetter = attributesGetter;
31-
this.servicePeerResolver = servicePeerResolver;
32-
}
33-
3427
/**
3528
* Returns a new {@link ServicePeerAttributesExtractor} that will use the passed {@code
3629
* attributesGetter} instance to determine the value of the {@code service.peer.name} attribute.
@@ -49,6 +42,13 @@ public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(
4942
return new ServicePeerAttributesExtractor<>(attributesGetter, servicePeerResolver);
5043
}
5144

45+
// visible for tests
46+
ServicePeerAttributesExtractor(
47+
ServerAttributesGetter<REQUEST> attributesGetter, ServicePeerResolver servicePeerResolver) {
48+
this.attributesGetter = attributesGetter;
49+
this.servicePeerResolver = servicePeerResolver;
50+
}
51+
5252
@Override
5353
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {}
5454

‎instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobHelper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
public class ElasticJobHelper {
1414
private final Instrumenter<ElasticJobProcessRequest, Void> instrumenter;
1515

16-
private ElasticJobHelper(Instrumenter<ElasticJobProcessRequest, Void> instrumenter) {
17-
this.instrumenter = instrumenter;
18-
}
19-
2016
public static ElasticJobHelper create(Instrumenter<ElasticJobProcessRequest, Void> instrumenter) {
2117
return new ElasticJobHelper(instrumenter);
2218
}
2319

20+
private ElasticJobHelper(Instrumenter<ElasticJobProcessRequest, Void> instrumenter) {
21+
this.instrumenter = instrumenter;
22+
}
23+
2424
@Nullable
2525
public ElasticJobScope startSpan(ElasticJobProcessRequest request) {
2626
Context parentContext = Context.current();

‎instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobProcessRequest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ public class ElasticJobProcessRequest {
1818
private final Class<?> userJobClass;
1919
private final String userMethodName;
2020

21+
public static ElasticJobProcessRequest create(
22+
ShardingContext shardingContext,
23+
ElasticJobType jobType,
24+
Class<?> userJobClass,
25+
String userMethodName) {
26+
return new ElasticJobProcessRequest(shardingContext, jobType, userJobClass, userMethodName);
27+
}
28+
2129
private ElasticJobProcessRequest(
2230
ShardingContext shardingContext,
2331
ElasticJobType jobType,
@@ -38,14 +46,6 @@ private static String emptyToNull(@Nullable String string) {
3846
return string == null || string.isEmpty() ? null : string;
3947
}
4048

41-
public static ElasticJobProcessRequest create(
42-
ShardingContext shardingContext,
43-
ElasticJobType jobType,
44-
Class<?> userJobClass,
45-
String userMethodName) {
46-
return new ElasticJobProcessRequest(shardingContext, jobType, userJobClass, userMethodName);
47-
}
48-
4949
public String getJobName() {
5050
return this.jobName;
5151
}

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsProcessRequest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ final class SqsProcessRequest extends AbstractSqsRequest {
1111
private final Request<?> request;
1212
private final SqsMessage message;
1313

14+
public static SqsProcessRequest create(Request<?> request, SqsMessage message) {
15+
return new SqsProcessRequest(request, message);
16+
}
17+
1418
private SqsProcessRequest(Request<?> request, SqsMessage message) {
1519
this.request = request;
1620
this.message = message;
1721
}
1822

19-
public static SqsProcessRequest create(Request<?> request, SqsMessage message) {
20-
return new SqsProcessRequest(request, message);
21-
}
22-
2323
@Override
2424
public Request<?> getRequest() {
2525
return request;

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsReceiveRequest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ final class SqsReceiveRequest extends AbstractSqsRequest {
1212
private final Request<?> request;
1313
private final List<SqsMessage> messages;
1414

15+
public static SqsReceiveRequest create(Request<?> request, List<SqsMessage> messages) {
16+
return new SqsReceiveRequest(request, messages);
17+
}
18+
1519
private SqsReceiveRequest(Request<?> request, List<SqsMessage> messages) {
1620
this.request = request;
1721
this.messages = messages;
1822
}
1923

20-
public static SqsReceiveRequest create(Request<?> request, List<SqsMessage> messages) {
21-
return new SqsReceiveRequest(request, messages);
22-
}
23-
2424
@Override
2525
public Request<?> getRequest() {
2626
return request;

0 commit comments

Comments
 (0)