logging: log more kubernetes properties (#2937)

pongad · web-flow · commit 6c773d28a641 · 2018-02-23T11:42:49.000+11:00
Updates #2912.
diff --git a/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
@@ -54,7 +54,7 @@ public static String getInstanceId() {
   }
 
   public static String getClusterName() {
-    return getAttribute("instance/cluster-name");
+    return getAttribute("instance/attributes/cluster-name");
   }
 
   private static String getAttribute(String attributeName) {
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
@@ -21,8 +21,7 @@
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.logging.LogEntry.Builder;
 import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
-
+import com.google.common.collect.ImmutableMultimap;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -42,6 +41,7 @@ private enum Label {
     InstanceId("instance_id"),
     InstanceName("instance_name"),
     ModuleId("module_id"),
+    PodId("pod_id"),
     ProjectId("project_id"),
     VersionId("version_id"),
     Zone("zone");
@@ -77,25 +77,18 @@ String getKey() {
 
   private static final String APPENGINE_LABEL_PREFIX = "appengine.googleapis.com/";
 
-  private static Map<String, Label[]> resourceTypeWithLabels;
-
-  static {
-    resourceTypeWithLabels =
-        new ImmutableMap.Builder<String, Label[]>()
-            .put(
-                Resource.GaeAppFlex.getKey(),
-                new Label[] {
-                    Label.ModuleId,
-                    Label.VersionId,
-                    Label.Zone
-                })
-            .put(
-                Resource.GaeAppStandard.getKey(),
-                new Label[] {Label.ModuleId, Label.VersionId})
-            .put(Resource.Container.getKey(), new Label[] {Label.ClusterName, Label.Zone})
-            .put(Resource.GceInstance.getKey(), new Label[] {Label.InstanceId, Label.Zone})
-            .build();
-  }
+  private static ImmutableMultimap<String, Label> resourceTypeWithLabels =
+      ImmutableMultimap.<String, Label>builder()
+          .putAll(Resource.GaeAppFlex.getKey(), Label.ModuleId, Label.VersionId, Label.Zone)
+          .putAll(Resource.GaeAppStandard.getKey(), Label.ModuleId, Label.VersionId)
+          .putAll(
+              Resource.Container.getKey(),
+              Label.ClusterName,
+              Label.InstanceId,
+              Label.PodId,
+              Label.Zone)
+          .putAll(Resource.GceInstance.getKey(), Label.InstanceId, Label.Zone)
+          .build();
 
   private MonitoredResourceUtil() {
   }
@@ -113,13 +106,11 @@ public static MonitoredResource getResource(String projectId, String resourceTyp
     String resourceName = resourceType.startsWith("gae_app") ? "gae_app" : resourceType;
     MonitoredResource.Builder builder =
         MonitoredResource.newBuilder(resourceName).addLabel(Label.ProjectId.getKey(), projectId);
-    Label[] resourceLabels = resourceTypeWithLabels.get(resourceType);
-    if (resourceLabels != null) {
-      for (Label label : resourceLabels) {
-        String value = getValue(label);
-        if (value != null) {
-          builder.addLabel(label.getKey(), value);
-        }
+
+    for (Label label : resourceTypeWithLabels.get(resourceType)) {
+      String value = getValue(label);
+      if (value != null) {
+        builder.addLabel(label.getKey(), value);
       }
     }
     return builder.build();
@@ -153,6 +144,9 @@ private static String getValue(Label label) {
       case ModuleId:
         value = getAppEngineModuleId();
         break;
+      case PodId:
+        value = System.getenv("HOSTNAME");
+        break;
       case VersionId:
         value = getAppEngineVersionId();
         break;

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static String getInstanceId() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public static String getClusterName() {`
`57`		`- return getAttribute("instance/cluster-name");`
	`57`	`+ return getAttribute("instance/attributes/cluster-name");`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`private static String getAttribute(String attributeName) {`