Skip to content

Commit dca4806

Browse files
committed
use covariance
1 parent c3287cf commit dca4806

File tree

45 files changed

+0
-85
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

+0
-85
lines changed

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerAttributesGetter.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ final class ActivejHttpServerAttributesGetter
2121
implements HttpServerAttributesGetter<HttpRequest, HttpResponse> {
2222

2323
@Override
24-
@Nullable
2524
public String getHttpRequestMethod(HttpRequest request) {
2625
return request.getMethod().name();
2726
}
@@ -60,13 +59,11 @@ public List<String> getHttpResponseHeader(
6059
}
6160

6261
@Override
63-
@Nullable
6462
public String getUrlScheme(HttpRequest request) {
6563
return request.getProtocol().lowercase();
6664
}
6765

6866
@Override
69-
@Nullable
7067
public String getUrlPath(HttpRequest request) {
7168
return request.getPath();
7269
}

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesGetter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public String getUrlFull(HttpRequest httpRequest) {
2121
}
2222

2323
@Override
24-
@Nullable
2524
public String getHttpRequestMethod(HttpRequest httpRequest) {
2625
return httpRequest.method().value();
2726
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class AkkaHttpServerAttributesGetter
1717
implements HttpServerAttributesGetter<HttpRequest, HttpResponse> {
1818

1919
@Override
20-
@Nullable
2120
public String getHttpRequestMethod(HttpRequest request) {
2221
return request.method().value();
2322
}
@@ -40,13 +39,11 @@ public List<String> getHttpResponseHeader(
4039
}
4140

4241
@Override
43-
@Nullable
4442
public String getUrlScheme(HttpRequest request) {
4543
return request.uri().scheme();
4644
}
4745

4846
@Override
49-
@Nullable
5047
public String getUrlPath(HttpRequest request) {
5148
return request.uri().path().toString();
5249
}

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesGetter.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ final class ApacheHttpAsyncClientHttpAttributesGetter
1818
implements HttpClientAttributesGetter<ApacheHttpClientRequest, HttpResponse> {
1919

2020
@Override
21-
@Nullable
2221
public String getHttpRequestMethod(ApacheHttpClientRequest request) {
2322
return request.getMethod();
2423
}
@@ -48,14 +47,12 @@ public List<String> getHttpResponseHeader(
4847
}
4948

5049
@Override
51-
@Nullable
5250
public String getNetworkProtocolName(
5351
ApacheHttpClientRequest request, @Nullable HttpResponse response) {
5452
return request.getProtocolName();
5553
}
5654

5755
@Override
58-
@Nullable
5956
public String getNetworkProtocolVersion(
6057
ApacheHttpClientRequest request, @Nullable HttpResponse response) {
6158
return request.getProtocolVersion();

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientHttpAttributesGetter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ final class ApacheHttpClientHttpAttributesGetter
2121
implements HttpClientAttributesGetter<HttpMethod, HttpMethod> {
2222

2323
@Override
24-
@Nullable
2524
public String getHttpRequestMethod(HttpMethod request) {
2625
return request.getName();
2726
}
@@ -78,7 +77,6 @@ public List<String> getHttpResponseHeader(HttpMethod request, HttpMethod respons
7877
}
7978

8079
@Override
81-
@Nullable
8280
public String getNetworkProtocolName(HttpMethod request, @Nullable HttpMethod response) {
8381
return "http";
8482
}

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHttpAttributesGetter.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ final class ApacheHttpClientHttpAttributesGetter
1616
implements HttpClientAttributesGetter<ApacheHttpClientRequest, HttpResponse> {
1717

1818
@Override
19-
@Nullable
2019
public String getHttpRequestMethod(ApacheHttpClientRequest request) {
2120
return request.getMethod();
2221
}
@@ -44,14 +43,12 @@ public List<String> getHttpResponseHeader(
4443
}
4544

4645
@Override
47-
@Nullable
4846
public String getNetworkProtocolName(
4947
ApacheHttpClientRequest request, @Nullable HttpResponse response) {
5048
return request.getProtocolName();
5149
}
5250

5351
@Override
54-
@Nullable
5552
public String getNetworkProtocolVersion(
5653
ApacheHttpClientRequest request, @Nullable HttpResponse response) {
5754
return request.getProtocolVersion();

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ enum ApacheHttpClientHttpAttributesGetter
1818
INSTANCE;
1919

2020
@Override
21-
@Nullable
2221
public String getHttpRequestMethod(ApacheHttpClientRequest request) {
2322
return request.getMethod();
2423
}
@@ -47,14 +46,12 @@ public List<String> getHttpResponseHeader(
4746
}
4847

4948
@Override
50-
@Nullable
5149
public String getNetworkProtocolName(
5250
ApacheHttpClientRequest request, @Nullable HttpResponse response) {
5351
return request.getProtocolName();
5452
}
5553

5654
@Override
57-
@Nullable
5855
public String getNetworkProtocolVersion(
5956
ApacheHttpClientRequest request, @Nullable HttpResponse response) {
6057
return request.getProtocolVersion();

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHttpAttributesGetter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ final class ApacheHttpClientHttpAttributesGetter
2121
implements HttpClientAttributesGetter<HttpRequest, HttpResponse> {
2222

2323
@Override
24-
@Nullable
2524
public String getHttpRequestMethod(HttpRequest request) {
2625
return request.getMethod();
2726
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ enum ApacheHttpClientHttpAttributesGetter
2020
INSTANCE;
2121

2222
@Override
23-
@Nullable
2423
public String getHttpRequestMethod(ApacheHttpClientRequest request) {
2524
return request.getMethod();
2625
}

instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpClientAttributesGetter.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ protected Method computeValue(Class<?> type) {
3434
};
3535

3636
@Override
37-
@Nullable
3837
public String getHttpRequestMethod(ClientRequestContext ctx) {
3938
return ctx.method().name();
4039
}
@@ -84,13 +83,11 @@ public List<String> getHttpResponseHeader(
8483
}
8584

8685
@Override
87-
@Nullable
8886
public String getNetworkProtocolName(ClientRequestContext ctx, @Nullable RequestLog requestLog) {
8987
return "http";
9088
}
9189

9290
@Override
93-
@Nullable
9491
public String getNetworkProtocolVersion(
9592
ClientRequestContext ctx, @Nullable RequestLog requestLog) {
9693
SessionProtocol protocol =

0 commit comments

Comments
 (0)