open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update network.protocol.version 2.0 -> 2 and 3.0 -> 3 (#9145)

This commit is contained in:
Trask Stalnaker 2023-08-13 10:01:47 -07:00 committed by GitHub
parent ecb61fbf87
commit 67f91b8833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientRequest.java
View File

@ -77,6 +77,9 @@ public final class ApacheHttpClientRequest {
String getProtocolVersion() {
ProtocolVersion protocolVersion = delegate.getProtocolVersion();
if (protocolVersion.getMinor() == 0) {
return Integer.toString(protocolVersion.getMajor());
}
return protocolVersion.getMajor() + "." + protocolVersion.getMinor();
}

3
instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientRequest.java
View File

@ -81,6 +81,9 @@ public final class ApacheHttpClientRequest {
String getProtocolVersion() {
ProtocolVersion protocolVersion = delegate.getProtocolVersion();
if (protocolVersion.getMinor() == 0) {
return Integer.toString(protocolVersion.getMajor());
}
return protocolVersion.getMajor() + "." + protocolVersion.getMinor();
}

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

@ -108,6 +108,9 @@ final class ApacheHttpClientHttpAttributesGetter
if (protocolVersion == null) {
return null;
}
if (protocolVersion.getMinor() == 0) {
return Integer.toString(protocolVersion.getMajor());
}
return protocolVersion.getMajor() + "." + protocolVersion.getMinor();
}

2
instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java
View File

@ -86,7 +86,7 @@ enum ArmeriaHttpServerAttributesGetter
@Override
public String getNetworkProtocolVersion(RequestContext ctx, @Nullable RequestLog requestLog) {
SessionProtocol protocol = ctx.sessionProtocol();
return protocol.isMultiplex() ? "2.0" : "1.1";
return protocol.isMultiplex() ? "2" : "1.1";
}
@Nullable

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

@ -74,7 +74,7 @@ public enum ArmeriaHttpClientAttributesGetter
@Override
public String getNetworkProtocolVersion(RequestContext ctx, @Nullable RequestLog requestLog) {
SessionProtocol protocol = ctx.sessionProtocol();
return protocol.isMultiplex() ? "2.0" : "1.1";
return protocol.isMultiplex() ? "2" : "1.1";
}
@Nullable

3
instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientHttpAttributesGetter.java
View File

@ -61,6 +61,9 @@ final class AsyncHttpClientHttpAttributesGetter
if (httpVersion == null) {
return null;
}
if (httpVersion.minorVersion() == 0) {
return Integer.toString(httpVersion.majorVersion());
}
return httpVersion.majorVersion() + "." + httpVersion.minorVersion();
}

3
instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkHttpAttributesGetter.java
View File

@ -64,6 +64,9 @@ class AwsSdkHttpAttributesGetter implements HttpClientAttributesGetter<Request<?
if (protocolVersion == null) {
return null;
}
if (protocolVersion.getMinor() == 0) {
return Integer.toString(protocolVersion.getMajor());
}
return protocolVersion.getMajor() + "." + protocolVersion.getMinor();
}

2
instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/internal/JavaHttpClientAttributesGetter.java
View File

@ -69,7 +69,7 @@ public enum JavaHttpClientAttributesGetter
case HTTP_1_1:
return "1.1";
case HTTP_2:
return "2.0";
return "2";
}
return null;
}

5
instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorHttpClientAttributesGetter.kt
View File

@ -6,7 +6,7 @@
package io.opentelemetry.instrumentation.ktor.v2_0.client
import io.ktor.client.request.*
import io.ktor.client.statement.HttpResponse
import io.ktor.client.statement.*
import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesGetter
internal object KtorHttpClientAttributesGetter : HttpClientAttributesGetter<HttpRequestData, HttpResponse> {
@ -31,6 +31,9 @@ internal object KtorHttpClientAttributesGetter : HttpClientAttributesGetter<Http
override fun getNetworkProtocolVersion(request: HttpRequestData?, response: HttpResponse?): String? {
val version = response?.version ?: return null
if (version.minor == 0) {
return "${version.major}"
}
return "${version.major}.${version.minor}"
}

3
instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java
View File

@ -90,6 +90,9 @@ final class NettyHttpClientAttributesGetter
public String getNetworkProtocolVersion(
HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse httpResponse) {
HttpVersion version = requestAndChannel.request().getProtocolVersion();
if (version.getMinorVersion() == 0) {
return Integer.toString(version.getMajorVersion());
}
return version.getMajorVersion() + "." + version.getMinorVersion();
}

3
instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java
View File

@ -85,6 +85,9 @@ final class NettyHttpServerAttributesGetter
public String getNetworkProtocolVersion(
HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) {
HttpVersion version = requestAndChannel.request().getProtocolVersion();
if (version.getMinorVersion() == 0) {
return Integer.toString(version.getMajorVersion());
}
return version.getMajorVersion() + "." + version.getMinorVersion();
}

3
instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyHttpClientAttributesGetter.java
View File

@ -90,6 +90,9 @@ final class NettyHttpClientAttributesGetter
public String getNetworkProtocolVersion(
HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) {
HttpVersion version = requestAndChannel.request().getProtocolVersion();
if (version.minorVersion() == 0) {
return Integer.toString(version.majorVersion());
}
return version.majorVersion() + "." + version.minorVersion();
}

3
instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/server/NettyHttpServerAttributesGetter.java
View File

@ -85,6 +85,9 @@ final class NettyHttpServerAttributesGetter
public String getNetworkProtocolVersion(
HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) {
HttpVersion version = requestAndChannel.request().getProtocolVersion();
if (version.minorVersion() == 0) {
return Integer.toString(version.majorVersion());
}
return version.majorVersion() + "." + version.minorVersion();
}

2
instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2HttpAttributesGetter.java
View File

@ -68,7 +68,7 @@ final class OkHttp2HttpAttributesGetter implements HttpClientAttributesGetter<Re
case HTTP_1_1:
return "1.1";
case HTTP_2:
return "2.0";
return "2";
case SPDY_3:
return "3.1";
}

2
instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/internal/OkHttpAttributesGetter.java
View File

@ -73,7 +73,7 @@ public enum OkHttpAttributesGetter implements HttpClientAttributesGetter<Request
case HTTP_1_1:
return "1.1";
case HTTP_2:
return "2.0";
return "2";
case SPDY_3:
return "3.1";
}

3
instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java
View File

@ -63,6 +63,9 @@ final class ReactorNettyHttpClientAttributesGetter
return null;
}
HttpVersion version = response.version();
if (version.minorVersion() == 0) {
return Integer.toString(version.majorVersion());
}
return version.majorVersion() + "." + version.minorVersion();
}

2
instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4HttpAttributesGetter.java
View File

@ -52,7 +52,7 @@ final class Vertx4HttpAttributesGetter extends AbstractVertxHttpAttributesGetter
case HTTP_1_1:
return "1.1";
case HTTP_2:
return "2.0";
return "2";
}
return null;
}