Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/standalone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
6 changes: 2 additions & 4 deletions src/telemetry/OTELInstrumentation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -28,16 +28,14 @@ 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}`,
['service.env']: `${process.env.NODE_ENV}-${process.env.AWS_ENV}`,
['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: [],
Expand Down
2 changes: 2 additions & 0 deletions src/utils/Environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}` : ''}`;
Loading