Merge branch 'main' into mut-cred-example

Author: ldetmer

.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml

@@ -69,9 +69,8 @@ jobs:
 
       # Set up local showcase server to run the showcase ITs
       - name: Parse showcase version
-        working-directory: sdk-plaform-java/java-showcase/gapic-showcase
+        working-directory: sdk-platform-java/java-showcase/gapic-showcase
         run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV"
-        working-directory: sdk-platform-java
       - name: Install showcase server
         run: |
           sudo mkdir -p /usr/src/showcase

.github/workflows/sdk-platform-java-downstream_protobuf_compatibility_check_nightly.yaml

@@ -30,12 +30,11 @@ jobs:
             - 'sdk-platform-java/**'
   downstream-protobuf-test:
     needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
     # This job runs if any of the three conditions match:
     # 1. PR is raised from Release-Please (PR comes from branch: release-please--branches-main)
     # 2. Job is invoked by the nightly job (scheduled event)
     # 3. Job is manually invoked via Github UI (workflow_dispatch event)
-    if: github.head_ref == 'release-please--branches--main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+    if: needs.filter.outputs.library == 'true' && (github.head_ref == 'release-please--branches--main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false

.github/workflows/sdk-platform-java-shared_dependencies.yaml

@@ -25,10 +25,9 @@ jobs:
             - 'sdk-platform-java/**'
   upper-bound-check:
     needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    if: needs.filter.outputs.library == 'true' && github.repository_owner == 'googleapis'
     name: Shared Dependencies BOM upper-bound check
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'googleapis'
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4

.github/workflows/sdk-platform-java-sonar.yaml

@@ -22,9 +22,8 @@ jobs:
             - 'sdk-platform-java/**'
   build:
     needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    if: needs.filter.outputs.library == 'true' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request')
     name: Build
-    if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request'
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3

.github/workflows/sdk-platform-java-verify_library_generation.yaml

@@ -55,11 +55,9 @@ jobs:
         head_repo_name: ${{ github.event.pull_request.head.repo.full_name  }}
         base_repo: ${{ github.repository }}
   library-generation-unit-tests:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    needs: [filter, should-run-library-generation-tests]
+    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
-    needs: should-run-library-generation-tests
-    if: needs.should-run-library-generation-tests.outputs.should_run == 'true'
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
@@ -85,11 +83,9 @@ jobs:
         set -x
         python -m unittest discover -s hermetic_build -p "*unit_tests.py"
   library-generation-lint-shell:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    needs: [filter, should-run-library-generation-tests]
+    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
-    needs: should-run-library-generation-tests
-    if: needs.should-run-library-generation-tests.outputs.should_run == 'true'
     steps:
     - uses: actions/checkout@v4
     - name: Run ShellCheck
@@ -101,11 +97,9 @@ jobs:
         ignore_paths: 
           .kokoro
   library-generation-lint-python:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    needs: [filter, should-run-library-generation-tests]
+    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
-    needs: should-run-library-generation-tests
-    if: needs.should-run-library-generation-tests.outputs.should_run == 'true'
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializer.java

@@ -23,6 +23,8 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
+import io.opentelemetry.context.Context;
 import java.io.IOException;
 
 /**
@@ -76,6 +78,10 @@ public void initialize(HttpRequest request) throws IOException {
       // No active span to exists, skip instrumentation
       return;
     }
+    // propagate the W3C Trace Context (traceID and spanID) from the active span in headers
+    W3CTraceContextPropagator.getInstance()
+        .inject(Context.current(), request.getHeaders(), HttpHeaders::set);
+
     addInitialHttpAttributesToSpan(span, request);
 
     HttpResponseInterceptor originalInterceptor = request.getResponseInterceptor();

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializerTest.java

@@ -145,6 +145,23 @@ public void testNoSpanIsCreatedIfNoActiveSpan() throws IOException {
     verify(delegateInitializer, times(1)).initialize(any(HttpRequest.class));
   }
 
+  @Test
+  public void testTraceContextIsPropagatedInHeaders() throws IOException {
+    HttpTransport transport = createTransport();
+    HttpRequest request = buildGetRequest(transport, initializer, BASE_URL);
+
+    HttpResponse response = request.execute();
+    response.disconnect();
+
+    assertEquals(
+        String.format(
+            "00-%s-%s-%s",
+            parentSpan.getSpanContext().getTraceId(),
+            parentSpan.getSpanContext().getSpanId(),
+            parentSpan.getSpanContext().getTraceFlags().asHex()),
+        request.getHeaders().get("traceparent"));
+  }
+
   @Test
   public void testDelegateInitializerIsCalled() throws IOException {
     HttpRequestInitializer delegateInitializer = mock(HttpRequestInitializer.class);

sdk-platform-java/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpRequestRunnable.java

@@ -44,6 +44,7 @@
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.util.GenericData;
+import com.google.api.gax.tracing.ApiTracer;
 import com.google.auth.Credentials;
 import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.auto.value.AutoValue;
@@ -188,6 +189,11 @@ HttpRequest createHttpRequest() throws IOException {
       }
     }
 
+    ApiTracer tracer = httpJsonCallOptions.getTracer();
+    if (tracer != null) {
+      tracer.requestUrlResolved(url.build());
+    }
+
     HttpRequest httpRequest = buildRequest(requestFactory, url, jsonHttpContent);
 
     for (Map.Entry<String, Object> entry : headers.getHeaders().entrySet()) {

sdk-platform-java/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpRequestRunnableTest.java

@@ -32,6 +32,7 @@
 import com.google.api.client.http.EmptyContent;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.testing.http.MockHttpTransport;
+import com.google.api.gax.tracing.ApiTracer;
 import com.google.common.truth.Truth;
 import com.google.longrunning.ListOperationsRequest;
 import com.google.protobuf.Empty;
@@ -123,6 +124,32 @@ void testRequestUrl() throws IOException {
     Truth.assertThat(httpRequest.getUrl().toString()).isEqualTo(expectedUrl);
   }
 
+  @Test
+  void testApiTracerRequestUrlResolved() throws IOException {
+    ApiTracer tracer = Mockito.mock(ApiTracer.class);
+    ApiMethodDescriptor<Field, Empty> methodDescriptor =
+        ApiMethodDescriptor.<Field, Empty>newBuilder()
+            .setFullMethodName("house.cat.get")
+            .setHttpMethod(null)
+            .setRequestFormatter(requestFormatter)
+            .setResponseParser(responseParser)
+            .build();
+
+    HttpRequestRunnable<Field, Empty> httpRequestRunnable =
+        new HttpRequestRunnable<>(
+            requestMessage,
+            methodDescriptor,
+            ENDPOINT,
+            HttpJsonCallOptions.newBuilder().setTracer(tracer).build(),
+            new MockHttpTransport(),
+            HttpJsonMetadata.newBuilder().build(),
+            (result) -> {});
+
+    httpRequestRunnable.createHttpRequest();
+    String expectedUrl = ENDPOINT + "/name/feline" + "?food=bird&food=mouse&size=small";
+    Mockito.verify(tracer).requestUrlResolved(expectedUrl);
+  }
+
   @Test
   void testRequestUrlUnnormalized() throws IOException {
     ApiMethodDescriptor<Field, Empty> methodDescriptor =

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

@@ -139,7 +139,7 @@
         <configuration>
           <argLine>@{argLine} -Djava.util.logging.SimpleFormatter.format="%1$tY %1$tl:%1$tM:%1$tS.%1$tL %2$s %4$s: %5$s%6$s%n"</argLine>
           <!-- These tests require an Env Var to be set. Use -PenvVarTest to ONLY run these tests -->
-          <test>!EndpointContextTest#endpointContextBuild_universeDomainEnvVarSet+endpointContextBuild_multipleUniverseDomainConfigurations_clientSettingsHasPriority,!LoggingEnabledTest</test>
+          <test>!EndpointContextTest#endpointContextBuild_universeDomainEnvVarSet+endpointContextBuild_multipleUniverseDomainConfigurations_clientSettingsHasPriority,!LoggingEnabledTest,!LoggingTracerTest</test>
         </configuration>
       </plugin>
     </plugins>
@@ -154,7 +154,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <test>EndpointContextTest#endpointContextBuild_universeDomainEnvVarSet+endpointContextBuild_multipleUniverseDomainConfigurations_clientSettingsHasPriority,LoggingEnabledTest</test>
+              <test>EndpointContextTest#endpointContextBuild_universeDomainEnvVarSet+endpointContextBuild_multipleUniverseDomainConfigurations_clientSettingsHasPriority,LoggingEnabledTest,LoggingTracerTest</test>
             </configuration>
           </plugin>
         </plugins>