Merge pull request #531 from alex268/master

Move discovery and attachStream outside of the client context

Author: alex268

core/src/main/java/tech/ydb/core/impl/YdbDiscovery.java

@@ -11,6 +11,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
+import io.grpc.Context;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -147,6 +148,9 @@ private void tick() {
     private void runDiscovery() {
         lastUpdateTime = handler.instant();
         try {
+            // Execute discovery call outside current context to avoid span propogation
+            Context ctx = Context.ROOT.fork();
+            Context previous = ctx.attach();
             final GrpcTransport transport = handler.createDiscoveryTransport();
             try {
                 logger.debug("execute list endpoints on {} with timeout {}", transport, discoveryTimeout);
@@ -168,6 +172,8 @@ private void runDiscovery() {
             } catch (Throwable th) {
                 transport.close();
                 throw th;
+            } finally {
+                ctx.detach(previous);
             }
         } catch (Throwable th) {
             handleDiscoveryResult(null, th);

query/src/main/java/tech/ydb/query/impl/QueryServiceRpc.java

@@ -2,6 +2,8 @@
 
 import java.util.concurrent.CompletableFuture;
 
+import io.grpc.Context;
+
 import tech.ydb.core.Result;
 import tech.ydb.core.grpc.GrpcReadStream;
 import tech.ydb.core.grpc.GrpcRequestSettings;
@@ -68,7 +70,14 @@ public CompletableFuture<Result<YdbQuery.DeleteSessionResponse>> deleteSession(
 
     public GrpcReadStream<YdbQuery.SessionState> attachSession(
             YdbQuery.AttachSessionRequest request, GrpcRequestSettings settings) {
-        return transport.readStreamCall(QueryServiceGrpc.getAttachSessionMethod(), settings, request);
+        // Execute attachSession call outside current context to avoid span propogation
+        Context ctx = Context.ROOT.fork();
+        Context previous = ctx.attach();
+        try {
+            return transport.readStreamCall(QueryServiceGrpc.getAttachSessionMethod(), settings, request);
+        } finally {
+            ctx.detach(previous);
+        }
     }
 
     public CompletableFuture<Result<YdbQuery.BeginTransactionResponse>> beginTransaction(