Skip to content

Commit 534d3ef

Browse files
committed
UnnecessarilyFullyQualified
1 parent f64d116 commit 534d3ef

File tree

13 files changed

+24
-29
lines changed

13 files changed

+24
-29
lines changed

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,7 @@ static void parseResponse(
193193
DockerImage parsedImage = DockerImage.parse(value);
194194
if (parsedImage != null) {
195195
attrBuilders.put(CONTAINER_IMAGE_NAME, parsedImage.getRepository());
196-
attrBuilders.put(
197-
io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_IMAGE_TAGS,
198-
parsedImage.getTag());
196+
attrBuilders.put(IncubatingAttributes.CONTAINER_IMAGE_TAGS, parsedImage.getTag());
199197
}
200198
break;
201199
case "ImageID":

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

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

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

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/models/LogRecordDataImpl.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import io.opentelemetry.api.logs.Severity;
1313
import io.opentelemetry.api.trace.SpanContext;
1414
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
15+
import io.opentelemetry.sdk.logs.data.Body;
1516
import io.opentelemetry.sdk.logs.data.internal.ExtendedLogRecordData;
1617
import io.opentelemetry.sdk.resources.Resource;
1718
import javax.annotation.Nullable;
@@ -24,11 +25,9 @@ public static Builder builder() {
2425
}
2526

2627
@Deprecated
27-
public io.opentelemetry.sdk.logs.data.Body getBody() {
28+
public Body getBody() {
2829
Value<?> valueBody = getBodyValue();
29-
return valueBody == null
30-
? io.opentelemetry.sdk.logs.data.Body.empty()
31-
: io.opentelemetry.sdk.logs.data.Body.string(valueBody.asString());
30+
return valueBody == null ? Body.empty() : Body.string(valueBody.asString());
3231
}
3332

3433
@Override

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/spans/models/SpanDataImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.opentelemetry.api.common.Attributes;
1010
import io.opentelemetry.api.trace.SpanContext;
1111
import io.opentelemetry.api.trace.SpanKind;
12+
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
1213
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
1314
import io.opentelemetry.sdk.resources.Resource;
1415
import io.opentelemetry.sdk.trace.data.EventData;
@@ -32,7 +33,7 @@ public boolean hasEnded() {
3233
@SuppressWarnings(
3334
"deprecation") // Overridden to avoid AutoValue to generate builder method for it.
3435
@Override
35-
public io.opentelemetry.sdk.common.InstrumentationLibraryInfo getInstrumentationLibraryInfo() {
36+
public InstrumentationLibraryInfo getInstrumentationLibraryInfo() {
3637
throw new UnsupportedOperationException();
3738
}
3839

gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.net.URI;
2323
import java.security.KeyManagementException;
2424
import java.security.NoSuchAlgorithmException;
25+
import java.security.SecureRandom;
2526
import java.security.cert.X509Certificate;
2627
import java.time.Duration;
2728
import java.util.Arrays;
@@ -152,7 +153,7 @@ public X509Certificate[] getAcceptedIssuers() {
152153
}
153154
};
154155
SSLContext sc = SSLContext.getInstance("SSL");
155-
sc.init(null, trustAllCerts, new java.security.SecureRandom());
156+
sc.init(null, trustAllCerts, new SecureRandom());
156157
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
157158
}
158159

ibm-mq-metrics/src/integrationTest/java/io/opentelemetry/ibm/mq/integration/tests/JakartaPutGet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static void createQueue(QueueManager manager, String name, int maxDepth)
5353
MQQueueManager ibmQueueManager = WmqUtil.connectToQueueManager(manager);
5454
PCFMessageAgent agent = WmqUtil.initPcfMessageAgent(manager, ibmQueueManager);
5555
PCFMessage request = new PCFMessage(CMQCFC.MQCMD_CREATE_Q);
56-
request.addParameter(com.ibm.mq.constants.CMQC.MQCA_Q_NAME, name);
56+
request.addParameter(CMQC.MQCA_Q_NAME, name);
5757
request.addParameter(CMQC.MQIA_Q_TYPE, CMQC.MQQT_LOCAL);
5858

5959
request.addParameter(CMQC.MQIA_MAX_Q_DEPTH, maxDepth);

maven-extension/src/main/java/io/opentelemetry/maven/OtelExecutionListener.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,11 @@ public final class OtelExecutionListener extends AbstractExecutionListener {
9898
public void sessionStarted(ExecutionEvent executionEvent) {
9999
MavenProject project = executionEvent.getSession().getTopLevelProject();
100100
TextMapGetter<Map<String, String>> toUpperCaseTextMapGetter = new ToUpperCaseTextMapGetter();
101-
io.opentelemetry.context.Context context =
101+
Context context =
102102
openTelemetrySdkService
103103
.getPropagators()
104104
.getTextMapPropagator()
105-
.extract(
106-
io.opentelemetry.context.Context.current(),
107-
System.getenv(),
108-
toUpperCaseTextMapGetter);
105+
.extract(Context.current(), System.getenv(), toUpperCaseTextMapGetter);
109106

110107
// TODO question: is this the root span name we want?
111108
// It's interesting for the root span name to

maven-extension/src/main/java/io/opentelemetry/maven/handler/MavenDeployHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import java.util.Collections;
1717
import java.util.List;
1818
import org.apache.maven.artifact.Artifact;
19+
import org.apache.maven.artifact.repository.ArtifactRepository;
1920
import org.apache.maven.execution.ExecutionEvent;
2021
import org.apache.maven.project.MavenProject;
2122
import org.slf4j.Logger;
@@ -35,8 +36,7 @@ public void enrichSpan(SpanBuilder spanBuilder, ExecutionEvent execution) {
3536

3637
MavenProject project = execution.getProject();
3738
@SuppressWarnings("deprecation") // there is no alternative to o.a.m.a.r.ArtifactRepository
38-
org.apache.maven.artifact.repository.ArtifactRepository optRepository =
39-
project.getDistributionManagementArtifactRepository();
39+
ArtifactRepository optRepository = project.getDistributionManagementArtifactRepository();
4040

4141
if (optRepository == null) {
4242
return;

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/connectivity/http/OkHttpSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private OkHttpSender(String url, OkHttpClient client) {
4141
@Override
4242
public CompletableFuture<Response> send(BodyWriter writer, int contentLength) {
4343
CompletableFuture<Response> future = new CompletableFuture<>();
44-
okhttp3.Request.Builder builder = new okhttp3.Request.Builder().url(url);
44+
Request.Builder builder = new Request.Builder().url(url);
4545
builder.addHeader("Content-Type", CONTENT_TYPE);
4646

4747
RequestBody body = new RawRequestBody(writer, contentLength, MEDIA_TYPE);

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/connectivity/websocket/OkHttpWebSocket.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import javax.annotation.Nonnull;
1212
import javax.annotation.Nullable;
1313
import okhttp3.OkHttpClient;
14+
import okhttp3.Request;
1415
import okhttp3.Response;
1516
import okhttp3.WebSocketListener;
1617
import okio.ByteString;
@@ -37,7 +38,7 @@ private OkHttpWebSocket(String url, OkHttpClient client) {
3738
@Override
3839
public void open(Listener listener) {
3940
if (status.compareAndSet(Status.NOT_RUNNING, Status.STARTING)) {
40-
okhttp3.Request request = new okhttp3.Request.Builder().url(url).build();
41+
Request request = new Request.Builder().url(url).build();
4142
webSocket.set(client.newWebSocket(request, new ListenerAdapter(listener)));
4243
}
4344
}

0 commit comments

Comments
 (0)