Remove auto http instrumentation for privacy

Author: satyakigh

src/schema/GetSchemaTask.ts

@@ -3,7 +3,8 @@ import { Logger } from 'pino';
 import { AwsCredentials } from '../auth/AwsCredentials';
 import { DataStore } from '../datastore/DataStore';
 import { CfnService } from '../services/CfnService';
-import { Measure } from '../telemetry/TelemetryDecorator';
+import { ScopedTelemetry } from '../telemetry/ScopedTelemetry';
+import { Measure, Telemetry } from '../telemetry/TelemetryDecorator';
 import { AwsRegion } from '../utils/Region';
 import { downloadFile } from '../utils/RemoteDownload';
 import { PrivateSchemas, PrivateSchemasType } from './PrivateSchemas';
@@ -19,6 +20,9 @@ export abstract class GetSchemaTask {
 }
 
 export class GetPublicSchemaTask extends GetSchemaTask {
+    @Telemetry()
+    private readonly telemetry!: ScopedTelemetry;
+
     static readonly MaxAttempts = 3;
     private attempts = 0;
 
@@ -38,6 +42,7 @@ export class GetPublicSchemaTask extends GetSchemaTask {
         }
 
         this.attempts++;
+        this.telemetry.count(`getSchemas.${this.region}`, 1);
         const schemas = await this.getSchemas(this.region);
         const value: RegionalSchemasType = {
             version: RegionalSchemas.V1,

src/schema/SchemaRetriever.ts

@@ -2,7 +2,8 @@ import { DateTime } from 'luxon';
 import { SettingsConfigurable, ISettingsSubscriber, SettingsSubscription } from '../settings/ISettingsSubscriber';
 import { DefaultSettings, ProfileSettings } from '../settings/Settings';
 import { LoggerFactory } from '../telemetry/LoggerFactory';
-import { TelemetryService } from '../telemetry/TelemetryService';
+import { ScopedTelemetry } from '../telemetry/ScopedTelemetry';
+import { Telemetry } from '../telemetry/TelemetryDecorator';
 import { Closeable } from '../utils/Closeable';
 import { AwsRegion, getRegion } from '../utils/Region';
 import { CombinedSchemas } from './CombinedSchemas';
@@ -18,7 +19,9 @@ export class SchemaRetriever implements SettingsConfigurable, Closeable {
     private settingsSubscription?: SettingsSubscription;
     private settings: ProfileSettings = DefaultSettings.profile;
     private readonly log = LoggerFactory.getLogger(SchemaRetriever);
-    private readonly telemetry = TelemetryService.instance.get('SchemaRetriever');
+
+    @Telemetry()
+    private readonly telemetry!: ScopedTelemetry;
 
     constructor(
         private readonly schemaTaskManager: GetSchemaTaskManager,

src/telemetry/OTELInstrumentation.ts

@@ -77,13 +77,7 @@ export function otelSdk(clientId: string, client?: ClientInfo) {
                     enabled: false,
                 },
                 '@opentelemetry/instrumentation-http': {
-                    ignoreOutgoingRequestHook: (request) => {
-                        if (!request.hostname) {
-                            return false;
-                        }
-
-                        return telemetryUrl.includes(request.hostname);
-                    },
+                    enabled: false,
                 },
                 '@opentelemetry/instrumentation-runtime-node': {
                     monitoringPrecision: ExportIntervalSeconds * 1000,