refactor: consolidate platform-specific code

CHANGELOG.md

@@ -31,6 +31,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
 * refactor(sdk-metrics): simplify AllowList and DenyList processors [#6159](https://github.com/open-telemetry/opentelemetry-js/pull/6159) @cjihrig
 * chore: disallow constructor parameter property syntax [#6187](https://github.com/open-telemetry/opentelemetry-js/pull/6187) @legendecas
 * refactor(sdk-metrics): use test() instead of match() in isValidName() [#6205](https://github.com/open-telemetry/opentelemetry-js/pull/6205) @cjihrig
+* refactor(core,resources): consolidate platform-specific code [#6208](https://github.com/open-telemetry/opentelemetry-js/pull/6208) @overbalance
 
 ## 2.2.0
 

packages/opentelemetry-core/src/platform/browser/index.ts

@@ -20,6 +20,9 @@ export {
   getNumberFromEnv,
   getStringListFromEnv,
 } from './environment';
-export { _globalThis } from './globalThis';
-export { otperformance } from './performance';
+export { _globalThis } from '../../common/globalThis';
 export { SDK_INFO } from './sdk-info';
+
+// Use global performance which is available in both Node.js (18+) and browsers
+export const otperformance: { now(): number; readonly timeOrigin: number } =
+  performance;

packages/opentelemetry-core/src/platform/node/index.ts

@@ -20,6 +20,9 @@ export {
   getNumberFromEnv,
   getStringListFromEnv,
 } from './environment';
-export { _globalThis } from './globalThis';
-export { otperformance } from './performance';
+export { _globalThis } from '../../common/globalThis';
 export { SDK_INFO } from './sdk-info';
+
+// Use global performance which is available in both Node.js (18+) and browsers
+export const otperformance: { now(): number; readonly timeOrigin: number } =
+  performance;

packages/opentelemetry-resources/package.json

@@ -6,10 +6,6 @@
   "module": "build/esm/index.js",
   "esnext": "build/esnext/index.js",
   "browser": {
-    "./src/platform/index.ts": "./src/platform/browser/index.ts",
-    "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js",
-    "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js",
-    "./build/src/platform/index.js": "./build/src/platform/browser/index.js",
     "./src/detectors/platform/index.ts": "./src/detectors/platform/browser/index.ts",
     "./build/esm/detectors/platform/index.js": "./build/esm/detectors/platform/browser/index.js",
     "./build/esnext/detectors/platform/index.js": "./build/esnext/detectors/platform/browser/index.js",

packages/opentelemetry-resources/src/ResourceImpl.ts

@@ -23,7 +23,7 @@ import {
   ATTR_TELEMETRY_SDK_VERSION,
 } from '@opentelemetry/semantic-conventions';
 import { Resource } from './Resource';
-import { defaultServiceName } from './platform';
+import { defaultServiceName } from './default-service-name';
 import {
   DetectedResource,
   DetectedResourceAttributes,

packages/opentelemetry-resources/src/platform/node/default-service-name.ts → packages/opentelemetry-resources/src/default-service-name.ts

@@ -14,6 +14,15 @@
  * limitations under the License.
  */
 
+// Check if we are in a Node.js environment and if so, use the process.argv0 property
+// to determine the default service name
+const DEFAULT_SERVICE_NAME =
+  typeof process === 'object' &&
+  typeof process.argv0 === 'string' &&
+  process.argv0.length > 0
+    ? `unknown_service:${process.argv0}`
+    : 'unknown_service';
+
 export function defaultServiceName(): string {
-  return `unknown_service:${process.argv0}`;
+  return DEFAULT_SERVICE_NAME;
 }

packages/opentelemetry-resources/src/index.ts

@@ -29,7 +29,7 @@ export {
   defaultResource,
   emptyResource,
 } from './ResourceImpl';
-export { defaultServiceName } from './platform';
+export { defaultServiceName } from './default-service-name';
 export type {
   ResourceDetector,
   DetectedResource,

packages/opentelemetry-resources/test/default-service-name.test.ts

@@ -0,0 +1,46 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as assert from 'assert';
+import { defaultServiceName } from '../src/default-service-name';
+
+const isNode = typeof process === 'object' && typeof process.argv0 === 'string';
+
+describe('defaultServiceName', () => {
+  it('returns unknown_service prefix', () => {
+    const serviceName = defaultServiceName();
+    assert.ok(serviceName.startsWith('unknown_service'));
+  });
+
+  if (isNode) {
+    it('includes process.argv0 in Node.js', () => {
+      const serviceName = defaultServiceName();
+      assert.ok(serviceName.startsWith('unknown_service:'));
+      assert.ok(serviceName.length > 'unknown_service:'.length);
+    });
+  } else {
+    it('returns plain unknown_service in browser', () => {
+      const serviceName = defaultServiceName();
+      assert.strictEqual(serviceName, 'unknown_service');
+    });
+  }
+
+  it('returns consistent value on multiple calls', () => {
+    const serviceName1 = defaultServiceName();
+    const serviceName2 = defaultServiceName();
+    assert.strictEqual(serviceName1, serviceName2);
+  });
+});