added exemplar support in exporter

Author: surbhigarg92

google-cloud-spanner/src/main/java/com/google/cloud/spanner/BuiltInMetricsProvider.java

@@ -77,31 +77,10 @@ OpenTelemetry getOrCreateOpenTelemetry(
     try {
       if (this.openTelemetry == null) {
         SdkMeterProviderBuilder sdkMeterProviderBuilder = SdkMeterProvider.builder();
-        // BuiltInMetricsView.registerBuiltinMetrics(
-        //     SpannerCloudMonitoringExporter.create(projectId, credentials, monitoringHost),
-        //     sdkMeterProviderBuilder);
-
-        // Use GoogleCloudMetricExporter with service time series as the current custom exporter
-        // does not export exemplars
-        // GoogleCloudMetricExporter expect to pass the resource labels at the time of creating
-        // exporter. Hence we need to hardcode instance_id here.
-        MonitoredResourceDescription monitoredResourceDescription =
-            new MonitoredResourceDescription(
-                SPANNER_RESOURCE_TYPE,
-                ImmutableSet.of(
-                    "project_id", "instance_id", "location", "instance_config", "client_hash"));
-
-        MetricExporter metricExporter =
-            GoogleCloudMetricExporter.createWithConfiguration(
-                MetricConfiguration.builder()
-                    .setProjectId(projectId)
-                    .setMonitoredResourceDescription(monitoredResourceDescription)
-                    .setInstrumentationLibraryLabelsEnabled(false)
-                    .setMetricServiceEndpoint("monitoring.googleapis.com:443")
-                    .setPrefix("spanner.googleapis.com/internal/client")
-                    .setUseServiceTimeSeries(true)
-                    .build());
-        BuiltInMetricsView.registerBuiltinMetrics(metricExporter, sdkMeterProviderBuilder);
+        BuiltInMetricsView.registerBuiltinMetrics(
+            SpannerCloudMonitoringExporter.create(projectId, credentials, monitoringHost),
+            sdkMeterProviderBuilder);
+
         sdkMeterProviderBuilder.setResource(Resource.create(createResourceAttributes(projectId)));
         SdkMeterProvider sdkMeterProvider = sdkMeterProviderBuilder.build();
 
@@ -150,8 +129,7 @@ Attributes createResourceAttributes(String projectId) {
             .put(INSTANCE_CONFIG_ID_KEY.getKey(), "unknown")
             .put(CLIENT_HASH_KEY.getKey(), generateClientHash(getDefaultTaskValue()))
             .put(INSTANCE_ID_KEY.getKey(), "unknown")
-            .put(LOCATION_ID_KEY.getKey(), detectClientLocation())
-            .put("gcp.resource_type", SPANNER_RESOURCE_TYPE);
+            .put(LOCATION_ID_KEY.getKey(), detectClientLocation());
 
     return attributesBuilder.build();
   }

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerCloudMonitoringExporterUtils.java

@@ -22,6 +22,11 @@
 import static com.google.api.MetricDescriptor.ValueType.DISTRIBUTION;
 import static com.google.api.MetricDescriptor.ValueType.DOUBLE;
 import static com.google.api.MetricDescriptor.ValueType.INT64;
+
+import com.google.monitoring.v3.DroppedLabels;
+import com.google.monitoring.v3.SpanContext;
+import com.google.protobuf.Any;
+import com.google.protobuf.Timestamp;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.GAX_METER_NAME;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.GRPC_METER_NAME;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.PROJECT_ID_KEY;
@@ -103,8 +108,7 @@ static List<TimeSeries> convertToSpannerTimeSeries(
       metricData.getData().getPoints().stream()
           .map(
               pointData ->
-                  convertPointToSpannerTimeSeries(
-                      metricData, pointData, monitoredResourceBuilder, projectId))
+                  convertPointToSpannerTimeSeries(metricData, pointData, monitoredResourceBuilder))
           .forEach(allTimeSeries::add);
     }
     return allTimeSeries;
@@ -113,8 +117,7 @@ static List<TimeSeries> convertToSpannerTimeSeries(
   private static TimeSeries convertPointToSpannerTimeSeries(
       MetricData metricData,
       PointData pointData,
-      MonitoredResource.Builder monitoredResourceBuilder,
-      String projectId) {
+      MonitoredResource.Builder monitoredResourceBuilder) {
     TimeSeries.Builder builder =
         TimeSeries.newBuilder()
             .setMetricKind(convertMetricKind(metricData))
@@ -210,8 +213,7 @@ private static Point createPoint(
         return builder
             .setValue(
                 TypedValue.newBuilder()
-                    .setDistributionValue(
-                        convertHistogramData((HistogramPointData) pointData, projectId))
+                    .setDistributionValue(convertHistogramData((HistogramPointData) pointData))
                     .build())
             .build();
       case DOUBLE_GAUGE:
@@ -241,49 +243,6 @@ private static Distribution convertHistogramData(HistogramPointData pointData, S
             BucketOptions.newBuilder()
                 .setExplicitBuckets(Explicit.newBuilder().addAllBounds(pointData.getBoundaries())))
         .addAllBucketCounts(pointData.getCounts())
-        .addAllExemplars(
-            pointData.getExemplars().stream()
-                .map(e -> mapExemplar(e, projectId))
-                .collect(Collectors.toList()))
-        .build();
-  }
-
-  private static Distribution.Exemplar mapExemplar(ExemplarData exemplar, String projectId) {
-    double value = 0;
-    if (exemplar instanceof DoubleExemplarData) {
-      value = ((DoubleExemplarData) exemplar).getValue();
-    } else if (exemplar instanceof LongExemplarData) {
-      value = ((LongExemplarData) exemplar).getValue();
-    }
-
-    Distribution.Exemplar.Builder exemplarBuilder =
-        Distribution.Exemplar.newBuilder()
-            .setValue(value)
-            .setTimestamp(mapTimestamp(exemplar.getEpochNanos()));
-    if (exemplar.getSpanContext().isValid()) {
-      exemplarBuilder.addAttachments(
-          Any.pack(
-              SpanContext.newBuilder()
-                  .setSpanName(
-                      makeSpanName(
-                          projectId,
-                          exemplar.getSpanContext().getTraceId(),
-                          exemplar.getSpanContext().getSpanId()))
-                  .build()));
-    }
-    if (!exemplar.getFilteredAttributes().isEmpty()) {
-      exemplarBuilder.addAttachments(
-          Any.pack(mapFilteredAttributes(exemplar.getFilteredAttributes())));
-    }
-    return exemplarBuilder.build();
-  }
-
-  static final long NANO_PER_SECOND = (long) 1e9;
-
-  private static Timestamp mapTimestamp(long epochNanos) {
-    return Timestamp.newBuilder()
-        .setSeconds(epochNanos / NANO_PER_SECOND)
-        .setNanos((int) (epochNanos % NANO_PER_SECOND))
         .build();
   }