Exporter/Stackdriver: Do create metric descriptor for custom metrics. (#1866)

* Exporter/Stackdriver: Do create metric descriptor for custom metrics.

* Fix Appveyor build failure.

* Use endWith instead of contains.

Author: songy23

exporters/stats/stackdriver/src/main/java/io/opencensus/exporter/stats/stackdriver/CreateMetricDescriptorExporter.java

@@ -44,7 +44,8 @@ final class CreateMetricDescriptorExporter extends MetricExporter {
   private static final Logger logger =
       Logger.getLogger(CreateMetricDescriptorExporter.class.getName());
   private static final ImmutableSet<String> SUPPORTED_EXTERNAL_DOMAINS =
-      ImmutableSet.<String>of("custom.googleapis.com/", "external.googleapis.com/");
+      ImmutableSet.<String>of("custom.googleapis.com", "external.googleapis.com");
+  private static final String GOOGLE_APIS_DOMAIN_SUFFIX = "googleapis.com";
 
   private final String projectId;
   private final ProjectName projectName;
@@ -92,7 +93,7 @@ private boolean registerMetricDescriptor(
       }
     }
     registeredMetricDescriptors.put(metricName, metricDescriptor);
-    if (!isSupportedExternalMetric(metricName)) {
+    if (isBuiltInMetric(metricName)) {
       return true; // skip creating metric descriptor for stackdriver built-in metrics.
     }
 
@@ -153,12 +154,17 @@ public void export(Collection<Metric> metrics) {
     nextExporter.export(registeredMetrics);
   }
 
-  private static boolean isSupportedExternalMetric(String metricName) {
-    for (String domain : SUPPORTED_EXTERNAL_DOMAINS) {
-      if (metricName.startsWith(domain)) {
-        return true;
-      }
+  private static boolean isBuiltInMetric(String metricName) {
+    int domainIndex = metricName.indexOf('/');
+    if (domainIndex < 0) {
+      return false;
+    }
+    String metricDomain = metricName.substring(0, domainIndex);
+    if (!metricDomain.endsWith(GOOGLE_APIS_DOMAIN_SUFFIX)) {
+      return false; // domains like "my.org" are not Stackdriver built-in metrics.
     }
-    return false;
+    // All googleapis.com domains except "custom.googleapis.com" or "external.googleapis.com"
+    // are built-in metrics.
+    return !SUPPORTED_EXTERNAL_DOMAINS.contains(metricDomain);
   }
 }

exporters/stats/stackdriver/src/test/java/io/opencensus/exporter/stats/stackdriver/CreateMetricDescriptorExporterTest.java

@@ -60,6 +60,7 @@ public class CreateMetricDescriptorExporterTest {
   private static final String METRIC_NAME = CUSTOM_OPENCENSUS_DOMAIN + "my_metric";
   private static final String METRIC_NAME_2 = CUSTOM_OPENCENSUS_DOMAIN + "my_metric_2";
   private static final String METRIC_NAME_3 = "bigquery.googleapis.com/query/count";
+  private static final String METRIC_NAME_CUSTOM_DOMAIN = "my.org/my_metric_3";
   private static final String METRIC_DESCRIPTION = "metric_description";
   private static final String METRIC_DESCRIPTION_2 = "metric_description2";
   private static final String METRIC_UNIT = "us";
@@ -86,6 +87,15 @@ public class CreateMetricDescriptorExporterTest {
       io.opencensus.metrics.export.MetricDescriptor.create(
           METRIC_NAME_3, METRIC_DESCRIPTION, METRIC_UNIT, Type.CUMULATIVE_INT64, LABEL_KEY);
 
+  // Metric with no domain.
+  private static final io.opencensus.metrics.export.MetricDescriptor METRIC_DESCRIPTOR_5 =
+      io.opencensus.metrics.export.MetricDescriptor.create(
+          METRIC_NAME_CUSTOM_DOMAIN,
+          METRIC_DESCRIPTION,
+          METRIC_UNIT,
+          Type.CUMULATIVE_INT64,
+          LABEL_KEY);
+
   private static final Value VALUE_LONG = Value.longValue(12345678);
   private static final Timestamp TIMESTAMP = Timestamp.fromMillis(3000);
   private static final Timestamp TIMESTAMP_2 = Timestamp.fromMillis(1000);
@@ -102,6 +112,8 @@ public class CreateMetricDescriptorExporterTest {
       Metric.createWithOneTimeSeries(METRIC_DESCRIPTOR_3, CUMULATIVE_TIME_SERIES);
   private static final Metric METRIC_4 =
       Metric.createWithOneTimeSeries(METRIC_DESCRIPTOR_4, CUMULATIVE_TIME_SERIES);
+  private static final Metric METRIC_5 =
+      Metric.createWithOneTimeSeries(METRIC_DESCRIPTOR_5, CUMULATIVE_TIME_SERIES);
 
   @Mock private MetricServiceStub mockStub;
 
@@ -165,6 +177,36 @@ public void export() {
     assertThat(fakeMetricExporter.getLastExported()).containsExactly(METRIC, METRIC_2);
   }
 
+  @Test
+  public void export_MetricNameWithCustomDomain() {
+    FakeMetricExporter fakeMetricExporter = new FakeMetricExporter();
+    CreateMetricDescriptorExporter exporter =
+        new CreateMetricDescriptorExporter(
+            PROJECT_ID,
+            new FakeMetricServiceClient(mockStub),
+            null,
+            DEFAULT_CONSTANT_LABELS,
+            fakeMetricExporter);
+    exporter.export(Arrays.asList(METRIC_5));
+
+    verify(mockStub, times(1)).createMetricDescriptorCallable();
+
+    MetricDescriptor descriptor =
+        StackdriverExportUtils.createMetricDescriptor(
+            METRIC_DESCRIPTOR_5,
+            PROJECT_ID,
+            CUSTOM_OPENCENSUS_DOMAIN,
+            DEFAULT_DISPLAY_NAME_PREFIX,
+            DEFAULT_CONSTANT_LABELS);
+    verify(mockCreateMetricDescriptorCallable, times(1))
+        .call(
+            eq(
+                CreateMetricDescriptorRequest.newBuilder()
+                    .setName("projects/" + PROJECT_ID)
+                    .setMetricDescriptor(descriptor)
+                    .build()));
+  }
+
   @Test
   public void doNotExportForEmptyMetrics() {
     FakeMetricExporter fakeMetricExporter = new FakeMetricExporter();

exporters/trace/stackdriver/src/test/java/io/opencensus/exporter/trace/stackdriver/StackdriverTraceConfigurationTest.java

@@ -98,14 +98,16 @@ public void allowToUseDefaultProjectId() {
 
   @Test
   public void disallowNullFixedAttributes() {
-    StackdriverTraceConfiguration.Builder builder = StackdriverTraceConfiguration.builder();
+    StackdriverTraceConfiguration.Builder builder =
+        StackdriverTraceConfiguration.builder().setProjectId("test");
     thrown.expect(NullPointerException.class);
     builder.setFixedAttributes(null);
   }
 
   @Test
   public void disallowNullFixedAttributeKey() {
-    StackdriverTraceConfiguration.Builder builder = StackdriverTraceConfiguration.builder();
+    StackdriverTraceConfiguration.Builder builder =
+        StackdriverTraceConfiguration.builder().setProjectId("test");
     Map<String, AttributeValue> attributes =
         Collections.singletonMap(null, AttributeValue.stringAttributeValue("val"));
     builder.setFixedAttributes(attributes);
@@ -115,7 +117,8 @@ public void disallowNullFixedAttributeKey() {
 
   @Test
   public void disallowNullFixedAttributeValue() {
-    StackdriverTraceConfiguration.Builder builder = StackdriverTraceConfiguration.builder();
+    StackdriverTraceConfiguration.Builder builder =
+        StackdriverTraceConfiguration.builder().setProjectId("test");
     Map<String, AttributeValue> attributes = Collections.singletonMap("key", null);
     builder.setFixedAttributes(attributes);
     thrown.expect(NullPointerException.class);