remove logs

Author: surbhigarg92

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

@@ -30,7 +30,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @InternalApi
 public class BuiltInMetricsConstant {
@@ -54,18 +53,6 @@ public class BuiltInMetricsConstant {
           "grpc.xds_client.server_failure",
           "grpc.xds_client.resource_updates_invalid");
 
-  public static final Set<String> SPANNER_METRICS =
-      Stream.concat(
-              Stream.of(
-                  OPERATION_LATENCIES_NAME,
-                  ATTEMPT_LATENCIES_NAME,
-                  OPERATION_COUNT_NAME,
-                  ATTEMPT_COUNT_NAME,
-                  GFE_LATENCIES_NAME),
-              GRPC_METRICS_TO_ENABLE.stream())
-          .map(m -> METER_NAME + '/' + m)
-          .collect(Collectors.toSet());
-
   public static final String SPANNER_RESOURCE_TYPE = "spanner_instance_client";
 
   public static final AttributeKey<String> PROJECT_ID_KEY = AttributeKey.stringKey("project_id");

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

@@ -103,25 +103,6 @@ static SpannerCloudMonitoringExporter create(
 
   @Override
   public CompletableResultCode export(@Nonnull Collection<MetricData> collection) {
-    // TODO: Remove
-    collection.stream()
-        .filter(md -> "grpc-java".equals(md.getInstrumentationScopeInfo().getName()))
-        .forEach(
-            md -> {
-              System.out.println("Name: " + md.getName()); // Print the name
-
-              md.getData()
-                  .getPoints()
-                  .forEach(
-                      point -> {
-                        System.out.println(
-                            "Attributes: "
-                                + point.getAttributes()); // Print attributes for each point
-                      });
-
-              System.out.println("----------------------"); // Separator for readability
-            });
-
     if (client.isShutdown()) {
       logger.log(Level.WARNING, "Exporter is shut down");
       return CompletableResultCode.ofFailure();
@@ -133,10 +114,7 @@ public CompletableResultCode export(@Nonnull Collection<MetricData> collection)
   /** Export client built in metrics */
   private CompletableResultCode exportSpannerClientMetrics(Collection<MetricData> collection) {
     // Filter spanner metrics. Only include metrics that contain a project and instance ID.
-    List<MetricData> spannerMetricData =
-        collection.stream()
-            // .filter(md -> SPANNER_METRICS.contains(md.getName()))
-            .collect(Collectors.toList());
+    List<MetricData> spannerMetricData = collection.stream().collect(Collectors.toList());
 
     // Log warnings for metrics that will be skipped.
     boolean mustFilter = false;

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

@@ -78,13 +78,11 @@ static List<TimeSeries> convertToSpannerTimeSeries(List<MetricData> collection)
     List<TimeSeries> allTimeSeries = new ArrayList<>();
 
     for (MetricData metricData : collection) {
-      // Get metrics data from GAX library and Spanner library
+      // Get metrics data from GAX library, GRPC library and Spanner library
       if (!(metricData.getInstrumentationScopeInfo().getName().equals(GAX_METER_NAME)
           || metricData.getInstrumentationScopeInfo().getName().equals(SPANNER_METER_NAME)
           || metricData.getInstrumentationScopeInfo().getName().equals(GRPC_METER_NAME))) {
         // Filter out metric data for instruments that are not part of the spanner metrics list
-        System.out.println(
-            "Skipped some data" + metricData.getInstrumentationScopeInfo().getName().toString());
         continue;
       }
 
@@ -115,7 +113,6 @@ private static TimeSeries convertPointToSpannerTimeSeries(
         TimeSeries.newBuilder()
             .setMetricKind(convertMetricKind(metricData))
             .setValueType(convertValueType(metricData.getType()));
-    System.out.println("convertPointToSpannerTimeSeries Metric name " + metricData.getName());
     Metric.Builder metricBuilder = Metric.newBuilder().setType(metricData.getName());
 
     Attributes attributes = pointData.getAttributes();
@@ -124,11 +121,14 @@ private static TimeSeries convertPointToSpannerTimeSeries(
       if (SPANNER_PROMOTED_RESOURCE_LABELS.contains(key)) {
         monitoredResourceBuilder.putLabels(key.getKey(), String.valueOf(attributes.get(key)));
       } else {
+        // Replace metric label names by converting "." to "_" since Cloud Monitoring does not
+        // support labels containing "."
         metricBuilder.putLabels(
             key.getKey().replace(".", "_"), String.valueOf(attributes.get(key)));
       }
     }
 
+    // Add common labels like "client_name" and "client_uid" for all the exported metrics.
     metricBuilder.putAllLabels(BuiltInMetricsProvider.INSTANCE.createClientAttributes());
 
     builder.setResource(monitoredResourceBuilder.build());