---

Praful Makani · chingor13 · commit bce291c9f110 · 2018-11-28T11:26:38.000-08:00
yaml --- r: 11699 b: refs/heads/autosynth-pubsub c: f5c0394 h: refs/heads/master i: 11697: 3ee181e 11695: 49cb14c
diff --git a/[refs] b/[refs]
@@ -116,7 +116,7 @@ refs/heads/autosynth-compute: fa508ebab5b6a1db14949441c8de868cefbcf1a6
 refs/heads/autosynth-container: d0346e84b1f26e3dc10444450a998f357a43bcef
 refs/heads/autosynth-dataproc: c0f21dd811166848a60f810565a5614bb9c7f47e
 refs/heads/autosynth-monitoring: 28bf7ca67c0aab4815884e5d6253aaa8aa3baa1c
-refs/heads/autosynth-pubsub: cafd7474e37951bcfaf4d81fa9727a6ce74455ce
+refs/heads/autosynth-pubsub: f5c03944b5628d53edfcd65b504deacc6fe002a9
 refs/heads/autosynth-video-intelligence: 06fb1841ae847f4ef79a62ba995efbabc213edf8
 refs/heads/autosynth-vision: 6bece1ee6c1c41d5822c72bf0d6a82484166b402
 refs/heads/spanner: 54a5e197bfe0a004e13c190427f46c3413ab572d
diff --git a/branches/autosynth-pubsub/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/branches/autosynth-pubsub/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-pubsub/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/branches/autosynth-pubsub/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;
