refactor(gax): organize observability utilities into util, contextUtil, and errorUtil

core/packages/gax/src/createApiCall.ts

@@ -39,13 +39,15 @@ import {warn} from './warnings';
 import {
   traceCall,
   traceAttempt,
+  ResendRecorder,
+} from './observability/TracerHelper';
+import {checkTelemetryEnabled} from './observability/util';
+import {
   StaticTraceContext,
   DynamicTraceContext,
   AttemptTraceContext,
-  ResendRecorder,
-} from './observability/TracerHelper';
-import {resolveStaticTraceContext} from './observability/metadataResolver';
-import {checkTelemetryEnabled} from './util';
+  resolveStaticTraceContext,
+} from './observability/contextUtil';
 
 /**
  * Converts an rpc call into an API call governed by the settings.

core/packages/gax/src/fallback.ts

@@ -32,7 +32,7 @@ import {isNodeJS} from './featureDetection';
 import {generateServiceStub} from './fallbackServiceStub';
 import {StreamType} from './streamingCalls/streaming';
 import {toLowerCamelCase} from './util';
-import {StaticTraceContext} from './observability/TracerHelper';
+import {StaticTraceContext} from './observability/contextUtil';
 import {google} from '../protos/http';
 import * as IamProtos from '../protos/iam_service';
 import * as LocationProtos from '../protos/locations';

core/packages/gax/src/gax.ts

@@ -23,8 +23,9 @@ import type {ResumableUploadContext} from './resumableUpload';
 import {warn} from './warnings';
 import {GoogleError} from './googleError';
 import {BundleOptions} from './bundlingCalls/bundleExecutor';
-import {toLowerCamelCase, checkTelemetryEnabled} from './util';
-import {StaticTraceContext} from './observability/TracerHelper';
+import {toLowerCamelCase} from './util';
+import {checkTelemetryEnabled} from './observability/util';
+import {StaticTraceContext} from './observability/contextUtil';
 import {Status} from './status';
 import {RequestType} from './apitypes';
 

core/packages/gax/src/grpc.ts

@@ -27,7 +27,7 @@ import * as protobuf from 'protobufjs';
 import objectHash from 'object-hash';
 
 import * as gax from './gax';
-import {StaticTraceContext} from './observability/TracerHelper';
+import {StaticTraceContext} from './observability/contextUtil';
 import {ClientOptions} from '@grpc/grpc-js/build/src/client';
 
 const googleProtoFilesDir = path.join(__dirname, '..', '..', 'build', 'protos');

core/packages/gax/src/index.ts

@@ -126,18 +126,15 @@ export {
   PaginationResponse,
 } from './clientInterface';
 
-export {
-  makeUUID,
-  decodeAnyProtosInArray,
-  decodeProtobufAny,
-  checkTelemetryEnabled,
-} from './util';
+export {makeUUID, decodeAnyProtosInArray, decodeProtobufAny} from './util';
 
-export {StaticTraceContext, traceCall} from './observability/TracerHelper';
+export {checkTelemetryEnabled} from './observability/util';
 export {
+  StaticTraceContext,
   resolveStaticTraceContext,
   clearMetadataCache,
-} from './observability/metadataResolver';
+} from './observability/contextUtil';
+export {traceCall} from './observability/TracerHelper';
 
 export {ServiceError, ChannelCredentials} from '@grpc/grpc-js';
 export {warn} from './warnings';