From fda3a2d6ffb773a13e206399348a3cc3a3f26055 Mon Sep 17 00:00:00 2001
From: sanjaypujare <sanjaypujare@users.noreply.github.com>
Date: Fri, 1 Apr 2022 10:11:54 -0700
Subject: [PATCH] gcp-observability: trim the string to remove newline for
 hostname and namespace name from files (#9043)

---
 .../java/io/grpc/gcp/observability/GlobalLoggingTags.java     | 4 ++--
 .../java/io/grpc/gcp/observability/GlobalLoggingTagsTest.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcp-observability/src/main/java/io/grpc/gcp/observability/GlobalLoggingTags.java b/gcp-observability/src/main/java/io/grpc/gcp/observability/GlobalLoggingTags.java
index b0d2395fc5..b51f237f62 100644
--- a/gcp-observability/src/main/java/io/grpc/gcp/observability/GlobalLoggingTags.java
+++ b/gcp-observability/src/main/java/io/grpc/gcp/observability/GlobalLoggingTags.java
@@ -71,10 +71,10 @@ final class GlobalLoggingTags {
       String hostnameFile, String cgroupFile) {
     // namespace name: contents of file /var/run/secrets/kubernetes.io/serviceaccount/namespace
     populateFromFileContents(customTags, "namespace_name",
-        namespaceFile, (value) -> value);
+        namespaceFile, (value) -> value.trim());
 
     // pod_name: hostname i.e. contents of /etc/hostname
-    populateFromFileContents(customTags, "pod_name", hostnameFile, (value) -> value);
+    populateFromFileContents(customTags, "pod_name", hostnameFile, (value) -> value.trim());
 
     // container_id: parsed from /proc/self/cgroup . Note: only works for Linux-based containers
     populateFromFileContents(customTags, "container_id", cgroupFile,
diff --git a/gcp-observability/src/test/java/io/grpc/gcp/observability/GlobalLoggingTagsTest.java b/gcp-observability/src/test/java/io/grpc/gcp/observability/GlobalLoggingTagsTest.java
index 46d85638cc..9ce40d1580 100644
--- a/gcp-observability/src/test/java/io/grpc/gcp/observability/GlobalLoggingTagsTest.java
+++ b/gcp-observability/src/test/java/io/grpc/gcp/observability/GlobalLoggingTagsTest.java
@@ -89,7 +89,7 @@ public class GlobalLoggingTagsTest {
     File cgroupFile = cgroupFolder.newFile();
 
     Files.write("test-namespace1".getBytes(StandardCharsets.UTF_8), namespaceFile);
-    Files.write("test-hostname2".getBytes(StandardCharsets.UTF_8), hostnameFile);
+    Files.write("test-hostname2\n".getBytes(StandardCharsets.UTF_8), hostnameFile);
     Files.write(FILE_CONTENTS.getBytes(StandardCharsets.UTF_8), cgroupFile);
 
     ImmutableMap.Builder<String, String> customTags = ImmutableMap.builder();