15
15
*/
16
16
import { UnresolvedOtlpGrpcConfiguration } from './otlp-grpc-configuration' ;
17
17
import type { ChannelCredentials , Metadata } from '@grpc/grpc-js' ;
18
- import { parseKeyPairsIntoRecord } from '@opentelemetry/core' ;
18
+ import { getStringFromEnv , parseKeyPairsIntoRecord } from '@opentelemetry/core' ;
19
19
import {
20
20
createEmptyMetadata ,
21
21
createInsecureCredentials ,
@@ -43,9 +43,9 @@ function fallbackIfNullishOrBlank(
43
43
44
44
function getMetadataFromEnv ( signalIdentifier : string ) : Metadata | undefined {
45
45
const signalSpecificRawHeaders =
46
- process . env [ `OTEL_EXPORTER_OTLP_${ signalIdentifier } _HEADERS` ] ?. trim ( ) ;
46
+ getStringFromEnv ( `OTEL_EXPORTER_OTLP_${ signalIdentifier } _HEADERS` ) ;
47
47
const nonSignalSpecificRawHeaders =
48
- process . env [ 'OTEL_EXPORTER_OTLP_HEADERS' ] ?. trim ( ) ;
48
+ getStringFromEnv ( 'OTEL_EXPORTER_OTLP_HEADERS' ) ;
49
49
50
50
const signalSpecificHeaders = parseKeyPairsIntoRecord (
51
51
signalSpecificRawHeaders
@@ -100,9 +100,9 @@ function getUrlFromEnv(signalIdentifier: string) {
100
100
// - https://example.test:4317 -> use secure credentials from environment (or provided via code)
101
101
102
102
const specificEndpoint =
103
- process . env [ `OTEL_EXPORTER_OTLP_${ signalIdentifier } _ENDPOINT` ] ?. trim ( ) ;
103
+ getStringFromEnv ( `OTEL_EXPORTER_OTLP_${ signalIdentifier } _ENDPOINT` ) ;
104
104
const nonSpecificEndpoint =
105
- process . env [ `OTEL_EXPORTER_OTLP_ENDPOINT` ] ?. trim ( ) ;
105
+ getStringFromEnv ( `OTEL_EXPORTER_OTLP_ENDPOINT` ) ;
106
106
107
107
return fallbackIfNullishOrBlank ( specificEndpoint , nonSpecificEndpoint ) ;
108
108
}
@@ -128,16 +128,12 @@ function getUrlFromEnv(signalIdentifier: string) {
128
128
* @param signalIdentifier
129
129
*/
130
130
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 (
137
134
`OTEL_EXPORTER_OTLP_INSECURE`
138
- ]
139
- ?. toLowerCase ( )
140
- . trim ( ) ;
135
+ )
136
+ ?. toLowerCase ( ) ;
141
137
142
138
return (
143
139
fallbackIfNullishOrBlank (
@@ -152,8 +148,8 @@ function readFileFromEnv(
152
148
nonSignalSpecificEnvVar : string ,
153
149
warningMessage : string
154
150
) : 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 ) ;
157
153
158
154
const filePath = fallbackIfNullishOrBlank (
159
155
signalSpecificPath ,
0 commit comments