---

Praful Makani · chingor13 · commit a5179f0eda59 · 2018-11-28T11:26:38.000-08:00
yaml --- r: 11947 b: refs/heads/autosynth-bigtable c: f5c0394 h: refs/heads/master i: 11945: 3f5f3c9 11943: 1311468
diff --git a/[refs] b/[refs]
@@ -126,7 +126,7 @@ refs/heads/autosynth-asset: af3772eb76acbfc401f7c3f9310f09f2b0e17602
 refs/heads/autosynth-automl: 8c05f2af9d8bcf10536f8255093c2484bfe9243c
 refs/heads/autosynth-bigquerydatatransfer: 2a9f3938237f85a8919602d74011326580ff387f
 refs/heads/autosynth-bigquerystorage: 99aee05df348f39d98b6fb23c292006f1d2a6c28
-refs/heads/autosynth-bigtable: cafd7474e37951bcfaf4d81fa9727a6ce74455ce
+refs/heads/autosynth-bigtable: f5c03944b5628d53edfcd65b504deacc6fe002a9
 refs/heads/autosynth-bigtable-admin: 3cd9cc8e61a8a8e02cbdfc4a1c1adb95e4103555
 refs/heads/autosynth-containeranalysis: 963746c85ab8171d519059a6be1b74015e453bbf
 refs/heads/autosynth-datastore: 02c91de76764225070df7e64314c25b865cf7af8
diff --git a/branches/autosynth-bigtable/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/branches/autosynth-bigtable/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-bigtable/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/branches/autosynth-bigtable/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;
