Skip to content

chore: changing all env params to be required #1328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
obecny merged 3 commits into from
Jul 21, 2020
Merged

chore: changing all env params to be required #1328

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2e20da
chore: changing all env params to be required
obecny Jul 18, 2020
e13a7a7
Merge branch 'master' into env_required
obecny Jul 18, 2020
c60d7db
Merge branch 'master' into env_required
obecny Jul 21, 2020
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
2 changes: 1 addition & 1 deletion packages/opentelemetry-core/src/platform/browser/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
/**
* Gets the environment variables
*/
export function getEnv(): ENVIRONMENT {
export function getEnv(): Required<ENVIRONMENT> {
const _window = window as typeof window & ENVIRONMENT_MAP;
const globalEnv = parseEnvironment(_window);
return Object.assign({}, DEFAULT_ENVIRONMENT, globalEnv);
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-core/src/platform/node/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
/**
* Gets the environment variables
*/
export function getEnv(): ENVIRONMENT {
export function getEnv(): Required<ENVIRONMENT> {
const processEnv = parseEnvironment(process.env as ENVIRONMENT_MAP);
return Object.assign({}, DEFAULT_ENVIRONMENT, processEnv);
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-core/src/utils/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const ENVIRONMENT_NUMBERS: Partial<keyof ENVIRONMENT>[] = [
/**
* Default environment variables
*/
export const DEFAULT_ENVIRONMENT: ENVIRONMENT = {
export const DEFAULT_ENVIRONMENT: Required<ENVIRONMENT> = {
OTEL_NO_PATCH_MODULES: '',
OTEL_LOG_LEVEL: LogLevel.ERROR,
OTEL_SAMPLING_PROBABILITY: 1,
Expand Down