Merge branch 'main' into supporting_excluding_labels_from_grpc_metric_export

Author: shubham-up-47

.github/workflows/test-runner.yml

@@ -127,6 +127,8 @@ jobs:
       execute-integration-tests: true
     secrets: inherit
   windows-cmake:
+    # Disabled
+    if: false
     name: Windows-CMake
     needs: [pre-flight]
     uses: ./.github/workflows/windows-cmake.yml
@@ -152,7 +154,7 @@ jobs:
       # macos-bazel is disabled
       # macos-cmake is disabled
       - windows-bazel
-      - windows-cmake
+      # windows-cmake is disabled is disabled
     # Run even if the other jobs failed or were skipped.
     if: always()
     runs-on: ubuntu-latest

.typos.toml

@@ -70,5 +70,7 @@ extend-ignore-identifiers-re = [
   "NAM4",
   # Metadata is mispelled in this proto message name found in
   # google/cloud/aiplatform/v1/vizier_service.proto
-  "CheckTrialEarlyStoppingStateMetatdata"
+  "CheckTrialEarlyStoppingStateMetatdata",
+  # google/cloud/cloudsecuritycompliance/v1/deployment.proto
+  "conrol"
 ]

MODULE.bazel

@@ -55,12 +55,12 @@ python.toolchain(
 bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis")
 archive_override(
     module_name = "googleapis",
-    integrity = "sha256-PeOhmUAO6np2YJGuuWxLhMhiZq0fkz+ZM7u3w1nnJ/4=",
+    integrity = "sha256-19J02RR+UvY5cqIGTGDPLmMGa2VaJG9+DQJ0Xkn8HTs=",
     patch_strip = 1,
     patches = ["//bazel:googleapis.modules.patch"],
-    strip_prefix = "googleapis-2193a2bfcecb92b92aad7a4d81baa428cafd7dfd",
+    strip_prefix = "googleapis-659ea6e98acc7d58661ce2aa7b4cf76a7ef3fd42",
     urls = [
-        "https://github.com/googleapis/googleapis/archive/2193a2bfcecb92b92aad7a4d81baa428cafd7dfd.tar.gz",
+        "https://github.com/googleapis/googleapis/archive/659ea6e98acc7d58661ce2aa7b4cf76a7ef3fd42.tar.gz",
     ],
 )
 

bazel/workspace0.bzl

@@ -126,10 +126,10 @@ def gl_cpp_workspace0(name = None):
         http_archive,
         name = "com_google_googleapis",
         urls = [
-            "https://github.com/googleapis/googleapis/archive/2193a2bfcecb92b92aad7a4d81baa428cafd7dfd.tar.gz",
+            "https://github.com/googleapis/googleapis/archive/659ea6e98acc7d58661ce2aa7b4cf76a7ef3fd42.tar.gz",
         ],
-        sha256 = "3de3a199400eea7a766091aeb96c4b84c86266ad1f933f9933bbb7c359e727fe",
-        strip_prefix = "googleapis-2193a2bfcecb92b92aad7a4d81baa428cafd7dfd",
+        sha256 = "d7d274d9147e52f63972a2064c60cf2e63066b655a246f7e0d02745e49fc1d3b",
+        strip_prefix = "googleapis-659ea6e98acc7d58661ce2aa7b4cf76a7ef3fd42",
         build_file = Label("//bazel:googleapis.BUILD"),
         # Scaffolding for patching googleapis after download. For example:
         #   patches = ["googleapis.patch"]

ci/cloudbuild/dockerfiles/checkers.Dockerfile

@@ -23,7 +23,6 @@ ARG ARCH=amd64
 
 RUN dnf makecache && \
     dnf install -y \
-        cargo \
         cmake \
         clang-tools-extra \
         diffutils \
@@ -35,7 +34,11 @@ RUN dnf makecache && \
         python-pip \
         ShellCheck
 
-RUN cargo install typos-cli --version 1.24.1 --root /usr/local
+RUN dnf makecache && \
+    dnf install -y \
+    cargo
+
+RUN cargo install typos-cli --locked --version 1.24.1 --root /usr/local
 
 RUN curl -L -o /usr/bin/buildifier https://github.com/bazelbuild/buildtools/releases/download/v6.4.0/buildifier-linux-amd64 && \
     chmod 755 /usr/bin/buildifier

ci/kokoro/macos/builds/cmake-vcpkg.sh

@@ -29,7 +29,7 @@ readonly NCPU
 
 io::log_h2 "Update or install dependencies"
 # Install bash and ninja
-brew install bash ninja
+ci/retry-command.sh 3 60 brew install bash ninja
 
 # Install a specific version of CMake to match our GHA builds
 (
@@ -40,18 +40,18 @@ brew install bash ninja
   git init
 
   # Download the Homebrew formula for CMake==3.27.2
-  curl -fsSL -o cmake.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/fd21fcf239bcd0231c9fed5719403ec128151af4/Formula/cmake.rb
+  "${PROJECT_ROOT}/ci/retry-command.sh" 3 60 curl -fsSL -o cmake.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/fd21fcf239bcd0231c9fed5719403ec128151af4/Formula/cmake.rb
   mv cmake.rb ./Formula/
 
   git add .
   git commit -m "Add CMake formula"
 
   # Tap the local repository
-  brew tap user/homebrew-tap "${HOME}/user/homebrew-tap"
+  "${PROJECT_ROOT}/ci/retry-command.sh" 3 60 brew tap user/homebrew-tap "${HOME}/user/homebrew-tap"
 
   # Uninstall existing CMake and install CMake from the local tap
   brew uninstall cmake
-  brew install --build-from-source user/homebrew-tap/cmake
+  "${PROJECT_ROOT}/ci/retry-command.sh" 3 60 brew install --build-from-source user/homebrew-tap/cmake
 )
 
 io::log_h2 "Using CMake version"

ci/kokoro/windows/builds/cmake.ps1

@@ -43,9 +43,54 @@ if ($missing.count -ge 1) {
 $project_root = (Get-Item -Path ".\" -Verbose).FullName -replace "\\", "/"
 $vcpkg_root = Install-Vcpkg "${project_root}" ""
 $binary_dir="cmake-out/${BuildName}"
-# Install all dependencies from the vcpkg.json manifest file.
-# This mirrors the behavior of our GHA builds.
-& "${vcpkg_root}/vcpkg.exe" install --triplet "${env:VCPKG_TRIPLET}"
+
+# The VCPKG_ROOT env var is mismatched with the vcpkg we are running,
+# which causes vcpkg to ignore other env vars.
+# We'll unset them both and pass the overlay-triplets path manually.
+Remove-Item env:VCPKG_ROOT -ErrorAction SilentlyContinue
+Remove-Item env:VCPKG_OVERLAY_TRIPLETS -ErrorAction SilentlyContinue
+
+# Define the correct path to our custom triplets.
+$overlay_triplets_path = "${project_root}/ci/kokoro/windows/triplets"
+
+# Install all dependencies, now passing the overlay path on the command line
+& "${vcpkg_root}/vcpkg.exe" install --triplet "${env:VCPKG_TRIPLET}" --overlay-triplets="${overlay_triplets_path}"
+
+# Manually check the exit code. vcpkg might not be throwing a terminating error.
+if ($LastExitCode -ne 0) {
+    Write-Host -ForegroundColor Red "----------------------------------------------------------------"
+    Write-Host -ForegroundColor Red "vcpkg install FAILED with exit code $LastExitCode."
+    Write-Host -ForegroundColor Red "Dumping vcpkg buildtree logs for known failing packages..."
+    Write-Host -ForegroundColor Red "----------------------------------------------------------------"
+
+    # We'll check logs for *all* known problematic packages
+    $problem_packages = @("crc32c", "yaml-cpp")
+
+    foreach ($pkg in $problem_packages) {
+        Write-Host -ForegroundColor Magenta "--- Checking logs for $pkg ---"
+        $log1 = "${vcpkg_root}/buildtrees/${pkg}/config-x64-windows-static-out.log"
+        $log2 = "${vcpkg_root}/buildtrees/${pkg}/config-x64-windows-static-dbg-CMakeCache.txt.log"
+        $log3 = "${vcpkg_root}/buildtrees/${pkg}/config-x64-windows-static-rel-CMakeCache.txt.log"
+
+        foreach ($logFile in @($log1, $log2, $log3)) {
+            if (Test-Path $logFile) {
+                Write-Host -ForegroundColor Red "========= Contents of $logFile ========="
+                Get-Content $logFile
+                Write-Host -ForegroundColor Red "========= End of $logFile ========="
+            } else {
+                Write-Host -ForegroundColor Yellow "Log file not found, skipping: $logFile"
+            }
+        }
+    }
+
+    Write-Host -ForegroundColor Red "----------------------------------------------------------------"
+    Write-Host -ForegroundColor Red "Dumping complete. Forcing build failure."
+    Write-Host -ForegroundColor Red "----------------------------------------------------------------"
+    # Manually fail the build with the exit code from vcpkg
+    exit $LastExitCode
+}
+
+Write-Host -ForegroundColor Green "vcpkg install SUCCEEDED."
 
 $cmake_args=@(
     "-G$env:GENERATOR",
@@ -54,15 +99,23 @@ $cmake_args=@(
     "-DCMAKE_TOOLCHAIN_FILE=`"${vcpkg_root}/scripts/buildsystems/vcpkg.cmake`""
     "-DCMAKE_BUILD_TYPE=${env:CONFIG}",
     "-DVCPKG_TARGET_TRIPLET=${env:VCPKG_TRIPLET}",
+    "-DVCPKG_OVERLAY_TRIPLETS=${project_root}/ci/kokoro/windows/triplets",
     "-DCMAKE_C_COMPILER=cl.exe",
     "-DCMAKE_CXX_COMPILER=cl.exe",
     "-DGOOGLE_CLOUD_CPP_ENABLE_WERROR=ON",
     "-DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_CORD_WORKAROUND=ON",
-    "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>"
+    "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>",
+    "-DGOOGLE_CLOUD_CPP_ENABLE=universe_domain"
 )
 
 # Configure CMake and create the build directory.
 Write-Host -ForegroundColor Yellow "`n$(Get-Date -Format o) Configuring CMake with $cmake_args"
+
+# The VCPKG_ROOT env var is mismatched with the vcpkg we are running,
+# which causes vcpkg to ignore other env vars.
+# Unset the env var just before the cmake call, which also calls vcpkg.
+Remove-Item env:VCPKG_ROOT -ErrorAction SilentlyContinue
+
 cmake $cmake_args
 if ($LastExitCode) {
     Write-Host -ForegroundColor Red "cmake config failed with exit code $LastExitCode"

ci/kokoro/windows/triplets/x64-windows-static.cmake

@@ -4,3 +4,5 @@ set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_VISUAL_STUDIO_PATH
     "C:\\Program Files (x86)\\Microsoft Visual Studio\\$ENV{MSVC_VERSION}\\BuildTools"
 )
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS
+    "${VCPKG_CMAKE_CONFIGURE_OPTIONS};-DCMAKE_POLICY_VERSION_MINIMUM=3.5")

ci/kokoro/windows/triplets/x86-windows-static.cmake

@@ -4,3 +4,5 @@ set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_VISUAL_STUDIO_PATH
     "C:\\Program Files (x86)\\Microsoft Visual Studio\\$ENV{MSVC_VERSION}\\BuildTools"
 )
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS
+    "${VCPKG_CMAKE_CONFIGURE_OPTIONS};-DCMAKE_POLICY_VERSION_MINIMUM=3.5")

ci/lib/shard.sh

@@ -92,6 +92,7 @@ function shard::cmake_features() {
     compute)
       echo "compute"
       echo "opentelemetry"
+      echo "universe_domain"
       ;;
     # If we decided to compile all libraries with clang-tidy we would need
     # to enable shards such as: