Skip to content

Commit ef8e0ca

Browse files
committed
fix: prefer globalThis instead of window to support webworkers
There is no `window` in either WebWorkers and ServiceWorkers.
1 parent feea516 commit ef8e0ca

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
* Gets the environment variables
2626
*/
2727
export function getEnv(): Required<ENVIRONMENT> {
28-
const _window = window as typeof window & RAW_ENVIRONMENT;
29-
const globalEnv = parseEnvironment(_window);
28+
const _global = (typeof globalThis === 'object' ? globalThis : window) as typeof globalThis & RAW_ENVIRONMENT;
29+
const globalEnv = parseEnvironment(_global);
3030
return Object.assign({}, DEFAULT_ENVIRONMENT, globalEnv);
3131
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
import * as assert from 'assert';
18+
import { getEnv } from '../../../src/platform/browser/environment';
19+
20+
describe('getEnv', () => {
21+
it('get environs in window', () => {
22+
const env = getEnv();
23+
assert.strictEqual(typeof env, 'object');
24+
});
25+
});

0 commit comments

Comments
 (0)