Update network.protocol.version 2.0 -> 2 and 3.0 -> 3

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

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

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

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

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

@@ -108,6 +108,9 @@ public String getNetworkProtocolVersion(HttpRequest request, @Nullable HttpRespo
     if (protocolVersion == null) {
       return null;
     }
+    if (protocolVersion.getMinor() == 0) {
+      return Integer.toString(protocolVersion.getMajor());
+    }
     return protocolVersion.getMajor() + "." + protocolVersion.getMinor();
   }
 

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

@@ -86,7 +86,7 @@ public String getNetworkProtocolName(RequestContext ctx, @Nullable RequestLog re
   @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

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

@@ -74,7 +74,7 @@ public String getNetworkProtocolName(RequestContext ctx, @Nullable RequestLog re
   @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

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

@@ -61,6 +61,9 @@ public String getNetworkProtocolVersion(RequestContext request, @Nullable Respon
     if (httpVersion == null) {
       return null;
     }
+    if (httpVersion.minorVersion() == 0) {
+      return Integer.toString(httpVersion.majorVersion());
+    }
     return httpVersion.majorVersion() + "." + httpVersion.minorVersion();
   }
 

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

@@ -64,6 +64,9 @@ public String getNetworkProtocolVersion(Request<?> request, @Nullable Response<?
     if (protocolVersion == null) {
       return null;
     }
+    if (protocolVersion.getMinor() == 0) {
+      return Integer.toString(protocolVersion.getMajor());
+    }
     return protocolVersion.getMajor() + "." + protocolVersion.getMinor();
   }
 

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

@@ -69,7 +69,7 @@ public String getNetworkProtocolVersion(HttpRequest request, @Nullable HttpRespo
       case HTTP_1_1:
         return "1.1";
       case HTTP_2:
-        return "2.0";
+        return "2";
     }
     return null;
   }

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

@@ -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}"
   }
 

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

@@ -90,6 +90,9 @@ public String getNetworkProtocolName(
   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();
   }
 

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

@@ -85,6 +85,9 @@ public String getNetworkProtocolName(
   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();
   }
 

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

@@ -90,6 +90,9 @@ public String getNetworkProtocolName(
   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();
   }
 

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

@@ -85,6 +85,9 @@ public String getNetworkProtocolName(
   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();
   }
 

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

@@ -68,7 +68,7 @@ public String getNetworkProtocolVersion(Request request, @Nullable Response resp
       case HTTP_1_1:
         return "1.1";
       case HTTP_2:
-        return "2.0";
+        return "2";
       case SPDY_3:
         return "3.1";
     }

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

@@ -73,7 +73,7 @@ public String getNetworkProtocolVersion(Request request, @Nullable Response resp
       case HTTP_1_1:
         return "1.1";
       case HTTP_2:
-        return "2.0";
+        return "2";
       case SPDY_3:
         return "3.1";
     }

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

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

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

@@ -52,7 +52,7 @@ public String getNetworkProtocolVersion(
       case HTTP_1_1:
         return "1.1";
       case HTTP_2:
-        return "2.0";
+        return "2";
     }
     return null;
   }