Monitored Resource: replace gke_container with k8s_container in SD exporter (#1467)

* Monitored Resource: replace gke_container with k8s_container in SD exporter

* remove instance_id from trace k8s_container

* Add CHANGELOG

4 files changed, 14 insertions, 20 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be1ad8be..4e4d3af9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@
 - Add an API `Functions.returnToString()`.
 - Add `opencensus-contrib-opencensus-proto-util` that has helper utilities to convert between
   Java data models and protos.
+- Migrate to new Stackdriver Kubernetes monitored resource. This could be a breaking change
+  if you are using `gke_container` resources. For more info,
+  https://cloud.google.com/monitoring/kubernetes-engine/migration#incompatible
 
 ## 0.16.1 - 2018-09-18
 - Fix ClassCastException in Log4j log correlation
diff --git a/exporters/stats/stackdriver/src/main/java/io/opencensus/exporter/stats/stackdriver/StackdriverExportUtils.java b/exporters/stats/stackdriver/src/main/java/io/opencensus/exporter/stats/stackdriver/StackdriverExportUtils.java
index 93f287c6..4f8715b0 100644
--- a/exporters/stats/stackdriver/src/main/java/io/opencensus/exporter/stats/stackdriver/StackdriverExportUtils.java
+++ b/exporters/stats/stackdriver/src/main/java/io/opencensus/exporter/stats/stackdriver/StackdriverExportUtils.java
@@ -81,7 +81,7 @@ final class StackdriverExportUtils {
   @VisibleForTesting static final String LABEL_DESCRIPTION = "OpenCensus TagKey";
   @VisibleForTesting static final String OPENCENSUS_TASK = "opencensus_task";
   @VisibleForTesting static final String OPENCENSUS_TASK_DESCRIPTION = "Opencensus task identifier";
-  private static final String GCP_GKE_CONTAINER = "gke_container";
+  private static final String GCP_GKE_CONTAINER = "k8s_container";
   private static final String GCP_GCE_INSTANCE = "gce_instance";
   private static final String AWS_EC2_INSTANCE = "aws_ec2_instance";
   private static final String GLOBAL = "global";
@@ -499,10 +499,9 @@ final class StackdriverExportUtils {
         builder.putLabels(PROJECT_ID_LABEL_KEY, gcpGkeContainerMonitoredResource.getAccount());
         builder.putLabels("cluster_name", gcpGkeContainerMonitoredResource.getClusterName());
         builder.putLabels("container_name", gcpGkeContainerMonitoredResource.getContainerName());
-        builder.putLabels("namespace_id", gcpGkeContainerMonitoredResource.getNamespaceId());
-        builder.putLabels("instance_id", gcpGkeContainerMonitoredResource.getInstanceId());
-        builder.putLabels("pod_id", gcpGkeContainerMonitoredResource.getPodId());
-        builder.putLabels("zone", gcpGkeContainerMonitoredResource.getZone());
+        builder.putLabels("namespace_name", gcpGkeContainerMonitoredResource.getNamespaceId());
+        builder.putLabels("pod_name", gcpGkeContainerMonitoredResource.getPodId());
+        builder.putLabels("location", gcpGkeContainerMonitoredResource.getZone());
         return;
       case AWS_EC2_INSTANCE:
         AwsEc2InstanceMonitoredResource awsEc2InstanceMonitoredResource =
diff --git a/exporters/trace/stackdriver/src/main/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandler.java b/exporters/trace/stackdriver/src/main/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandler.java
index 9237ded5..de022c3f 100644
--- a/exporters/trace/stackdriver/src/main/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandler.java
+++ b/exporters/trace/stackdriver/src/main/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandler.java
@@ -343,12 +343,7 @@ final class StackdriverV2ExporterHandler extends SpanExporter.Handler {
             "project_id",
             gcpGkeContainerMonitoredResource.getAccount());
         putToResourceAttributeMap(
-            resourceLabels,
-            resourceType,
-            "instance_id",
-            gcpGkeContainerMonitoredResource.getInstanceId());
-        putToResourceAttributeMap(
-            resourceLabels, resourceType, "zone", gcpGkeContainerMonitoredResource.getZone());
+            resourceLabels, resourceType, "location", gcpGkeContainerMonitoredResource.getZone());
         putToResourceAttributeMap(
             resourceLabels,
             resourceType,
@@ -362,10 +357,10 @@ final class StackdriverV2ExporterHandler extends SpanExporter.Handler {
         putToResourceAttributeMap(
             resourceLabels,
             resourceType,
-            "namespace_id",
+            "namespace_name",
             gcpGkeContainerMonitoredResource.getNamespaceId());
         putToResourceAttributeMap(
-            resourceLabels, resourceType, "pod_id", gcpGkeContainerMonitoredResource.getPodId());
+            resourceLabels, resourceType, "pod_name", gcpGkeContainerMonitoredResource.getPodId());
         return Collections.unmodifiableMap(resourceLabels);
     }
     return Collections.emptyMap();
@@ -391,7 +386,7 @@ final class StackdriverV2ExporterHandler extends SpanExporter.Handler {
       case GCP_GCE_INSTANCE:
         return "gce_instance";
       case GCP_GKE_CONTAINER:
-        return "gke_container";
+        return "k8s_container";
       case AWS_EC2_INSTANCE:
         return "aws_ec2_instance";
     }
diff --git a/exporters/trace/stackdriver/src/test/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandlerProtoTest.java b/exporters/trace/stackdriver/src/test/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandlerProtoTest.java
index bb0ba072..8b28dc06 100644
--- a/exporters/trace/stackdriver/src/test/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandlerProtoTest.java
+++ b/exporters/trace/stackdriver/src/test/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandlerProtoTest.java
@@ -166,16 +166,13 @@ public final class StackdriverV2ExporterHandlerProtoTest {
               createResourceLabelKey(GCP_GKE_CONTAINER, "container_name"),
               toStringAttributeValueProto("container"))
           .put(
-              createResourceLabelKey(GCP_GKE_CONTAINER, "namespace_id"),
+              createResourceLabelKey(GCP_GKE_CONTAINER, "namespace_name"),
               toStringAttributeValueProto("namespace"))
           .put(
-              createResourceLabelKey(GCP_GKE_CONTAINER, "instance_id"),
-              toStringAttributeValueProto("my-instance"))
-          .put(
-              createResourceLabelKey(GCP_GKE_CONTAINER, "pod_id"),
+              createResourceLabelKey(GCP_GKE_CONTAINER, "pod_name"),
               toStringAttributeValueProto("pod"))
           .put(
-              createResourceLabelKey(GCP_GKE_CONTAINER, "zone"),
+              createResourceLabelKey(GCP_GKE_CONTAINER, "location"),
               toStringAttributeValueProto("us-east1"))
           .build();