From 2e188fcdc21f2ee1de031a13d9566e47836cb07f Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 10 Apr 2026 12:54:20 -0400 Subject: [PATCH 1/2] fix(o11y): composite tracer to process url changes --- .../java/com/google/api/gax/tracing/CompositeTracer.java | 7 +++++++ .../com/google/api/gax/tracing/CompositeTracerTest.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/CompositeTracer.java b/sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/CompositeTracer.java index ca08c20c86b0..e4b28463d312 100644 --- a/sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/CompositeTracer.java +++ b/sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/CompositeTracer.java @@ -220,4 +220,11 @@ public void injectTraceContext(java.util.Map carrier) { child.injectTraceContext(carrier); } } + + @Override + public void requestUrlResolved(String requestUrl) { + for (ApiTracer child : children) { + child.requestUrlResolved(requestUrl); + } + } } diff --git a/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/CompositeTracerTest.java b/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/CompositeTracerTest.java index abb32e26181c..78536653344c 100644 --- a/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/CompositeTracerTest.java +++ b/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/CompositeTracerTest.java @@ -279,4 +279,11 @@ void testInjectTraceContext() { inOrder.verify(child1).injectTraceContext(carrier); inOrder.verify(child2).injectTraceContext(carrier); } + + @Test + void testRequestUrlResolved() { + compositeTracer.requestUrlResolved("the-url"); + verify(child1).requestUrlResolved("the-url"); + verify(child2).requestUrlResolved("the-url"); + } } From c1a29ba4962ff1905c9db409d83c088c9df1cad4 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 10 Apr 2026 13:01:02 -0400 Subject: [PATCH 2/2] test: verify in order --- .../java/com/google/api/gax/tracing/CompositeTracerTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/CompositeTracerTest.java b/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/CompositeTracerTest.java index 78536653344c..920eeba89ee2 100644 --- a/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/CompositeTracerTest.java +++ b/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/CompositeTracerTest.java @@ -283,7 +283,8 @@ void testInjectTraceContext() { @Test void testRequestUrlResolved() { compositeTracer.requestUrlResolved("the-url"); - verify(child1).requestUrlResolved("the-url"); - verify(child2).requestUrlResolved("the-url"); + InOrder inOrder = inOrder(child1, child2); + inOrder.verify(child1).requestUrlResolved("the-url"); + inOrder.verify(child2).requestUrlResolved("the-url"); } }