feat: Ensure SubscriberStreamingConnection and MessageDispatcher have…

… default no-op tracers by default for tests
googleapis · Sep 12, 2024 · d07b493 · d07b493
1 parent ca4680f
commit d07b493
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
@@ -106,7 +106,7 @@ class MessageDispatcher {
 
   private final String subscriptionName;
   private final boolean enableOpenTelemetryTracing;
-  private final PubsubTracer tracer;
+  private PubsubTracer tracer = new BasePubsubTracer();
 
   /** Internal representation of a reply to a Pubsub message, to be sent back to the service. */
   public enum AckReply {
@@ -227,7 +227,9 @@ private MessageDispatcher(Builder builder) {
 
     subscriptionName = builder.subscriptionName;
     enableOpenTelemetryTracing = builder.enableOpenTelemetryTracing;
-    tracer = builder.tracer;
+    if (builder.tracer != null) {
+      tracer = builder.tracer;
+    }
   }
 
   private boolean shouldSetMessageFuture() {

diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PubsubMessageWrapper.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PubsubMessageWrapper.java
@@ -17,7 +17,6 @@
 package com.google.cloud.pubsub.v1;
 
 import com.google.api.core.InternalApi;
-import com.google.common.base.Preconditions;
 import com.google.pubsub.v1.PubsubMessage;
 import com.google.pubsub.v1.SubscriptionName;
 import com.google.pubsub.v1.TopicName;
@@ -427,7 +426,6 @@ public Builder(
     }
 
     public PubsubMessageWrapper build() {
-      Preconditions.checkArgument(this.topicName != null || this.subscriptionName != null);
       return new PubsubMessageWrapper(this);
     }
   }

diff --git a/...-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java b/...-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java
@@ -120,7 +120,7 @@ final class StreamingSubscriberConnection extends AbstractApiService implements
   private final String clientId = UUID.randomUUID().toString();
 
   private final boolean enableOpenTelemetryTracing;
-  private final PubsubTracer tracer;
+  private PubsubTracer tracer = new BasePubsubTracer();
 
   private StreamingSubscriberConnection(Builder builder) {
     subscription = builder.subscription;
@@ -156,7 +156,9 @@ private StreamingSubscriberConnection(Builder builder) {
     }
 
     enableOpenTelemetryTracing = builder.enableOpenTelemetryTracing;
-    tracer = builder.tracer;
+    if (builder.tracer != null) {
+      tracer = builder.tracer;
+    }
 
     messageDispatcher =
         messageDispatcherBuilder