Merge branch 'main' into vendor-grpc-gcp

Author: rahul2393

.github/CODEOWNERS

@@ -11,6 +11,6 @@
 /java-bigquery/ @googleapis/bigquery-team @googleapis/cloud-sdk-java-team
 /java-spanner/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
 /java-spanner-jdbc/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
-/google-auth-library-java/ @googleapis/cloud-sdk-auth-team @googleapis/cloud-sdk-java-team
+/google-auth-library-java/ @googleapis/cloud-sdk-auth-team @googleapis/cloud-sdk-java-team @googleapis/aion-team
 /java-storage/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team
 /java-storage-nio/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team

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

@@ -184,6 +184,7 @@ jobs:
         with:
           java-version: 17
           distribution: temurin
+      - name: Compile with Java 17 and run tests with Java 8
         shell: bash
         run: |
           set -x

java-spanner/benchmarks/pom.xml

@@ -60,7 +60,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-monitoring</artifactId>
-      <version>3.90.0</version><!-- {x-version-update:google-cloud-monitoring:current} -->
+      <version>3.89.0</version><!-- {x-version-update:google-cloud-monitoring:current} -->
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>

java-spanner/google-cloud-spanner/pom.xml

@@ -310,7 +310,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-monitoring</artifactId>
-      <version>3.90.0</version><!-- {x-version-update:google-cloud-monitoring:current} -->
+      <version>3.89.0</version><!-- {x-version-update:google-cloud-monitoring:current} -->
       <!-- Version will be managed by guava -->
       <exclusions>
         <exclusion>
@@ -322,7 +322,7 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-monitoring-v3</artifactId>
-      <version>3.90.0</version><!-- {x-version-update:proto-google-cloud-monitoring-v3:current} -->
+      <version>3.89.0</version><!-- {x-version-update:proto-google-cloud-monitoring-v3:current} -->
       <!-- Version will be managed by guava -->
       <exclusions>
         <exclusion>
@@ -334,7 +334,7 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>grpc-google-cloud-monitoring-v3</artifactId>
-      <version>3.90.0</version><!-- {x-version-update:grpc-google-cloud-monitoring-v3:current} -->
+      <version>3.89.0</version><!-- {x-version-update:grpc-google-cloud-monitoring-v3:current} -->
       <scope>test</scope>
       <!-- Version will be managed by guava -->
       <exclusions>
@@ -523,13 +523,13 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-trace</artifactId>
-      <version>2.89.0</version><!-- {x-version-update:google-cloud-trace:current} -->
+      <version>2.88.0</version><!-- {x-version-update:google-cloud-trace:current} -->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-trace-v1</artifactId>
-      <version>2.89.0</version><!-- {x-version-update:proto-google-cloud-trace-v1:current} -->
+      <version>2.88.0</version><!-- {x-version-update:proto-google-cloud-trace-v1:current} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

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<String, String> carrier) {
       child.injectTraceContext(carrier);
     }
   }
+
+  @Override
+  public void requestUrlResolved(String requestUrl) {
+    for (ApiTracer child : children) {
+      child.requestUrlResolved(requestUrl);
+    }
+  }
 }

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

@@ -279,4 +279,12 @@ void testInjectTraceContext() {
     inOrder.verify(child1).injectTraceContext(carrier);
     inOrder.verify(child2).injectTraceContext(carrier);
   }
+
+  @Test
+  void testRequestUrlResolved() {
+    compositeTracer.requestUrlResolved("the-url");
+    InOrder inOrder = inOrder(child1, child2);
+    inOrder.verify(child1).requestUrlResolved("the-url");
+    inOrder.verify(child2).requestUrlResolved("the-url");
+  }
 }

sdk-platform-java/hermetic_build/library_generation/templates/owlbot.yaml.monorepo.j2

@@ -21,7 +21,7 @@ deep-remove-regex:
 
 deep-preserve-regex:
 - "/{{ module_name }}/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
-- "/{{ module_name }}/google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java"
+- "/.*google-.*/src/main/java/com/google/[^/]+/.*/v.*/stub/Version.java"
 
 deep-copy-regex:
 - source: "/{{ proto_path }}/(v.*)/.*-java/proto-google-.*/src"

sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.OwlBot-hermetic-golden.yaml

@@ -21,7 +21,7 @@ deep-remove-regex:
 
 deep-preserve-regex:
 - "/java-bare-metal-solution/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
-- "/java-bare-metal-solution/google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java"
+- "/.*google-.*/src/main/java/com/google/[^/]+/.*/v.*/stub/Version.java"
 
 deep-copy-regex:
 - source: "/google/cloud/baremetalsolution/(v.*)/.*-java/proto-google-.*/src"

sdk-platform-java/pom.xml

@@ -29,6 +29,13 @@
   <!-- Do not deploy the aggregator POM -->
   <build>
     <plugins>
+      <plugin>
+        <groupId>com.spotify.fmt</groupId>
+        <artifactId>fmt-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>