Merge branch 'markduckworth/search' of github.com:googleapis/google-cloud-node into markduckworth/search

MarkDuckworth · MarkDuckworth · commit 72f1e5afb94e · 2026-04-08T11:26:42.000-06:00
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,5 +1,20 @@
 {
   "core/common": "6.0.0",
+  "core/dev-packages/jsdoc-fresh": "5.0.2",
+  "core/dev-packages/jsdoc-region-tag": "4.0.1",
+  "core/dev-packages/pack-n-play": "4.2.2",
+  "core/generator/gapic-generator-typescript": "4.11.13",
+  "core/packages/gax": "5.0.6",
+  "core/packages/gaxios": "7.1.4",
+  "core/packages/gcp-metadata": "8.1.2",
+  "core/packages/google-auth-library-nodejs": "10.6.2",
+  "core/packages/logging-utils": "1.1.3",
+  "core/packages/nodejs-googleapis-common": "8.0.1",
+  "core/packages/nodejs-proto-files": "6.0.0",
+  "core/packages/proto3-json-serializer-nodejs": "3.0.4",
+  "core/packages/retry-request": "8.0.2",
+  "core/packages/teeny-request": "10.1.2",
+  "core/packages/tools": "1.0.5",
   "core/paginator": "6.0.0",
   "core/precise-date": "5.0.0",
   "core/projectify": "5.0.0",
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/changelog.json b/changelog.json
@@ -1,6 +1,23 @@
 {
   "repository": "googleapis/google-cloud-node",
   "entries": [
+    {
+      "changes": [
+        {
+          "type": "fix",
+          "sha": "31fa06fe888b173c86c166af1c062c3cc3211342",
+          "message": "Upgrade the generator to protobuf 31 and bazel 7.7.1, and update templates to fix system test",
+          "issues": [
+            "7943"
+          ]
+        }
+      ],
+      "version": "4.11.13",
+      "language": "JAVASCRIPT",
+      "artifactName": "@google-cloud/gapic-generator",
+      "id": "2d48021a-55f7-4dae-8519-0c4ce0da0a9f",
+      "createTime": "2026-04-06T17:24:30.125Z"
+    },
     {
       "changes": [
         {
@@ -69375,5 +69392,5 @@
       "createTime": "2023-01-28T04:18:24.718Z"
     }
   ],
-  "updateTime": "2026-03-25T19:27:43.346Z"
+  "updateTime": "2026-04-06T17:24:30.125Z"
 }
diff --git a/core/generator/gapic-generator-typescript/CHANGELOG.md b/core/generator/gapic-generator-typescript/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.11.13](https://github.com/googleapis/google-cloud-node/compare/gapic-generator-v4.11.12...gapic-generator-v4.11.13) (2026-04-06)
+
+
+### Bug Fixes
+
+* Upgrade the generator to protobuf 31 and bazel 7.7.1, and update templates to fix system test ([#7943](https://github.com/googleapis/google-cloud-node/issues/7943)) ([31fa06f](https://github.com/googleapis/google-cloud-node/commit/31fa06fe888b173c86c166af1c062c3cc3211342))
+
 ## [4.11.12](https://github.com/googleapis/google-cloud-node-core/compare/gapic-generator-v4.11.11...gapic-generator-v4.11.12) (2026-01-15)
 
 
diff --git a/core/generator/gapic-generator-typescript/package-lock.json b/core/generator/gapic-generator-typescript/package-lock.json
diff --git a/core/generator/gapic-generator-typescript/package.json b/core/generator/gapic-generator-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@google-cloud/gapic-generator",
-  "version": "4.11.12",
+  "version": "4.11.13",
   "type": "module",
   "description": "Google API Client Library Generator for TypeScript, written in TypeScript.",
   "homepage": "https://github.com/googleapis/google-cloud-node-core/tree/main/packages/gapic-generator-typescript",
diff --git a/core/generator/gapic-generator-typescript/yarn.lock b/core/generator/gapic-generator-typescript/yarn.lock
@@ -3147,9 +3147,9 @@ picocolors@^1.0.0, picocolors@^1.1.1:
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
 picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
+  integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
 
 prelude-ls@^1.2.1:
   version "1.2.1"
diff --git a/handwritten/spanner/package.json b/handwritten/spanner/package.json
@@ -141,11 +141,13 @@
     "yargs": "^17.7.2"
   },
   "overrides": {
-    "gcp-metadata": "^7.0.1"
+    "gcp-metadata": "^7.0.1",
+    "@sinonjs/fake-timers": "15.2.1"
   },
   "pnpm": {
     "overrides": {
-      "gcp-metadata": "^7.0.1"
+      "gcp-metadata": "^7.0.1",
+      "@sinonjs/fake-timers": "15.2.1"
     }
   },
   "homepage": "https://github.com/googleapis/google-cloud-node/tree/main/handwritten/spanner"
diff --git a/handwritten/spanner/src/metrics/interceptor.ts b/handwritten/spanner/src/metrics/interceptor.ts
@@ -75,9 +75,7 @@ export const MetricInterceptor = (options, nextCall) => {
           if (metricsTracer?.afeLatency) {
             metricsTracer?.recordAfeLatency(status.code);
           } else {
-            // Disable afe_connectivity_error_count metric as AFE header is disabled in backend
-            // currently.
-            // metricsTracer?.recordAfeConnectivityErrorCount(status.code);
+            metricsTracer?.recordAfeConnectivityErrorCount(status.code);
           }
         },
       };
diff --git a/handwritten/spanner/test/metrics/interceptor.ts b/handwritten/spanner/test/metrics/interceptor.ts
@@ -197,7 +197,7 @@ describe('MetricInterceptor', () => {
       );
     });
 
-    it.skip('AFE Metrics - Connectivity Error Count', () => {
+    it('AFE Metrics - Connectivity Error Count', () => {
       const interceptingCall = MetricInterceptor(mockOptions, mockNextCall);
       interceptingCall.start(testMetadata, mockListener);
 
diff --git a/handwritten/spanner/test/metrics/metrics.ts b/handwritten/spanner/test/metrics/metrics.ts
@@ -458,6 +458,10 @@ describe('Test metrics with mock server', () => {
         resourceMetrics,
         METRIC_NAME_GFE_CONNECTIVITY_ERROR_COUNT,
       );
+      const afeConnectivityErrorCountData = getMetricData(
+        resourceMetrics,
+        METRIC_NAME_AFE_CONNECTIVITY_ERROR_COUNT,
+      );
 
       // Verify GFE AFE latency doesn't exist
       assert.ok(!hasMetricData(resourceMetrics, METRIC_NAME_GFE_LATENCIES));
@@ -483,6 +487,10 @@ describe('Test metrics with mock server', () => {
           getAggregatedValue(connectivityErrorCountData, attributes),
           1,
         );
+        assert.strictEqual(
+          getAggregatedValue(afeConnectivityErrorCountData, attributes),
+          1,
+        );
       });
     });
 
diff --git a/release-please-submodules.json b/release-please-submodules.json
@@ -5,6 +5,51 @@
     "core/common": {
       "component": "common"
     },
+    "core/dev-packages/jsdoc-fresh": {
+      "component": "jsdoc-fresh"
+    },
+    "core/dev-packages/jsdoc-region-tag": {
+      "component": "jsdoc-region-tag"
+    },
+    "core/dev-packages/pack-n-play": {
+      "component": "pack-n-play"
+    },
+    "core/generator/gapic-generator-typescript": {
+      "component": "gapic-generator"
+    },
+    "core/packages/gax": {
+      "component": "google-gax"
+    },
+    "core/packages/gaxios": {
+      "component": "gaxios"
+    },
+    "core/packages/gcp-metadata": {
+      "component": "gcp-metadata"
+    },
+    "core/packages/google-auth-library-nodejs": {
+      "component": "google-auth-library"
+    },
+    "core/packages/logging-utils": {
+      "component": "google-logging-utils"
+    },
+    "core/packages/nodejs-googleapis-common": {
+      "component": "googleapis-common"
+    },
+    "core/packages/nodejs-proto-files": {
+      "component": "google-proto-files"
+    },
+    "core/packages/proto3-json-serializer-nodejs": {
+      "component": "proto3-json-serializer"
+    },
+    "core/packages/retry-request": {
+      "component": "retry-request"
+    },
+    "core/packages/teeny-request": {
+      "component": "teeny-request"
+    },
+    "core/packages/tools": {
+      "component": "gapic-tools"
+    },
     "core/paginator": {
       "component": "paginator"
     },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@google-cloud/gapic-generator",`
`3`		`- "version": "4.11.12",`
	`3`	`+ "version": "4.11.13",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "Google API Client Library Generator for TypeScript, written in TypeScript.",`
`6`	`6`	`"homepage": "https://github.com/googleapis/google-cloud-node-core/tree/main/packages/gapic-generator-typescript",`