Skip to content

Commit f9fb464

Browse files
committed
actually use nodesdk when node
1 parent 749ea17 commit f9fb464

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

e2e/opentelemetry/gateway.config.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ if (process.env['DISABLE_OPENTELEMETRY_SETUP'] !== '1') {
4444
});
4545

4646
// The NodeSDK only actually work in Node. For other envs, it's better to use our own configurator
47-
const runner = process.env['E2E_GATEWAY_RUNNER'];
48-
if (runner === 'node' || runner === 'docker') {
47+
if (
48+
typeof process !== 'undefined' &&
49+
process.versions &&
50+
process.versions.node
51+
) {
4952
const sdk = new NodeSDK({
5053
// Use spanProcessor instead of spanExporter to remove batching for test speed
5154
spanProcessors: [new tracing.SimpleSpanProcessor(exporter)],

e2e/opentelemetry/opentelemetry.e2e.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os from 'os';
22
import { createExampleSetup, createTenv, type Container } from '@internal/e2e';
3-
import { isCI } from '@internal/testing';
3+
import { isCI, isNode } from '@internal/testing';
44
import { fetch } from '@whatwg-node/fetch';
55
import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
66

@@ -639,7 +639,7 @@ describe('OpenTelemetry', () => {
639639
return expect(tags).toContainEqual({ key, value });
640640
});
641641

642-
if (gatewayRunner === 'node' || gatewayRunner === 'docker') {
642+
if (isNode()) {
643643
const expectedTags = [
644644
'process.owner',
645645
'host.arch',
@@ -753,7 +753,7 @@ describe('OpenTelemetry', () => {
753753
return expect(tags).toContainEqual({ key, value });
754754
});
755755

756-
if (gatewayRunner === 'node' || gatewayRunner === 'docker') {
756+
if (isNode()) {
757757
const expectedTags = [
758758
'process.owner',
759759
'host.arch',

internal/env/src/node.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,10 @@ export function isNotPlatform(...platforms: NodeJS.Platform[]): boolean {
1818
}
1919
return true;
2020
}
21+
22+
/** Returns `true` if the runtime environment is Node.js. */
23+
export function isNode() {
24+
return (
25+
typeof process !== 'undefined' && process.versions && process.versions.node
26+
);
27+
}

0 commit comments

Comments
 (0)