Merge remote-tracking branch 'origin/main' into observability/tracing-attr/status-code

Author: diegomarquezp

.github/requirements.in

@@ -1 +1 @@
-requests==2.32.4
+requests==2.33.0

.github/requirements.txt

@@ -104,9 +104,9 @@ idna==3.7 \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
     # via requests
-requests==2.32.4 \
-    --hash=sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c \
-    --hash=sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422
+requests==2.33.0 \
+    --hash=sha256:3324635456fa185245e24865e810cecec7b4caf933d7eb133dcde67d48cee69b \
+    --hash=sha256:c7ebc5e8b0f21837386ad0e1c8fe8b829fa5f544d8df3b2253bff14ef29d7652
     # via -r requirements.in
 urllib3==2.6.3 \
     --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \

.github/workflows/ci.yaml

@@ -237,7 +237,7 @@ jobs:
       run: |
         mvn install -B -ntp  -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
     - name: Validate gapic-libraries-bom
-      uses: googleapis/java-cloud-bom/tests/validate-bom@v26.54.0
+      uses: googleapis/java-cloud-bom/tests/validate-bom@v26.79.0
       with:
         bom-path: gapic-libraries-bom/pom.xml
   generation-config-check:

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

@@ -88,8 +88,8 @@ jobs:
         # Need to cd out of the directory to get the scripts as this step is run inside the java-showcase directory
         run: |
           if [[ -n "${{ env.DEPENDENCIES_LIST }}" ]]; then
-            ../sdk-platform-java/.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
+            ../.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
           else
-            ../sdk-platform-java/.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt
+            ../.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt
           fi
         working-directory: sdk-platform-java/java-showcase

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

@@ -43,7 +43,7 @@ jobs:
           git checkout -b "${head_ref}" fork/${head_ref}
           changed_directories="$(git diff --name-only "fork/${head_ref}" "origin/${base_ref}")"
         fi
-        if [[ ${changed_directories} =~ "hermetic_build/" ]] || [[ ${changed_directories} =~ ".cloudbuild/library_generation/" ]]; then
+        if [[ ${changed_directories} =~ "sdk-platform-java/hermetic_build/" ]] || [[ ${changed_directories} =~ "sdk-platform-java/.cloudbuild/library_generation/" ]]; then
           echo "should_run=true" >> $GITHUB_OUTPUT
         else
           echo "should_run=false" >> $GITHUB_OUTPUT
@@ -58,6 +58,9 @@ jobs:
     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
+    defaults:
+      run:
+        working-directory: sdk-platform-java
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
@@ -86,12 +89,15 @@ jobs:
     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
+    defaults:
+      run:
+        working-directory: sdk-platform-java
     steps:
     - uses: actions/checkout@v4
     - name: Run ShellCheck
       uses: ludeeus/action-shellcheck@2.0.0
       with:
-        scandir: 'hermetic_build'
+        scandir: 'sdk-platform-java/hermetic_build'
         format: tty
         severity: error
         ignore_paths: 
@@ -100,6 +106,9 @@ jobs:
     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
+    defaults:
+      run:
+        working-directory: sdk-platform-java
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5

.kokoro/presubmit/storage-integration.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
 }
 
 env_vars: {

generation_config.yaml

@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.78.0</version>
+      <version>26.79.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -42,20 +42,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-accessapproval</artifactId>
-  <version>2.88.0</version>
+  <version>2.89.0</version>
 </dependency>
 ```
 
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-accessapproval:2.88.0'
+implementation 'com.google.cloud:google-cloud-accessapproval:2.89.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-accessapproval" % "2.88.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-accessapproval" % "2.89.0"
 ```
 
 ## Authentication
@@ -175,7 +175,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-accessapproval/latest/overview
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-accessapproval.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-accessapproval/2.88.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-accessapproval/2.89.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

java-accessapproval/README.md

@@ -400,6 +400,7 @@ protected LibraryMetadata getLibraryMetadata() {
     return LibraryMetadata.newBuilder()
         .setArtifactName("com.google.cloud:google-cloud-accessapproval")
         .setRepository("googleapis/google-cloud-java")
+        .setVersion(Version.VERSION)
         .build();
   }
 

java-accessapproval/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/stub/AccessApprovalStubSettings.java

@@ -243,6 +243,7 @@ protected GrpcAccessApprovalStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<GetApprovalRequestMessage, ApprovalRequest>
         getApprovalRequestTransportSettings =
@@ -254,6 +255,7 @@ protected GrpcAccessApprovalStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<ApproveApprovalRequestMessage, ApprovalRequest>
         approveApprovalRequestTransportSettings =
@@ -265,6 +267,7 @@ protected GrpcAccessApprovalStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<DismissApprovalRequestMessage, ApprovalRequest>
         dismissApprovalRequestTransportSettings =
@@ -276,6 +279,7 @@ protected GrpcAccessApprovalStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<InvalidateApprovalRequestMessage, ApprovalRequest>
         invalidateApprovalRequestTransportSettings =
@@ -287,6 +291,7 @@ protected GrpcAccessApprovalStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<GetAccessApprovalSettingsMessage, AccessApprovalSettings>
         getAccessApprovalSettingsTransportSettings =
@@ -298,6 +303,7 @@ protected GrpcAccessApprovalStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<UpdateAccessApprovalSettingsMessage, AccessApprovalSettings>
         updateAccessApprovalSettingsTransportSettings =
@@ -321,6 +327,7 @@ protected GrpcAccessApprovalStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<GetAccessApprovalServiceAccountMessage, AccessApprovalServiceAccount>
         getAccessApprovalServiceAccountTransportSettings =