feat: add request/response debug logging to gapics

.bazeliskrc

@@ -1,2 +1,2 @@
 # See https://github.com/bazelbuild/bazelisk
-USE_BAZEL_VERSION=6.3.0
+USE_BAZEL_VERSION=6.3.0

baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline

@@ -29,6 +29,7 @@ import {fileURLToPath} from 'url';
 import {getJSON} from '../json-helper.cjs';
 // @ts-ignore
 const dirname = path.dirname(fileURLToPath(import.meta.url));
+import * as logging from 'google-logging-utils';
 
 /**
  * Client JSON configuration object, loaded from
@@ -62,6 +63,7 @@ export class AssetServiceClient {
   private _defaults: {[method: string]: gax.CallSettings};
   private _universeDomain: string;
   private _servicePath: string;
+  private _log = logging.log('asset');
   auth: gax.GoogleAuth;
   descriptors: Descriptors = {
     page: {},
@@ -472,7 +474,24 @@ export class AssetServiceClient {
       'parent': request.parent ?? '',
     });
     this.initialize();
-    return this.innerApiCalls.batchGetAssetsHistory(request, options, callback);
+    this._log.info('batchGetAssetsHistory request %j', request);
+    const wrappedCallback: Callback<
+        protos.google.cloud.asset.v1.IBatchGetAssetsHistoryResponse,
+        protos.google.cloud.asset.v1.IBatchGetAssetsHistoryRequest|null|undefined,
+        {}|null|undefined>|undefined = callback
+      ? (error, response, options, rawResponse) => {
+          this._log.info('batchGetAssetsHistory response %j', response);
+          callback!(error, response, options, rawResponse);
+        }
+      : undefined;
+    return this.innerApiCalls.batchGetAssetsHistory(request, options, wrappedCallback)
+      ?.then(([response, options, rawResponse]: [
+        protos.google.cloud.asset.v1.IBatchGetAssetsHistoryResponse,
+        protos.google.cloud.asset.v1.IBatchGetAssetsHistoryRequest|undefined, {}|undefined
+      ]) => {
+        this._log.info('batchGetAssetsHistory response %j', response);
+        return [response, options, rawResponse];
+      });
   }
 /**
  * Creates a feed in a parent project/folder/organization to listen to its
@@ -556,7 +575,24 @@ export class AssetServiceClient {
       'parent': request.parent ?? '',
     });
     this.initialize();
-    return this.innerApiCalls.createFeed(request, options, callback);
+    this._log.info('createFeed request %j', request);
+    const wrappedCallback: Callback<
+        protos.google.cloud.asset.v1.IFeed,
+        protos.google.cloud.asset.v1.ICreateFeedRequest|null|undefined,
+        {}|null|undefined>|undefined = callback
+      ? (error, response, options, rawResponse) => {
+          this._log.info('createFeed response %j', response);
+          callback!(error, response, options, rawResponse);
+        }
+      : undefined;
+    return this.innerApiCalls.createFeed(request, options, wrappedCallback)
+      ?.then(([response, options, rawResponse]: [
+        protos.google.cloud.asset.v1.IFeed,
+        protos.google.cloud.asset.v1.ICreateFeedRequest|undefined, {}|undefined
+      ]) => {
+        this._log.info('createFeed response %j', response);
+        return [response, options, rawResponse];
+      });
   }
 /**
  * Gets details about an asset feed.
@@ -629,7 +665,24 @@ export class AssetServiceClient {
       'name': request.name ?? '',
     });
     this.initialize();
-    return this.innerApiCalls.getFeed(request, options, callback);
+    this._log.info('getFeed request %j', request);
+    const wrappedCallback: Callback<
+        protos.google.cloud.asset.v1.IFeed,
+        protos.google.cloud.asset.v1.IGetFeedRequest|null|undefined,
+        {}|null|undefined>|undefined = callback
+      ? (error, response, options, rawResponse) => {
+          this._log.info('getFeed response %j', response);
+          callback!(error, response, options, rawResponse);
+        }
+      : undefined;
+    return this.innerApiCalls.getFeed(request, options, wrappedCallback)
+      ?.then(([response, options, rawResponse]: [
+        protos.google.cloud.asset.v1.IFeed,
+        protos.google.cloud.asset.v1.IGetFeedRequest|undefined, {}|undefined
+      ]) => {
+        this._log.info('getFeed response %j', response);
+        return [response, options, rawResponse];
+      });
   }
 /**
  * Lists all asset feeds in a parent project/folder/organization.
@@ -701,7 +754,24 @@ export class AssetServiceClient {
       'parent': request.parent ?? '',
     });
     this.initialize();
-    return this.innerApiCalls.listFeeds(request, options, callback);
+    this._log.info('listFeeds request %j', request);
+    const wrappedCallback: Callback<
+        protos.google.cloud.asset.v1.IListFeedsResponse,
+        protos.google.cloud.asset.v1.IListFeedsRequest|null|undefined,
+        {}|null|undefined>|undefined = callback
+      ? (error, response, options, rawResponse) => {
+          this._log.info('listFeeds response %j', response);
+          callback!(error, response, options, rawResponse);
+        }
+      : undefined;
+    return this.innerApiCalls.listFeeds(request, options, wrappedCallback)
+      ?.then(([response, options, rawResponse]: [
+        protos.google.cloud.asset.v1.IListFeedsResponse,
+        protos.google.cloud.asset.v1.IListFeedsRequest|undefined, {}|undefined
+      ]) => {
+        this._log.info('listFeeds response %j', response);
+        return [response, options, rawResponse];
+      });
   }
 /**
  * Updates an asset feed configuration.
@@ -779,7 +849,24 @@ export class AssetServiceClient {
       'feed.name': request.feed!.name ?? '',
     });
     this.initialize();
-    return this.innerApiCalls.updateFeed(request, options, callback);
+    this._log.info('updateFeed request %j', request);
+    const wrappedCallback: Callback<
+        protos.google.cloud.asset.v1.IFeed,
+        protos.google.cloud.asset.v1.IUpdateFeedRequest|null|undefined,
+        {}|null|undefined>|undefined = callback
+      ? (error, response, options, rawResponse) => {
+          this._log.info('updateFeed response %j', response);
+          callback!(error, response, options, rawResponse);
+        }
+      : undefined;
+    return this.innerApiCalls.updateFeed(request, options, wrappedCallback)
+      ?.then(([response, options, rawResponse]: [
+        protos.google.cloud.asset.v1.IFeed,
+        protos.google.cloud.asset.v1.IUpdateFeedRequest|undefined, {}|undefined
+      ]) => {
+        this._log.info('updateFeed response %j', response);
+        return [response, options, rawResponse];
+      });
   }
 /**
  * Deletes an asset feed.
@@ -852,7 +939,24 @@ export class AssetServiceClient {
       'name': request.name ?? '',
     });
     this.initialize();
-    return this.innerApiCalls.deleteFeed(request, options, callback);
+    this._log.info('deleteFeed request %j', request);
+    const wrappedCallback: Callback<
+        protos.google.protobuf.IEmpty,
+        protos.google.cloud.asset.v1.IDeleteFeedRequest|null|undefined,
+        {}|null|undefined>|undefined = callback
+      ? (error, response, options, rawResponse) => {
+          this._log.info('deleteFeed response %j', response);
+          callback!(error, response, options, rawResponse);
+        }
+      : undefined;
+    return this.innerApiCalls.deleteFeed(request, options, wrappedCallback)
+      ?.then(([response, options, rawResponse]: [
+        protos.google.protobuf.IEmpty,
+        protos.google.cloud.asset.v1.IDeleteFeedRequest|undefined, {}|undefined
+      ]) => {
+        this._log.info('deleteFeed response %j', response);
+        return [response, options, rawResponse];
+      });
   }
 
 /**
@@ -949,7 +1053,24 @@ export class AssetServiceClient {
       'parent': request.parent ?? '',
     });
     this.initialize();
-    return this.innerApiCalls.exportAssets(request, options, callback);
+    const wrappedCallback: Callback<
+          LROperation<protos.google.cloud.asset.v1.IExportAssetsResponse, protos.google.cloud.asset.v1.IExportAssetsRequest>,
+          protos.google.longrunning.IOperation|null|undefined,
+          {}|null|undefined>|undefined = callback
+      ? (error, response, rawResponse, _) => {
+          this._log.info('exportAssets response %j', rawResponse);
+          callback!(error, response, rawResponse, _); // We verified `callback` above.
+        }
+      : undefined;
+    this._log.info('exportAssets request %j', request);
+    return this.innerApiCalls.exportAssets(request, options, wrappedCallback)
+    ?.then(([response, rawResponse, _]: [
+      LROperation<protos.google.cloud.asset.v1.IExportAssetsResponse, protos.google.cloud.asset.v1.IExportAssetsRequest>,
+      protos.google.longrunning.IOperation|undefined, {}|undefined
+    ]) => {
+      this._log.info('exportAssets response %j', rawResponse);
+      return [response, rawResponse, _];
+    });
   }
 /**
  * Check the status of the long running operation returned by `exportAssets()`.
@@ -963,6 +1084,7 @@ export class AssetServiceClient {
  * region_tag:cloudasset_v1_generated_AssetService_ExportAssets_async
  */
   async checkExportAssetsProgress(name: string): Promise<LROperation<protos.google.cloud.asset.v1.ExportAssetsResponse, protos.google.cloud.asset.v1.ExportAssetsRequest>>{
+    this._log.info('exportAssets long-running');
     const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name});
     const [operation] = await this.operationsClient.getOperation(request);
     const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.exportAssets, this._gaxModule.createDefaultBackoffSettings());
@@ -1089,6 +1211,7 @@ export class AssetServiceClient {
   close(): Promise<void> {
     if (this.assetServiceStub && !this._terminated) {
       return this.assetServiceStub.then(stub => {
+        this._log.info('ending gRPC channel');
         this._terminated = true;
         stub.close();
         this.operationsClient.close();

baselines/asset-esm/package.json

@@ -73,7 +73,8 @@
     "samples-test": "cd samples/ && npm link ../ && npm i && npm test"
   },
   "dependencies": {
-    "google-gax": "^4.4.0"
+    "google-gax": "^4.4.0",
+    "google-logging-utils": "^1.0.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.6",

baselines/asset/package.json

@@ -35,7 +35,8 @@
     "test": "c8 mocha build/test"
   },
   "dependencies": {
-    "google-gax": "^4.4.0"
+    "google-gax": "^4.4.0",
+    "google-logging-utils": "^1.0.1"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.7",