diff --git a/src/app/standalone.ts b/src/app/standalone.ts index 89331278..671e228d 100644 --- a/src/app/standalone.ts +++ b/src/app/standalone.ts @@ -7,7 +7,7 @@ import { ExtendedInitializeParams } from '../server/InitParams'; import { LoggerFactory } from '../telemetry/LoggerFactory'; import { TelemetryService } from '../telemetry/TelemetryService'; import { AwsEnv, NodeEnv, ProcessPlatform } from '../utils/Environment'; -import { ExtensionName } from '../utils/ExtensionConfig'; +import { ExtensionId, ExtensionName, ExtensionVersion } from '../utils/ExtensionConfig'; let server: unknown; @@ -19,9 +19,12 @@ async function onInitialize(params: ExtendedInitializeParams) { getLogger().info( { + Service: `${ExtensionId}-${ExtensionVersion}`, + Environment: `${NodeEnv}-${AwsEnv}`, + Process: `${ProcessPlatform}-${process.arch}`, + Machine: `${type()}-${platform()}-${arch()}-${machine()}-${release()}`, + Runtime: `node=${process.versions.node} v8=${process.versions.v8} uv=${process.versions.uv} modules=${process.versions.modules}`, ClientInfo, - NodeEnv, - AwsEnv, aws: { clientInfo: AwsMetadata?.clientInfo, telemetryEnabled: AwsMetadata?.telemetryEnabled, @@ -31,11 +34,6 @@ async function onInitialize(params: ExtendedInitializeParams) { }, `${ExtensionName} initializing...`, ); - getLogger().info({ - Machine: `${type()}-${platform()}-${arch()}-${machine()}-${release()}`, - Process: `${ProcessPlatform}-${process.arch}`, - Runtime: `node=${process.versions.node} v8=${process.versions.v8} uv=${process.versions.uv} modules=${process.versions.modules}`, - }); TelemetryService.initialize(ClientInfo, AwsMetadata); // Dynamically load these modules so that OTEL can instrument all the libraries first diff --git a/src/telemetry/OTELInstrumentation.ts b/src/telemetry/OTELInstrumentation.ts index 05b2e505..dc8bc0a6 100644 --- a/src/telemetry/OTELInstrumentation.ts +++ b/src/telemetry/OTELInstrumentation.ts @@ -11,7 +11,7 @@ import { } from '@opentelemetry/sdk-metrics'; import { NodeSDK } from '@opentelemetry/sdk-node'; import { ClientInfo } from '../server/InitParams'; -import { isBeta, isAlpha, isProd, isTest, ProcessPlatform } from '../utils/Environment'; +import { isBeta, isAlpha, isProd, isTest, ProcessPlatform, NodeEnv, AwsEnv } from '../utils/Environment'; import { ExtensionId, ExtensionVersion } from '../utils/ExtensionConfig'; const ExportIntervalSeconds = 60; @@ -31,7 +31,7 @@ export function otelSdk(clientId: string, client?: ClientInfo) { const sdk = new NodeSDK({ resource: resourceFromAttributes({ ['service']: `${ExtensionId}-${ExtensionVersion}`, - ['service.env']: `${process.env.NODE_ENV}-${process.env.AWS_ENV}`, + ['service.env']: `${NodeEnv}-${AwsEnv}`, ['client.id']: clientId, ['client.type']: `${client?.name ?? 'Unknown'}-${client?.version ?? 'Unknown'}`, ['machine.type']: `${type()}-${platform()}-${arch()}-${machine()}-${release()}`,