diff --git a/src/app/standalone.ts b/src/app/standalone.ts index 8c2a71e9..89331278 100644 --- a/src/app/standalone.ts +++ b/src/app/standalone.ts @@ -6,7 +6,7 @@ import { LspConnection } from '../protocol/LspConnection'; import { ExtendedInitializeParams } from '../server/InitParams'; import { LoggerFactory } from '../telemetry/LoggerFactory'; import { TelemetryService } from '../telemetry/TelemetryService'; -import { AwsEnv, NodeEnv } from '../utils/Environment'; +import { AwsEnv, NodeEnv, ProcessPlatform } from '../utils/Environment'; import { ExtensionName } from '../utils/ExtensionConfig'; let server: unknown; @@ -33,7 +33,7 @@ async function onInitialize(params: ExtendedInitializeParams) { ); getLogger().info({ Machine: `${type()}-${platform()}-${arch()}-${machine()}-${release()}`, - Process: `${process.platform}-${process.arch}`, + 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); diff --git a/src/telemetry/OTELInstrumentation.ts b/src/telemetry/OTELInstrumentation.ts index ade1bc0b..05b2e505 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 } from '../utils/Environment'; +import { isBeta, isAlpha, isProd, isTest, ProcessPlatform } from '../utils/Environment'; import { ExtensionId, ExtensionVersion } from '../utils/ExtensionConfig'; const ExportIntervalSeconds = 60; @@ -28,8 +28,6 @@ export function otelSdk(clientId: string, client?: ClientInfo) { exportIntervalMillis: ExportIntervalSeconds * 1000, }); - const buildTarget = process.env.BUILD_TARGET ? `-${process.env.BUILD_TARGET}` : ''; - const sdk = new NodeSDK({ resource: resourceFromAttributes({ ['service']: `${ExtensionId}-${ExtensionVersion}`, @@ -37,7 +35,7 @@ export function otelSdk(clientId: string, client?: ClientInfo) { ['client.id']: clientId, ['client.type']: `${client?.name ?? 'Unknown'}-${client?.version ?? 'Unknown'}`, ['machine.type']: `${type()}-${platform()}-${arch()}-${machine()}-${release()}`, - ['process.type']: `${process.platform}${buildTarget}-${process.arch}`, + ['process.type']: `${ProcessPlatform}-${process.arch}`, ['process.version']: `node=${process.versions.node} v8=${process.versions.v8} uv=${process.versions.uv} modules=${process.versions.modules}`, }), resourceDetectors: [], diff --git a/src/utils/Environment.ts b/src/utils/Environment.ts index 56d8fb76..0f9f5aaa 100644 --- a/src/utils/Environment.ts +++ b/src/utils/Environment.ts @@ -68,3 +68,5 @@ function getNodeEnv() { export const isWindows = process.platform === 'win32'; export const isMac = process.platform === 'darwin'; export const isLinux = process.platform === 'linux'; + +export const ProcessPlatform = `${process.platform}${process.env.BUILD_TARGET ? `-${process.env.BUILD_TARGET}` : ''}`;