added missing fields googleapis#3559

pmakani · Oct 31, 2018 · 478d7ce · 478d7ce
1 parent 5e0bca4
commit 478d7ce
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
@@ -57,6 +57,14 @@ public static String getClusterName() {
     return getAttribute("instance/attributes/cluster-name");
   }
 
+  public static String getContainerName(){
+	return getAttribute("instance/attributes/container-name");
+  }
+
+  public static String getNamespaceId(){
+	return getAttribute("instance/attributes/namespace-id");  
+  }
+
   public static String getAttribute(String attributeName) {
     try {
       URL url = new URL(METADATA_URL + attributeName);

diff --git a/...ts/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/...ts/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
@@ -38,9 +38,11 @@ public class MonitoredResourceUtil {
   private enum Label {
     AppId("app_id"),
     ClusterName("cluster_name"),
+    ContainerName("container_name"), 
     InstanceId("instance_id"),
     InstanceName("instance_name"),
     ModuleId("module_id"),
+    NamespaceId("namespace_id"),
     PodId("pod_id"),
     ProjectId("project_id"),
     VersionId("version_id"),
@@ -84,7 +86,9 @@ String getKey() {
           .putAll(
               Resource.Container.getKey(),
               Label.ClusterName,
+              Label.ContainerName,
               Label.InstanceId,
+              Label.NamespaceId,
               Label.PodId,
               Label.Zone)
           .putAll(Resource.GceInstance.getKey(), Label.InstanceId, Label.Zone)
@@ -135,6 +139,9 @@ private static String getValue(Label label) {
       case ClusterName:
         value = MetadataConfig.getClusterName();
         break;
+      case ContainerName:
+    	value = MetadataConfig.getContainerName();
+    	break;  
       case InstanceId:
         value = MetadataConfig.getInstanceId();
         break;
@@ -144,6 +151,9 @@ private static String getValue(Label label) {
       case ModuleId:
         value = getAppEngineModuleId();
         break;
+      case NamespaceId:
+    	value = MetadataConfig.getNamespaceId();
+    	break;
       case PodId:
         value = System.getenv("HOSTNAME");
         break;