chore: Address PR feedback

Author: lqiu96

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DatastoreCloudMonitoringExporter.java

@@ -108,8 +108,10 @@ static class CachedMetricsClient {
   // Flag to prevent log spam of any export failures
   private final AtomicBoolean datastoreExportFailureLogged = new AtomicBoolean(false);
 
+  // Flag to prevent double shutdown of this exporter instance
+  private final AtomicBoolean isExporterShutDown = new AtomicBoolean(false);
+
   private final String projectId;
-  private final String databaseId;
 
   /**
    * Creates a new instance of the exporter.
@@ -163,7 +165,7 @@ static DatastoreCloudMonitoringExporter create(
     }
 
     return new DatastoreCloudMonitoringExporter(
-        key, projectId, databaseId, cachedMetricsClient.client, clientAttributes);
+        key, projectId, cachedMetricsClient.client, clientAttributes);
   }
 
   private static MetricServiceClient createMetricServiceClient(Credentials credentials)
@@ -189,13 +191,11 @@ private static MetricServiceClient createMetricServiceClient(Credentials credent
   DatastoreCloudMonitoringExporter(
       String cacheKey,
       String projectId,
-      String databaseId,
       MetricServiceClient client,
       Map<String, String> clientAttributes) {
     this.cacheKey = cacheKey;
     this.client = client;
     this.projectId = projectId;
-    this.databaseId = databaseId;
     this.clientAttributes = clientAttributes;
   }
 
@@ -207,7 +207,7 @@ private static MetricServiceClient createMetricServiceClient(Credentials credent
    */
   @Override
   public CompletableResultCode export(@Nonnull Collection<MetricData> collection) {
-    if (client.isShutdown()) {
+    if (isExporterShutDown.get()) {
       logger.log(Level.WARNING, "Exporter is shut down");
       return CompletableResultCode.ofFailure();
     }
@@ -305,7 +305,7 @@ public CompletableResultCode flush() {
   /** Shuts down the exporter and the underlying {@link MetricServiceClient}. */
   @Override
   public CompletableResultCode shutdown() {
-    if (client.isShutdown()) {
+    if (!isExporterShutDown.compareAndSet(false, true)) {
       logger.log(Level.WARNING, "shutdown is called multiple times");
       return CompletableResultCode.ofSuccess();
     }

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DatastoreCloudMonitoringExporterUtils.java

@@ -23,7 +23,6 @@
 import static com.google.api.MetricDescriptor.ValueType.DOUBLE;
 import static com.google.api.MetricDescriptor.ValueType.INT64;
 import static com.google.cloud.datastore.telemetry.TelemetryConstants.DATASTORE_RESOURCE_TYPE;
-import static com.google.cloud.datastore.telemetry.TelemetryConstants.PROJECT_ID_KEY;
 
 import com.google.api.Distribution;
 import com.google.api.Distribution.BucketOptions;
@@ -48,7 +47,6 @@
 import io.opentelemetry.sdk.metrics.data.MetricDataType;
 import io.opentelemetry.sdk.metrics.data.PointData;
 import io.opentelemetry.sdk.metrics.data.SumData;
-import io.opentelemetry.sdk.resources.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -72,16 +70,6 @@ class DatastoreCloudMonitoringExporterUtils {
 
   private DatastoreCloudMonitoringExporterUtils() {}
 
-  /**
-   * Extracts the project ID from the OpenTelemetry {@link Resource}.
-   *
-   * @param resource the OTel resource.
-   * @return the project ID string, or null if not present.
-   */
-  static String getProjectId(Resource resource) {
-    return resource.getAttributes().get(PROJECT_ID_KEY);
-  }
-
   /**
    * Converts a list of {@link MetricData} to Cloud Monitoring {@link TimeSeries}.
    *

java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DatastoreCloudMonitoringExporterTest.java

@@ -83,11 +83,7 @@ public void setUp() {
 
     exporter =
         new DatastoreCloudMonitoringExporter(
-            PROJECT_ID + ":" + DATABASE_ID,
-            PROJECT_ID,
-            DATABASE_ID,
-            fakeMetricServiceClient,
-            clientAttributes);
+            PROJECT_ID + ":" + DATABASE_ID, PROJECT_ID, fakeMetricServiceClient, clientAttributes);
 
     attributes =
         Attributes.builder()
@@ -173,17 +169,15 @@ public void testClientCacheReferenceCounting() {
     DatastoreCloudMonitoringExporter.METRICS_CLIENT_CACHE.put(key, cachedMetricsClient);
 
     DatastoreCloudMonitoringExporter exporter1 =
-        new DatastoreCloudMonitoringExporter(
-            key, PROJECT_ID, DATABASE_ID, mockClient, Collections.emptyMap());
+        new DatastoreCloudMonitoringExporter(key, PROJECT_ID, mockClient, Collections.emptyMap());
 
     // First shutdown should decrement refCount to 1, but not close client
     exporter1.shutdown();
     assertThat(cachedMetricsClient.refCount.get()).isEqualTo(1);
     assertThat(DatastoreCloudMonitoringExporter.METRICS_CLIENT_CACHE.containsKey(key)).isTrue();
 
     DatastoreCloudMonitoringExporter exporter2 =
-        new DatastoreCloudMonitoringExporter(
-            key, PROJECT_ID, DATABASE_ID, mockClient, Collections.emptyMap());
+        new DatastoreCloudMonitoringExporter(key, PROJECT_ID, mockClient, Collections.emptyMap());
 
     // Second shutdown should decrement refCount to 0, close client, and remove from cache
     exporter2.shutdown();