Merge branch 'main' into docs-auth-impersonated-quota-project-12604

Author: lqiu96

.github/requirements.txt

@@ -108,7 +108,7 @@ requests==2.33.0 \
     --hash=sha256:3324635456fa185245e24865e810cecec7b4caf933d7eb133dcde67d48cee69b \
     --hash=sha256:c7ebc5e8b0f21837386ad0e1c8fe8b829fa5f544d8df3b2253bff14ef29d7652
     # via -r requirements.in
-urllib3==2.6.3 \
-    --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \
-    --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4
+urllib3==2.8.0 \
+    --hash=sha256:0cf3cae568d36aa9576b28dfb35f11328f1cb974ca7647d9475ebb86c75ac6e3 \
+    --hash=sha256:63bf2ead4c879426ebf22ef2a781eeb4aa3b4ae798a0435506f8687fd5bb9b63
     # via requests

sdk-platform-java/gax-java/gax-grpc/pom.xml

@@ -158,7 +158,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <!-- These tests require an Env Var to be set. Use -PenvVarTest to ONLY run these tests -->
-          <test>!InstantiatingGrpcChannelProviderTest#testLogDirectPathMisconfig_AttemptDirectPathNotSetAndAttemptDirectPathXdsSetViaEnv_warns,!InstantiatingGrpcChannelProviderTest#canUseDirectPath_directPathEnvVarNotSet_attemptDirectPathIsTrue,InstantiatingGrpcChannelProviderTest#testLogDirectPathMisconfigWrongCredential</test>
+          <test>!InstantiatingGrpcChannelProviderTest#testLogDirectPathMisconfig_AttemptDirectPathNotSetAndAttemptDirectPathXdsSetViaEnv_warns,!InstantiatingGrpcChannelProviderTest#canUseDirectPath_directPathEnvVarNotSet_attemptDirectPathIsTrue</test>
           <!-- <test>!InstantiatingGrpcChannelProviderTest#testLogDirectPathMisconfig_AttemptDirectPathNotSetAndAttemptDirectPathXdsSetViaEnv_warns</test> -->
         </configuration>
       </plugin>

sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcLoggingInterceptorTest.java

@@ -32,7 +32,6 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -83,7 +82,7 @@ void testInterceptor_basic() {
   void testInterceptor_responseListener() {
     when(channel.newCall(Mockito.<MethodDescriptor<String, Integer>>any(), any(CallOptions.class)))
         .thenReturn(call);
-    GrpcLoggingInterceptor interceptor = spy(new GrpcLoggingInterceptor());
+    GrpcLoggingInterceptor interceptor = new GrpcLoggingInterceptor();
     Channel intercepted = ClientInterceptors.intercept(channel, interceptor);
     @SuppressWarnings("unchecked")
     ClientCall.Listener<Integer> listener = mock(ClientCall.Listener.class);

sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java

@@ -710,6 +710,7 @@ void testLogDirectPathMisconfigWrongCredential() throws Exception {
         InstantiatingGrpcChannelProvider.newBuilder()
             .setAttemptDirectPathXds()
             .setAttemptDirectPath(true)
+            .setEnvProvider(name -> null)
             .setHeaderProvider(
                 mock(HeaderProvider.class, Mockito.withSettings().withoutAnnotations()))
             .setExecutor(mock(Executor.class))

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryTracingTracer.java

@@ -52,6 +52,10 @@ class OpenTelemetryTracingTracer implements ApiTracer {
   private final Map<String, Object> attemptAttributes;
   private final String attemptSpanName;
   private final ApiTracerContext apiTracerContext;
+  // Captures the active trace context from the calling thread at RPC initiation.
+  // This allows attempt spans—including retries dispatched on background threads—to
+  // link back to the original parent trace.
+  private final io.opentelemetry.context.Context parentContext;
   private @Nullable Span attemptSpan;
 
   @Override
@@ -82,6 +86,7 @@ public void injectTraceContext(java.util.Map<String, String> carrier) {
     this.apiTracerContext = apiTracerContext;
     this.attemptSpanName = resolveAttemptSpanName(apiTracerContext);
     this.attemptAttributes = new HashMap<>();
+    this.parentContext = io.opentelemetry.context.Context.current();
     buildAttributes();
   }
 
@@ -100,6 +105,7 @@ public void injectTraceContext(java.util.Map<String, String> carrier) {
     this.attemptSpanName = attemptSpanName;
     this.apiTracerContext = apiTracerContext;
     this.attemptAttributes = new HashMap<>();
+    this.parentContext = io.opentelemetry.context.Context.current();
     buildAttributes();
   }
 
@@ -142,12 +148,47 @@ public void attemptStarted(Object request, int attemptNumber) {
     // Attempt spans are of the CLIENT kind
     spanBuilder.setSpanKind(SpanKind.CLIENT);
 
+    // Link attempt span to parent context
+    spanBuilder.setParent(parentContext);
+
     // Pass the combined attributes to the new SpanBuilder method
     spanBuilder.setAllAttributes(ObservabilityUtils.toOtelAttributes(currentAttemptAttributes));
 
     this.attemptSpan = spanBuilder.startSpan();
   }
 
+  /**
+   * Signals that the overall logical operation succeeded.
+   *
+   * <p>Closes any remaining in-flight attempt span.
+   */
+  @Override
+  public void operationSucceeded() {
+    recordErrorAndEndAttempt(null);
+  }
+
+  /**
+   * Signals that the overall logical operation was cancelled.
+   *
+   * <p>Closes any remaining in-flight attempt span with a {@link CancellationException}.
+   */
+  @Override
+  public void operationCancelled() {
+    recordErrorAndEndAttempt(new CancellationException());
+  }
+
+  /**
+   * Signals that the overall logical operation failed permanently.
+   *
+   * <p>Closes any remaining in-flight attempt span with the provided error details.
+   *
+   * @param error the cause of the operation failure
+   */
+  @Override
+  public void operationFailed(Throwable error) {
+    recordErrorAndEndAttempt(error);
+  }
+
   @Override
   public void attemptSucceeded() {
     recordErrorAndEndAttempt(null);
@@ -215,10 +256,16 @@ public void attemptPermanentFailure(Throwable error) {
     recordErrorAndEndAttempt(error);
   }
 
+  /**
+   * Records error details and ends the current attempt span.
+   *
+   * @param error the exception associated with the attempt failure, or {@code null} if successful
+   */
   private void recordErrorAndEndAttempt(@Nullable Throwable error) {
     if (attemptSpan == null) {
       return;
     }
+
     Map<String, Object> responseAttributes =
         ObservabilityUtils.getResponseAttributes(error, this.apiTracerContext.transport());
     if (!responseAttributes.isEmpty()) {
@@ -230,14 +277,6 @@ private void recordErrorAndEndAttempt(@Nullable Throwable error) {
           ObservabilityAttributes.STATUS_MESSAGE_ATTRIBUTE, error.getMessage());
     }
 
-    endAttempt();
-  }
-
-  private void endAttempt() {
-    if (attemptSpan == null) {
-      return;
-    }
-
     attemptSpan.end();
     attemptSpan = null;
   }

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/OpenTelemetryTracingTracerFactoryTest.java

@@ -75,6 +75,7 @@ void setUp() {
     when(openTelemetry.getTracer(anyString())).thenReturn(tracer);
     when(tracer.spanBuilder(anyString())).thenReturn(spanBuilder);
     when(spanBuilder.setSpanKind(any())).thenReturn(spanBuilder);
+    when(spanBuilder.setParent(any())).thenReturn(spanBuilder);
     when(spanBuilder.setAllAttributes(any(Attributes.class))).thenReturn(spanBuilder);
     when(spanBuilder.startSpan()).thenReturn(span);
 

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/OpenTelemetryTracingTracerTest.java

@@ -33,6 +33,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -69,10 +70,11 @@ class OpenTelemetryTracingTracerTest {
 
   @BeforeEach
   void setUp() {
-    when(tracer.spanBuilder(anyString())).thenReturn(spanBuilder);
-    when(spanBuilder.setSpanKind(any(SpanKind.class))).thenReturn(spanBuilder);
-    when(spanBuilder.setAllAttributes(any(Attributes.class))).thenReturn(spanBuilder);
-    when(spanBuilder.startSpan()).thenReturn(span);
+    lenient().when(tracer.spanBuilder(anyString())).thenReturn(spanBuilder);
+    lenient().when(spanBuilder.setSpanKind(any(SpanKind.class))).thenReturn(spanBuilder);
+    lenient().when(spanBuilder.setParent(any())).thenReturn(spanBuilder);
+    lenient().when(spanBuilder.setAllAttributes(any(Attributes.class))).thenReturn(spanBuilder);
+    lenient().when(spanBuilder.startSpan()).thenReturn(span);
     openTelemetryTracingTracer =
         new OpenTelemetryTracingTracer(tracer, ApiTracerContext.empty(), ATTEMPT_SPAN_NAME);
   }
@@ -680,4 +682,42 @@ void testInjectTraceContext_addsHeaders() {
     assertThat(carrier.get("traceparent")).contains("00000000000000000000000000000001");
     assertThat(carrier.get("traceparent")).contains("0000000000000002");
   }
+
+  @Test
+  void testAttemptStarted_setsParentToParentContext() {
+    openTelemetryTracingTracer.attemptStarted(new Object(), 1);
+    verify(spanBuilder).setParent(any(io.opentelemetry.context.Context.class));
+  }
+
+  @Test
+  void testOperationSucceeded_endsActiveAttemptSpan() {
+    openTelemetryTracingTracer.attemptStarted(new Object(), 1);
+    openTelemetryTracingTracer.operationSucceeded();
+
+    verify(span).end();
+  }
+
+  @Test
+  void testOperationFailed_endsActiveAttemptSpanWithErrorAttributes() {
+    openTelemetryTracingTracer.attemptStarted(new Object(), 1);
+    openTelemetryTracingTracer.operationFailed(new RuntimeException("operation failed"));
+
+    verify(span).setAttribute(ObservabilityAttributes.STATUS_MESSAGE_ATTRIBUTE, "operation failed");
+    verify(span).end();
+  }
+
+  @Test
+  void testOperationCancelled_endsActiveAttemptSpanWithCancellation() {
+    openTelemetryTracingTracer.attemptStarted(new Object(), 1);
+    openTelemetryTracingTracer.operationCancelled();
+
+    ArgumentCaptor<Attributes> attrsCaptor = ArgumentCaptor.forClass(Attributes.class);
+    verify(span).setAllAttributes(attrsCaptor.capture());
+    verify(span).end();
+
+    assertThat(attrsCaptor.getValue().asMap())
+        .containsEntry(
+            AttributeKey.stringKey(ObservabilityAttributes.RPC_RESPONSE_STATUS_ATTRIBUTE),
+            "CANCELLED");
+  }
 }