From 03430c786aa8556178236dfb5cf6cf41d24c6b18 Mon Sep 17 00:00:00 2001
From: DNVindhya <DNVindhya@users.noreply.github.com>
Date: Fri, 12 Aug 2022 12:20:43 -0700
Subject: [PATCH] remove unregistering stackdriver exporters (#9442)

---
 .../gcp/observability/GcpObservability.java   | 30 -------------------
 .../gcp/observability/logging/GcpLogSink.java |  1 +
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/gcp-observability/src/main/java/io/grpc/gcp/observability/GcpObservability.java b/gcp-observability/src/main/java/io/grpc/gcp/observability/GcpObservability.java
index 83601582ef..5337a933fe 100644
--- a/gcp-observability/src/main/java/io/grpc/gcp/observability/GcpObservability.java
+++ b/gcp-observability/src/main/java/io/grpc/gcp/observability/GcpObservability.java
@@ -50,14 +50,11 @@ import io.opencensus.trace.config.TraceConfig;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 /** The main class for gRPC Google Cloud Platform Observability features. */
 @ExperimentalApi("https://github.com/grpc/grpc-java/issues/8869")
 public final class GcpObservability implements AutoCloseable {
-  private static final Logger logger = Logger.getLogger(GcpObservability.class.getName());
   private static final int METRICS_EXPORT_INTERVAL = 30;
   private static final ImmutableSet<String> SERVICES_TO_EXCLUDE = ImmutableSet.of(
       "google.logging.v2.LoggingServiceV2", "google.monitoring.v3.MetricService",
@@ -68,8 +65,6 @@ public final class GcpObservability implements AutoCloseable {
   private final ArrayList<ClientInterceptor> clientInterceptors = new ArrayList<>();
   private final ArrayList<ServerInterceptor> serverInterceptors = new ArrayList<>();
   private final ArrayList<ServerStreamTracer.Factory> tracerFactories = new ArrayList<>();
-  private boolean metricsEnabled;
-  private boolean tracesEnabled;
 
   /**
    * Initialize grpc-observability.
@@ -115,7 +110,6 @@ public final class GcpObservability implements AutoCloseable {
       if (instance == null) {
         throw new IllegalStateException("GcpObservability already closed!");
       }
-      unRegisterStackDriverExporter();
       sink.close();
       instance = null;
     }
@@ -169,7 +163,6 @@ public final class GcpObservability implements AutoCloseable {
       }
       statsConfigurationBuilder.setExportInterval(Duration.create(METRICS_EXPORT_INTERVAL, 0));
       StackdriverStatsExporter.createAndRegister(statsConfigurationBuilder.build());
-      metricsEnabled = true;
     }
 
     if (config.isEnableCloudTracing()) {
@@ -188,29 +181,6 @@ public final class GcpObservability implements AutoCloseable {
         traceConfigurationBuilder.setFixedAttributes(fixedAttributes);
       }
       StackdriverTraceExporter.createAndRegister(traceConfigurationBuilder.build());
-      tracesEnabled = true;
-    }
-  }
-
-  private void unRegisterStackDriverExporter() {
-    if (metricsEnabled) {
-      try {
-        StackdriverStatsExporter.unregister();
-      } catch (IllegalStateException e) {
-        logger.log(
-            Level.SEVERE, "Failed to unregister Stackdriver stats exporter, " + e.getMessage());
-      }
-      metricsEnabled = false;
-    }
-
-    if (tracesEnabled) {
-      try {
-        StackdriverTraceExporter.unregister();
-      } catch (IllegalStateException e) {
-        logger.log(
-            Level.SEVERE, "Failed to unregister Stackdriver trace exporter, " + e.getMessage());
-      }
-      tracesEnabled = false;
     }
   }
 
diff --git a/gcp-observability/src/main/java/io/grpc/gcp/observability/logging/GcpLogSink.java b/gcp-observability/src/main/java/io/grpc/gcp/observability/logging/GcpLogSink.java
index 8275b1ec04..0209677aae 100644
--- a/gcp-observability/src/main/java/io/grpc/gcp/observability/logging/GcpLogSink.java
+++ b/gcp-observability/src/main/java/io/grpc/gcp/observability/logging/GcpLogSink.java
@@ -148,6 +148,7 @@ public class GcpLogSink implements Sink {
     ImmutableMap.Builder<String, String> tagsBuilder = ImmutableMap.builder();
     String sourceProjectId = locationTags.get("project_id");
     if (!Strings.isNullOrEmpty(destinationProjectId)
+        && !Strings.isNullOrEmpty(sourceProjectId)
         && !Objects.equals(sourceProjectId, destinationProjectId)) {
       tagsBuilder.put("source_project_id", sourceProjectId);
     }