Merge branch 'main' into blakeli0-patch-3

.cloudbuild/library_generation/library_generation.Dockerfile

@@ -27,11 +27,11 @@ RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
 RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \
   "./gapic-generator-java.jar"
 
-FROM docker.io/library/alpine:3.20.3@sha256:1e42bbe2508154c9126d48c2b8a75420c3544343bf86fd041fb7527e017a4b4a as glibc-compat
+FROM docker.io/library/alpine:3.21.0@sha256:21dc6063fd678b478f57c0e13f47560d0ea4eeba26dfc947b2a4f81f686b9f45 as glibc-compat
 
 RUN apk add git sudo
 # This SHA is the latest known-to-work version of this binary compatibility tool
-ARG GLIB_MUS_SHA=7717dd4dc26377dd9cedcc92b72ebf35f9e68a2d
+ARG GLIB_MUS_SHA=e94aca542e3ab08b42aa0b0d6e72478b935bb8e8
 WORKDIR /home
 
 # Install compatibility layer to run glibc-based programs (such as the
@@ -75,6 +75,9 @@ COPY --from=glibc-compat /lib/libc.* /lib/
 COPY --from=glibc-compat /usr/lib/libgcc* /usr/lib/
 COPY --from=glibc-compat /usr/lib/libstdc* /usr/lib/
 COPY --from=glibc-compat /usr/lib/libobstack* /usr/lib/
+COPY --from=glibc-compat /lib/libm.so.6 /usr/lib/
+COPY --from=glibc-compat /usr/lib/libucontext.so.1 /usr/lib/
+
 
 # copy source code
 COPY hermetic_build/common /src/common

.github/workflows/nightly.yaml

@@ -11,13 +11,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macOS-12, ubuntu-22.04, windows-2022 ]
+        os: [ macOS-13, ubuntu-22.04, windows-2022 ]
         java: [ 11, 17 ]
     runs-on: ${{ matrix.os }}
     steps:
       - run: git config --global core.longpaths true
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: temurin
@@ -37,12 +37,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macOS-12, ubuntu-22.04, windows-2022 ]
+        os: [ macOS-13, ubuntu-22.04, windows-2022 ]
     runs-on: ${{ matrix.os }}
     steps:
       - run: git config --global core.longpaths true
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: temurin
@@ -51,7 +51,7 @@ jobs:
       - name: Install with Java 11
         run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -DskipTests
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 8
           distribution: temurin

gapic-generator-java-pom-parent/pom.xml

@@ -32,7 +32,7 @@
     <gson.version>2.11.0</gson.version>
     <guava.version>33.3.1-jre</guava.version>
     <protobuf.version>4.28.3</protobuf.version>
-    <opentelemetry.version>1.44.1</opentelemetry.version>
+    <opentelemetry.version>1.45.0</opentelemetry.version>
     <maven.compiler.release>8</maven.compiler.release>
     <errorprone.version>2.36.0</errorprone.version>
     <j2objc-annotations.version>3.0.0</j2objc-annotations.version>

gax-java/dependencies.properties

@@ -39,7 +39,7 @@ maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-g
 maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.49.0
 maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.30.0
 maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.30.0
-maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.44.1
+maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.45.0
 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1
 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1
 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.31.1

java-shared-dependencies/third-party-dependencies/pom.xml

@@ -41,7 +41,7 @@
     <opentelemetry-semconv.version>1.26.0-alpha</opentelemetry-semconv.version>
     <flogger.version>0.8</flogger.version>
     <arrow.version>15.0.2</arrow.version>
-    <dev.cel.version>0.8.0</dev.cel.version>
+    <dev.cel.version>0.6.0</dev.cel.version>
     <com.google.crypto.tink.version>1.15.0</com.google.crypto.tink.version>
   </properties>
 

renovate.json

@@ -6,7 +6,9 @@
   "ignoreDeps": [
     "rules_pkg"
   ],
-  "ignorePaths": ["^library_generation/requirements\\.txt$"],
+  "ignorePaths": [
+    "^library_generation/requirements\\.txt$"
+  ],
   "customManagers": [
     {
       "customType": "regex",
@@ -44,9 +46,13 @@
     },
     {
       "customType": "regex",
-      "fileMatch": ["^.kokoro/presubmit/graalvm-native.*.cfg$"],
-      "matchStrings": ["value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm:(?<currentValue>.*?)\"",
-        "value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm17:(?<currentValue>.*?)\""],
+      "fileMatch": [
+        "^.kokoro/presubmit/graalvm-native.*.cfg$"
+      ],
+      "matchStrings": [
+        "value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm:(?<currentValue>.*?)\"",
+        "value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm17:(?<currentValue>.*?)\""
+      ],
       "depNameTemplate": "ghcr.io/graalvm/graalvm-ce",
       "datasourceTemplate": "docker"
     },
@@ -77,7 +83,9 @@
   ],
   "packageRules": [
     {
-      "matchPackageNames": ["com.google.cloud:google-cloud-shared-config"],
+      "matchPackageNames": [
+        "com.google.cloud:google-cloud-shared-config"
+      ],
       "registryUrls": [
         "https://repo.maven.apache.org/maven2/",
         "https://repo1.maven.org/maven2"
@@ -87,114 +95,114 @@
       "matchUpdateTypes": [
         "major"
       ],
-      "matchPackagePatterns": [
+      "enabled": false,
+      "matchPackageNames": [
         "*"
-      ],
-      "enabled": false
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^com.google.protobuf:"
-      ],
-      "enabled": false
+      "enabled": false,
+      "matchPackageNames": [
+        "/^com.google.protobuf:/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^com.google.guava:"
-      ],
-      "versioning": "docker"
+      "versioning": "docker",
+      "matchPackageNames": [
+        "/^com.google.guava:/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "*"
-      ],
       "semanticCommitType": "deps",
-      "semanticCommitScope": null
+      "semanticCommitScope": null,
+      "matchPackageNames": [
+        "*"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^org.apache.maven",
-        "^org.jacoco:",
-        "^org.codehaus.mojo:",
-        "^org.sonatype.plugins:",
-        "^com.coveo:",
-        "^com.google.cloud:google-cloud-shared-config"
-      ],
       "semanticCommitType": "build",
       "semanticCommitScope": "deps",
-      "enabled": true
+      "enabled": true,
+      "matchPackageNames": [
+        "/^org.apache.maven/",
+        "/^org.jacoco:/",
+        "/^org.codehaus.mojo:/",
+        "/^org.sonatype.plugins:/",
+        "/^com.coveo:/",
+        "/^com.google.cloud:google-cloud-shared-config/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^{{metadata['repo']['distribution_name']}}",
-        "^com.google.cloud:libraries-bom",
-        "^com.google.cloud.samples:shared-configuration"
-      ],
       "semanticCommitType": "chore",
-      "semanticCommitScope": "deps"
+      "semanticCommitScope": "deps",
+      "matchPackageNames": [
+        "/^{{metadata['repo']['distribution_name']}}/",
+        "/^com.google.cloud:libraries-bom/",
+        "/^com.google.cloud.samples:shared-configuration/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^junit:junit",
-        "^com.google.truth:truth",
-        "^org.mockito:mockito-core",
-        "^org.objenesis:objenesis",
-        "^com.google.cloud:google-cloud-conformance-tests"
-      ],
       "semanticCommitType": "test",
-      "semanticCommitScope": "deps"
+      "semanticCommitScope": "deps",
+      "matchPackageNames": [
+        "/^junit:junit/",
+        "/^com.google.truth:truth/",
+        "/^org.mockito:mockito-core/",
+        "/^org.objenesis:objenesis/",
+        "/^com.google.cloud:google-cloud-conformance-tests/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^com.google.cloud:google-cloud-"
-      ],
-      "ignoreUnstable": false
+      "ignoreUnstable": false,
+      "matchPackageNames": [
+        "/^com.google.cloud:google-cloud-/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^com.fasterxml.jackson.core"
-      ],
-      "groupName": "jackson dependencies"
+      "groupName": "jackson dependencies",
+      "matchPackageNames": [
+        "/^com.fasterxml.jackson.core/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^io.grpc"
-      ],
-      "groupName": "gRPC dependencies"
+      "groupName": "gRPC dependencies",
+      "matchPackageNames": [
+        "/^io.grpc/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^com.google.auth"
-      ],
-      "groupName": "Google Auth Library dependencies"
+      "groupName": "Google Auth Library dependencies",
+      "matchPackageNames": [
+        "/^com.google.auth/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "com.google.api.grpc:grpc-google-common-protos",
-        "com.google.api.grpc:grpc-google-iam-v1",
-        "com.google.api.grpc:proto-google-common-protos",
-        "com.google.api.grpc:proto-google-iam-v1",
-        "com.google.api:api-common"
-      ],
-      "groupName": "Google API dependencies"
+      "groupName": "Google API dependencies",
+      "matchPackageNames": [
+        "/com.google.api.grpc:grpc-google-common-protos/",
+        "/com.google.api.grpc:grpc-google-iam-v1/",
+        "/com.google.api.grpc:proto-google-common-protos/",
+        "/com.google.api.grpc:proto-google-iam-v1/",
+        "/com.google.api:api-common/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^com.google.http-client"
-      ],
-      "groupName": "Google HTTP Client dependencies"
+      "groupName": "Google HTTP Client dependencies",
+      "matchPackageNames": [
+        "/^com.google.http-client/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^io.opencensus"
-      ],
-      "groupName": "OpenCensus dependencies"
+      "groupName": "OpenCensus dependencies",
+      "matchPackageNames": [
+        "/^io.opencensus/"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^io.netty"
-      ],
-      "groupName": "Netty dependencies"
+      "groupName": "Netty dependencies",
+      "matchPackageNames": [
+        "/^io.netty/"
+      ]
     }
   ]
 }