Remove extra space from kubernetes client span name (#8540)

open-telemetry · May 22, 2023 · bc870ba · bc870ba
1 parent e6183dc
commit bc870ba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.../io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesRequestDigest.java b/.../io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesRequestDigest.java
@@ -106,7 +106,14 @@ public String toString() {
       targetResourceName = resourceMeta.getResource() + "/" + resourceMeta.getSubResource();
     }
 
-    return verb.value() + ' ' + groupVersion + ' ' + targetResourceName;
+    StringBuilder result = new StringBuilder(verb.value());
+    if (!groupVersion.isEmpty()) {
+      result.append(" ").append(groupVersion);
+    }
+    if (!targetResourceName.isEmpty()) {
+      result.append(" ").append(targetResourceName);
+    }
+    return result.toString();
   }
 
   private static boolean isNullOrEmpty(String s) {

diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/test/groovy/KubernetesClientTest.groovy b/instrumentation/kubernetes-client-7.0/javaagent/src/test/groovy/KubernetesClientTest.groovy
@@ -68,7 +68,7 @@ class KubernetesClientTest extends AgentInstrumentationSpecification {
           kind SpanKind.INTERNAL
           hasNoParent()
         }
-        apiClientSpan(it, 1, "get  pods/proxy", "${server.httpUri()}/api/v1/namespaces/namespace/pods/name/proxy?path=path", 200)
+        apiClientSpan(it, 1, "get pods/proxy", "${server.httpUri()}/api/v1/namespaces/namespace/pods/name/proxy?path=path", 200)
       }
     }
   }
@@ -95,7 +95,7 @@ class KubernetesClientTest extends AgentInstrumentationSpecification {
           status ERROR
           errorEvent(exception.class, exception.message)
         }
-        apiClientSpan(it, 1, "get  pods/proxy", "${server.httpUri()}/api/v1/namespaces/namespace/pods/name/proxy?path=path", 451, exception)
+        apiClientSpan(it, 1, "get pods/proxy", "${server.httpUri()}/api/v1/namespaces/namespace/pods/name/proxy?path=path", 451, exception)
       }
     }
   }
@@ -131,7 +131,7 @@ class KubernetesClientTest extends AgentInstrumentationSpecification {
           kind SpanKind.INTERNAL
           hasNoParent()
         }
-        apiClientSpan(it, 1, "get  pods/proxy", "${server.httpUri()}/api/v1/namespaces/namespace/pods/name/proxy?path=path", 200)
+        apiClientSpan(it, 1, "get pods/proxy", "${server.httpUri()}/api/v1/namespaces/namespace/pods/name/proxy?path=path", 200)
         span(2) {
           name "callback"
           kind SpanKind.INTERNAL
@@ -172,7 +172,7 @@ class KubernetesClientTest extends AgentInstrumentationSpecification {
           kind SpanKind.INTERNAL
           hasNoParent()
         }
-        apiClientSpan(it, 1, "get  pods/proxy", "${server.httpUri()}/api/v1/namespaces/namespace/pods/name/proxy?path=path", 451, exception.get())
+        apiClientSpan(it, 1, "get pods/proxy", "${server.httpUri()}/api/v1/namespaces/namespace/pods/name/proxy?path=path", 451, exception.get())
         span(2) {
           name "callback"
           kind SpanKind.INTERNAL