Skip to content

Commit faeae98

Browse files
authored
feat(core): drop getEnv(), getEnvWithoutDefaults() (#5481)
1 parent d004d41 commit faeae98

File tree

10 files changed

+8
-619
lines changed

10 files changed

+8
-619
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,14 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
110110
* (user-facing): all configuration previously possible via `window.OTEL_*` is now not supported anymore
111111
* If you have been using the `envDetector` in browser environments, please migrate to manually creating a resource.
112112
* Note: Node.js environment variable configuration continues to work as-is.
113+
* feat(core)!: drop `getEnv()`, `getEnvWithoutDefaults()` [#5481](https://github.com/open-telemetry/opentelemetry-js/pull/5481) @pichlermarc
114+
* (user-facing): `getEnv()` has been replaced by `getStringFromEnv()`, `getNumberFromEnv()`, `getBooleanFromEnv()`, `getStringListFromEnv()`
115+
* these new functions do not include defaults, please inline any defaults if necessary (example: `getStringFromEnv("OTEL_FOO") ?? "my-default"`)
116+
* (user-facing): `getEnvWithoutDefaults()` has been replaced by `getStringFromEnv()`, `getNumberFromEnv()`, `getBooleanFromEnv()`, `getStringListFromEnv()`
117+
* (user-facing): `DEFAULT_ENVIRONMENT` has been removed, please inline any defaults from now on
118+
* (user-facing): `ENVIRONMENT` has been removed without replacement
119+
* (user-facing): `RAW_ENVIRONMENT` has been removed without replacement
120+
* (user-facing): `parseEnvironment` has been removed without replacement
113121

114122
### :rocket: (Enhancement)
115123

packages/opentelemetry-core/src/index.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ export { parseKeyPairsIntoRecord } from './baggage/utils';
4242
export {
4343
SDK_INFO,
4444
_globalThis,
45-
getEnv,
46-
getEnvWithoutDefaults,
4745
getStringFromEnv,
4846
getBooleanFromEnv,
4947
getNumberFromEnv,
@@ -77,12 +75,8 @@ export { TraceState } from './trace/TraceState';
7775
export {
7876
DEFAULT_ATTRIBUTE_COUNT_LIMIT,
7977
DEFAULT_ATTRIBUTE_VALUE_LENGTH_LIMIT,
80-
DEFAULT_ENVIRONMENT,
8178
DEFAULT_SPAN_ATTRIBUTE_PER_EVENT_COUNT_LIMIT,
8279
DEFAULT_SPAN_ATTRIBUTE_PER_LINK_COUNT_LIMIT,
83-
ENVIRONMENT,
84-
RAW_ENVIRONMENT,
85-
parseEnvironment,
8680
} from './utils/environment';
8781
export { merge } from './utils/merge';
8882
export { TimeoutError, callWithTimeout } from './utils/timeout';

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
import {
18-
DEFAULT_ENVIRONMENT,
19-
ENVIRONMENT,
20-
RAW_ENVIRONMENT,
21-
parseEnvironment,
22-
} from '../../utils/environment';
23-
import { _globalThis } from './globalThis';
24-
25-
/**
26-
* Gets the environment variables
27-
*/
28-
export function getEnv(): Required<ENVIRONMENT> {
29-
const globalEnv = parseEnvironment(
30-
_globalThis as typeof globalThis & RAW_ENVIRONMENT
31-
);
32-
return Object.assign({}, DEFAULT_ENVIRONMENT, globalEnv);
33-
}
34-
3517
export function getStringFromEnv(_: string): string | undefined {
3618
return undefined;
3719
}
@@ -47,7 +29,3 @@ export function getNumberFromEnv(_: string): boolean | undefined {
4729
export function getStringListFromEnv(_: string): string[] | undefined {
4830
return undefined;
4931
}
50-
51-
export function getEnvWithoutDefaults(): ENVIRONMENT {
52-
return parseEnvironment(_globalThis as typeof globalThis & RAW_ENVIRONMENT);
53-
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616

1717
export {
18-
getEnvWithoutDefaults,
19-
getEnv,
2018
getStringFromEnv,
2119
getBooleanFromEnv,
2220
getNumberFromEnv,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
export {
1717
SDK_INFO,
1818
_globalThis,
19-
getEnv,
20-
getEnvWithoutDefaults,
2119
otperformance,
2220
unrefTimer,
2321
getBooleanFromEnv,

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
import {
18-
DEFAULT_ENVIRONMENT,
19-
ENVIRONMENT,
20-
RAW_ENVIRONMENT,
21-
parseEnvironment,
22-
} from '../../utils/environment';
2317
import { diag } from '@opentelemetry/api';
2418
import { inspect } from 'util';
2519

26-
/**
27-
* Gets the environment variables
28-
*/
29-
export function getEnv(): Required<ENVIRONMENT> {
30-
const processEnv = parseEnvironment(process.env as RAW_ENVIRONMENT);
31-
return Object.assign({}, DEFAULT_ENVIRONMENT, processEnv);
32-
}
33-
3420
/**
3521
* Retrieves a number from an environment variable.
3622
* - Returns `undefined` if the environment variable is empty, unset, contains only whitespace, or is not a number.
@@ -117,7 +103,3 @@ export function getStringListFromEnv(key: string): string[] | undefined {
117103
.map(v => v.trim())
118104
.filter(s => s !== '');
119105
}
120-
121-
export function getEnvWithoutDefaults(): ENVIRONMENT {
122-
return parseEnvironment(process.env as RAW_ENVIRONMENT);
123-
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616

1717
export {
18-
getEnvWithoutDefaults,
19-
getEnv,
2018
getStringFromEnv,
2119
getBooleanFromEnv,
2220
getNumberFromEnv,

0 commit comments

Comments
 (0)