Skip to content

Commit 1216ea4

Browse files
committed
refactor: use getStringFromEnv instead of process.env
Updates the code to user the helper utilities to retrieve environment variable values fixes open-telemetry#5560 Signed-off-by: Weyert de Boer <wdb@innerfuse.biz>
1 parent 390243e commit 1216ea4

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-env-configuration.ts

+12-16
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
import { UnresolvedOtlpGrpcConfiguration } from './otlp-grpc-configuration';
1717
import type { ChannelCredentials, Metadata } from '@grpc/grpc-js';
18-
import { parseKeyPairsIntoRecord } from '@opentelemetry/core';
18+
import { getStringFromEnv, parseKeyPairsIntoRecord } from '@opentelemetry/core';
1919
import {
2020
createEmptyMetadata,
2121
createInsecureCredentials,
@@ -43,9 +43,9 @@ function fallbackIfNullishOrBlank(
4343

4444
function getMetadataFromEnv(signalIdentifier: string): Metadata | undefined {
4545
const signalSpecificRawHeaders =
46-
process.env[`OTEL_EXPORTER_OTLP_${signalIdentifier}_HEADERS`]?.trim();
46+
getStringFromEnv(`OTEL_EXPORTER_OTLP_${signalIdentifier}_HEADERS`);
4747
const nonSignalSpecificRawHeaders =
48-
process.env['OTEL_EXPORTER_OTLP_HEADERS']?.trim();
48+
getStringFromEnv('OTEL_EXPORTER_OTLP_HEADERS');
4949

5050
const signalSpecificHeaders = parseKeyPairsIntoRecord(
5151
signalSpecificRawHeaders
@@ -100,9 +100,9 @@ function getUrlFromEnv(signalIdentifier: string) {
100100
// - https://example.test:4317 -> use secure credentials from environment (or provided via code)
101101

102102
const specificEndpoint =
103-
process.env[`OTEL_EXPORTER_OTLP_${signalIdentifier}_ENDPOINT`]?.trim();
103+
getStringFromEnv(`OTEL_EXPORTER_OTLP_${signalIdentifier}_ENDPOINT`);
104104
const nonSpecificEndpoint =
105-
process.env[`OTEL_EXPORTER_OTLP_ENDPOINT`]?.trim();
105+
getStringFromEnv(`OTEL_EXPORTER_OTLP_ENDPOINT`);
106106

107107
return fallbackIfNullishOrBlank(specificEndpoint, nonSpecificEndpoint);
108108
}
@@ -128,16 +128,12 @@ function getUrlFromEnv(signalIdentifier: string) {
128128
* @param signalIdentifier
129129
*/
130130
function getInsecureSettingFromEnv(signalIdentifier: string): boolean {
131-
const signalSpecificInsecureValue = process.env[
132-
`OTEL_EXPORTER_OTLP_${signalIdentifier}_INSECURE`
133-
]
134-
?.toLowerCase()
135-
.trim();
136-
const nonSignalSpecificInsecureValue = process.env[
131+
const signalSpecificInsecureValue = getStringFromEnv(
132+
`OTEL_EXPORTER_OTLP_${signalIdentifier}_INSECURE`)?.toLowerCase();
133+
const nonSignalSpecificInsecureValue = getStringFromEnv(
137134
`OTEL_EXPORTER_OTLP_INSECURE`
138-
]
139-
?.toLowerCase()
140-
.trim();
135+
)
136+
?.toLowerCase();
141137

142138
return (
143139
fallbackIfNullishOrBlank(
@@ -152,8 +148,8 @@ function readFileFromEnv(
152148
nonSignalSpecificEnvVar: string,
153149
warningMessage: string
154150
): Buffer | undefined {
155-
const signalSpecificPath = process.env[signalSpecificEnvVar]?.trim();
156-
const nonSignalSpecificPath = process.env[nonSignalSpecificEnvVar]?.trim();
151+
const signalSpecificPath = getStringFromEnv(signalSpecificEnvVar);
152+
const nonSignalSpecificPath = getStringFromEnv(nonSignalSpecificEnvVar);
157153

158154
const filePath = fallbackIfNullishOrBlank(
159155
signalSpecificPath,

0 commit comments

Comments
 (0)