Skip to content

Commit 4bf8ca6

Browse files
trasktrask
committed
Enable errorprone's UnnecessarilyFullyQualified
1 parent 3749e03 commit 4bf8ca6

File tree

42 files changed

+168
-207
lines changed

Some content is hidden

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

42 files changed

+168
-207
lines changed

‎buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ tasks {
4545
// Suggests using Guava types for fields but we don't use Guava
4646
disable("ImmutableMemberCollection")
4747

48-
// Fully qualified names may be necessary when deprecating a class to avoid
49-
// deprecation warning.
50-
disable("UnnecessarilyFullyQualified")
51-
5248
// We use animal sniffer
5349
disable("Java8ApiChecker")
5450

‎exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/StringEncoderHolder.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.exporter.internal.marshal;
77

8+
import java.lang.reflect.Method;
89
import java.util.Optional;
910
import java.util.logging.Level;
1011
import java.util.logging.Logger;
@@ -51,7 +52,7 @@ public static StringEncoder createVarHandleEncoder() {
5152
try {
5253
Class<?> varHandleClass =
5354
Class.forName("io.opentelemetry.exporter.internal.marshal.VarHandleStringEncoder");
54-
java.lang.reflect.Method createMethod = varHandleClass.getMethod("createIfAvailable");
55+
Method createMethod = varHandleClass.getMethod("createIfAvailable");
5556
return (StringEncoder) createMethod.invoke(null);
5657
} catch (Throwable t) {
5758
return null;

‎exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/AnyValueStatelessMarshaler.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.opentelemetry.exporter.internal.marshal.Serializer;
1212
import io.opentelemetry.exporter.internal.marshal.StatelessMarshaler;
1313
import io.opentelemetry.exporter.internal.marshal.StatelessMarshalerUtil;
14+
import io.opentelemetry.proto.common.v1.internal.AnyValue;
1415
import java.io.IOException;
1516
import java.nio.ByteBuffer;
1617
import java.util.List;
@@ -49,14 +50,14 @@ public void writeTo(Serializer output, Value<?> value, MarshalerContext context)
4950
return;
5051
case ARRAY:
5152
output.serializeMessageWithContext(
52-
io.opentelemetry.proto.common.v1.internal.AnyValue.ARRAY_VALUE,
53+
AnyValue.ARRAY_VALUE,
5354
(List<Value<?>>) value.getValue(),
5455
ArrayAnyValueStatelessMarshaler.INSTANCE,
5556
context);
5657
return;
5758
case KEY_VALUE_LIST:
5859
output.serializeMessageWithContext(
59-
io.opentelemetry.proto.common.v1.internal.AnyValue.KVLIST_VALUE,
60+
AnyValue.KVLIST_VALUE,
6061
(List<KeyValue>) value.getValue(),
6162
KeyValueListAnyValueStatelessMarshaler.INSTANCE,
6263
context);
@@ -92,13 +93,13 @@ public int getBinarySerializedSize(Value<?> value, MarshalerContext context) {
9293
(Double) value.getValue(), context);
9394
case ARRAY:
9495
return StatelessMarshalerUtil.sizeMessageWithContext(
95-
io.opentelemetry.proto.common.v1.internal.AnyValue.ARRAY_VALUE,
96+
AnyValue.ARRAY_VALUE,
9697
(List<Value<?>>) value.getValue(),
9798
ArrayAnyValueStatelessMarshaler.INSTANCE,
9899
context);
99100
case KEY_VALUE_LIST:
100101
return StatelessMarshalerUtil.sizeMessageWithContext(
101-
io.opentelemetry.proto.common.v1.internal.AnyValue.KVLIST_VALUE,
102+
AnyValue.KVLIST_VALUE,
102103
(List<KeyValue>) value.getValue(),
103104
KeyValueListAnyValueStatelessMarshaler.INSTANCE,
104105
context);

‎exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExemplarMarshaler.java‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.opentelemetry.exporter.internal.marshal.ProtoFieldInfo;
1212
import io.opentelemetry.exporter.internal.marshal.Serializer;
1313
import io.opentelemetry.exporter.internal.otlp.KeyValueMarshaler;
14+
import io.opentelemetry.proto.metrics.v1.internal.Exemplar;
1415
import io.opentelemetry.sdk.metrics.data.DoubleExemplarData;
1516
import io.opentelemetry.sdk.metrics.data.ExemplarData;
1617
import io.opentelemetry.sdk.metrics.data.LongExemplarData;
@@ -66,22 +67,17 @@ private ExemplarMarshaler(
6667

6768
@Override
6869
public void writeTo(Serializer output) throws IOException {
69-
output.serializeFixed64(
70-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO, timeUnixNano);
71-
if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
70+
output.serializeFixed64(Exemplar.TIME_UNIX_NANO, timeUnixNano);
71+
if (valueField == Exemplar.AS_INT) {
7272
output.serializeFixed64Optional(valueField, ((LongExemplarData) value).getValue());
7373
} else {
7474
output.serializeDoubleOptional(valueField, ((DoubleExemplarData) value).getValue());
7575
}
7676
if (spanContext.isValid()) {
77-
output.serializeSpanId(
78-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID, spanContext.getSpanId());
79-
output.serializeTraceId(
80-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID, spanContext.getTraceId());
77+
output.serializeSpanId(Exemplar.SPAN_ID, spanContext.getSpanId());
78+
output.serializeTraceId(Exemplar.TRACE_ID, spanContext.getTraceId());
8179
}
82-
output.serializeRepeatedMessage(
83-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
84-
filteredAttributeMarshalers);
80+
output.serializeRepeatedMessage(Exemplar.FILTERED_ATTRIBUTES, filteredAttributeMarshalers);
8581
}
8682

8783
private static int calculateSize(
@@ -91,36 +87,28 @@ private static int calculateSize(
9187
SpanContext spanContext,
9288
KeyValueMarshaler[] filteredAttributeMarshalers) {
9389
int size = 0;
94-
size +=
95-
MarshalerUtil.sizeFixed64(
96-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO, timeUnixNano);
97-
if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
90+
size += MarshalerUtil.sizeFixed64(Exemplar.TIME_UNIX_NANO, timeUnixNano);
91+
if (valueField == Exemplar.AS_INT) {
9892
size += MarshalerUtil.sizeFixed64Optional(valueField, ((LongExemplarData) value).getValue());
9993
} else {
10094
size += MarshalerUtil.sizeDoubleOptional(valueField, ((DoubleExemplarData) value).getValue());
10195
}
10296
if (spanContext.isValid()) {
103-
size +=
104-
MarshalerUtil.sizeSpanId(
105-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID, spanContext.getSpanId());
106-
size +=
107-
MarshalerUtil.sizeTraceId(
108-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID,
109-
spanContext.getTraceId());
97+
size += MarshalerUtil.sizeSpanId(Exemplar.SPAN_ID, spanContext.getSpanId());
98+
size += MarshalerUtil.sizeTraceId(Exemplar.TRACE_ID, spanContext.getTraceId());
11099
}
111100
size +=
112101
MarshalerUtil.sizeRepeatedMessage(
113-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
114-
filteredAttributeMarshalers);
102+
Exemplar.FILTERED_ATTRIBUTES, filteredAttributeMarshalers);
115103
return size;
116104
}
117105

118106
static ProtoFieldInfo toProtoExemplarValueType(ExemplarData exemplar) {
119107
if (exemplar instanceof LongExemplarData) {
120-
return io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT;
108+
return Exemplar.AS_INT;
121109
} else {
122110
assert exemplar instanceof DoubleExemplarData;
123-
return io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_DOUBLE;
111+
return Exemplar.AS_DOUBLE;
124112
}
125113
}
126114
}

‎exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExemplarStatelessMarshaler.java‎

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.opentelemetry.exporter.internal.marshal.StatelessMarshaler;
1616
import io.opentelemetry.exporter.internal.marshal.StatelessMarshalerUtil;
1717
import io.opentelemetry.exporter.internal.otlp.AttributeKeyValueStatelessMarshaler;
18+
import io.opentelemetry.proto.metrics.v1.internal.Exemplar;
1819
import io.opentelemetry.sdk.metrics.data.DoubleExemplarData;
1920
import io.opentelemetry.sdk.metrics.data.ExemplarData;
2021
import io.opentelemetry.sdk.metrics.data.LongExemplarData;
@@ -29,28 +30,20 @@ private ExemplarStatelessMarshaler() {}
2930
@Override
3031
public void writeTo(Serializer output, ExemplarData exemplar, MarshalerContext context)
3132
throws IOException {
32-
output.serializeFixed64(
33-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO,
34-
exemplar.getEpochNanos());
33+
output.serializeFixed64(Exemplar.TIME_UNIX_NANO, exemplar.getEpochNanos());
3534
ProtoFieldInfo valueField = toProtoExemplarValueType(exemplar);
36-
if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
35+
if (valueField == Exemplar.AS_INT) {
3736
output.serializeFixed64Optional(valueField, ((LongExemplarData) exemplar).getValue());
3837
} else {
3938
output.serializeDoubleOptional(valueField, ((DoubleExemplarData) exemplar).getValue());
4039
}
4140
SpanContext spanContext = exemplar.getSpanContext();
4241
if (spanContext.isValid()) {
43-
output.serializeSpanId(
44-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID,
45-
spanContext.getSpanId(),
46-
context);
47-
output.serializeTraceId(
48-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID,
49-
spanContext.getTraceId(),
50-
context);
42+
output.serializeSpanId(Exemplar.SPAN_ID, spanContext.getSpanId(), context);
43+
output.serializeTraceId(Exemplar.TRACE_ID, spanContext.getTraceId(), context);
5144
}
5245
output.serializeRepeatedMessageWithContext(
53-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
46+
Exemplar.FILTERED_ATTRIBUTES,
5447
exemplar.getFilteredAttributes(),
5548
AttributeKeyValueStatelessMarshaler.INSTANCE,
5649
context);
@@ -59,12 +52,9 @@ public void writeTo(Serializer output, ExemplarData exemplar, MarshalerContext c
5952
@Override
6053
public int getBinarySerializedSize(ExemplarData exemplar, MarshalerContext context) {
6154
int size = 0;
62-
size +=
63-
MarshalerUtil.sizeFixed64(
64-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO,
65-
exemplar.getEpochNanos());
55+
size += MarshalerUtil.sizeFixed64(Exemplar.TIME_UNIX_NANO, exemplar.getEpochNanos());
6656
ProtoFieldInfo valueField = toProtoExemplarValueType(exemplar);
67-
if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
57+
if (valueField == Exemplar.AS_INT) {
6858
size +=
6959
MarshalerUtil.sizeFixed64Optional(valueField, ((LongExemplarData) exemplar).getValue());
7060
} else {
@@ -73,17 +63,12 @@ public int getBinarySerializedSize(ExemplarData exemplar, MarshalerContext conte
7363
}
7464
SpanContext spanContext = exemplar.getSpanContext();
7565
if (spanContext.isValid()) {
76-
size +=
77-
MarshalerUtil.sizeSpanId(
78-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID, spanContext.getSpanId());
79-
size +=
80-
MarshalerUtil.sizeTraceId(
81-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID,
82-
spanContext.getTraceId());
66+
size += MarshalerUtil.sizeSpanId(Exemplar.SPAN_ID, spanContext.getSpanId());
67+
size += MarshalerUtil.sizeTraceId(Exemplar.TRACE_ID, spanContext.getTraceId());
8368
}
8469
size +=
8570
StatelessMarshalerUtil.sizeRepeatedMessageWithContext(
86-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
71+
Exemplar.FILTERED_ATTRIBUTES,
8772
exemplar.getFilteredAttributes(),
8873
AttributeKeyValueStatelessMarshaler.INSTANCE,
8974
context);

‎exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/ManagedChannelTelemetryExporterBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.grpc.ManagedChannelBuilder;
1212
import io.grpc.netty.GrpcSslContexts;
1313
import io.grpc.netty.NettyChannelBuilder;
14+
import io.grpc.okhttp.OkHttpChannelBuilder;
1415
import io.netty.handler.ssl.SslContext;
1516
import io.opentelemetry.api.metrics.MeterProvider;
1617
import io.opentelemetry.common.ComponentLoader;
@@ -286,8 +287,7 @@ private static void setSslContext(
286287
if (sslContext == null) {
287288
return;
288289
}
289-
io.grpc.okhttp.OkHttpChannelBuilder okHttpBuilder =
290-
(io.grpc.okhttp.OkHttpChannelBuilder) managedChannelBuilder;
290+
OkHttpChannelBuilder okHttpBuilder = (OkHttpChannelBuilder) managedChannelBuilder;
291291
okHttpBuilder.sslSocketFactory(sslContext.getSocketFactory());
292292
break;
293293
default:

‎exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import okhttp3.OkHttpClient;
3838
import okhttp3.Request;
3939
import okhttp3.RequestBody;
40+
import okhttp3.Response;
4041
import okhttp3.ResponseBody;
4142
import okio.BufferedSink;
4243
import okio.Okio;
@@ -139,7 +140,7 @@ public void onFailure(Call call, IOException e) {
139140
}
140141

141142
@Override
142-
public void onResponse(Call call, okhttp3.Response response) {
143+
public void onResponse(Call call, Response response) {
143144
try (ResponseBody body = response.body()) {
144145
onResponse.accept(
145146
new HttpResponse() {
@@ -183,7 +184,7 @@ public CompletableResultCode shutdown() {
183184
return CompletableResultCode.ofSuccess();
184185
}
185186

186-
static boolean isRetryable(okhttp3.Response response) {
187+
static boolean isRetryable(Response response) {
187188
return RetryUtil.retryableHttpResponseCodes().contains(response.code());
188189
}
189190

‎exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ void shutdown_CompletableResultCodeShouldWaitForThreads() throws Exception {
108108
"CompletableResultCode should not be done immediately - it should wait for thread termination");
109109

110110
// Now wait for it to complete
111-
shutdownResult.join(10, java.util.concurrent.TimeUnit.SECONDS);
111+
shutdownResult.join(10, TimeUnit.SECONDS);
112112
assertTrue(shutdownResult.isDone(), "CompletableResultCode should be done after waiting");
113113
assertTrue(shutdownResult.isSuccess(), "Shutdown should complete successfully");
114114
}

‎exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/RetryInterceptorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class RetryInterceptorTest {
6868

6969
@BeforeEach
7070
void setUp() {
71-
Logger logger = java.util.logging.Logger.getLogger(RetryInterceptor.class.getName());
71+
Logger logger = Logger.getLogger(RetryInterceptor.class.getName());
7272
logger.setLevel(Level.FINER);
7373
retryExceptionPredicate =
7474
spy(

‎exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterBuilder.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import zipkin2.Span;
2121
import zipkin2.reporter.BytesEncoder;
2222
import zipkin2.reporter.BytesMessageSender;
23+
import zipkin2.reporter.Sender;
2324
import zipkin2.reporter.SpanBytesEncoder;
2425
import zipkin2.reporter.okhttp3.OkHttpSender;
2526

@@ -55,7 +56,7 @@ public final class ZipkinSpanExporterBuilder {
5556
* @deprecated Use {@link #setSender(BytesMessageSender)} insteead.
5657
*/
5758
@Deprecated
58-
public ZipkinSpanExporterBuilder setSender(zipkin2.reporter.Sender sender) {
59+
public ZipkinSpanExporterBuilder setSender(Sender sender) {
5960
return setSender((BytesMessageSender) sender);
6061
}
6162

0 commit comments

Comments
 (0)