---

Praful Makani · chingor13 · commit 98c54cb59976 · 2018-11-28T11:26:38.000-08:00
yaml --- r: 12005 b: refs/heads/autosynth-containeranalysis c: f5c0394 h: refs/heads/master i: 12003: 33e38f5
diff --git a/[refs] b/[refs]
@@ -128,7 +128,7 @@ refs/heads/autosynth-bigquerydatatransfer: 2a9f3938237f85a8919602d74011326580ff3
 refs/heads/autosynth-bigquerystorage: 99aee05df348f39d98b6fb23c292006f1d2a6c28
 refs/heads/autosynth-bigtable: cd831a28dff2ba4d733608b871a1523a463e7380
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
-refs/heads/autosynth-containeranalysis: cafd7474e37951bcfaf4d81fa9727a6ce74455ce
+refs/heads/autosynth-containeranalysis: f5c03944b5628d53edfcd65b504deacc6fe002a9
 refs/heads/autosynth-datastore: 02c91de76764225070df7e64314c25b865cf7af8
 refs/heads/autosynth-dialogflow: c6bde02c8a8e063a32f9eaf63b2b9fe5e4895d8a
 refs/heads/autosynth-errorreporting: 518a442405c822492ed1c139e89e3e3d1804e29c
diff --git a/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/branches/autosynth-containeranalysis/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/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/branches/autosynth-containeranalysis/google-cloud-clients/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;
