diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 05630c3a470..ed3e22ec384 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -27,6 +27,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2 ### :house: Internal +* refactor(otlp-exporter-base): use getStringFromEnv instead of process.env [#5594](https://github.com/open-telemetry/opentelemetry-js/pull/5594) @weyert * chore(sdk-logs): refactored imports [#5801](https://github.com/open-telemetry/opentelemetry-js/pull/5801) @svetlanabrennan ## 0.203.0 diff --git a/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-env-configuration.ts b/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-env-configuration.ts index 220eb57a1b7..f8c2c7a3cf8 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-env-configuration.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-env-configuration.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { parseKeyPairsIntoRecord } from '@opentelemetry/core'; +import { getStringFromEnv, parseKeyPairsIntoRecord } from '@opentelemetry/core'; import { diag } from '@opentelemetry/api'; import { getSharedConfigurationFromEnvironment } from './shared-env-configuration'; import { OtlpHttpConfiguration } from './otlp-http-configuration'; @@ -22,10 +22,12 @@ import { wrapStaticHeadersInFunction } from './shared-configuration'; function getStaticHeadersFromEnv( signalIdentifier: string ): Record | undefined { - const signalSpecificRawHeaders = - process.env[`OTEL_EXPORTER_OTLP_${signalIdentifier}_HEADERS`]?.trim(); - const nonSignalSpecificRawHeaders = - process.env['OTEL_EXPORTER_OTLP_HEADERS']?.trim(); + const signalSpecificRawHeaders = getStringFromEnv( + `OTEL_EXPORTER_OTLP_${signalIdentifier}_HEADERS` + ); + const nonSignalSpecificRawHeaders = getStringFromEnv( + 'OTEL_EXPORTER_OTLP_HEADERS' + ); const signalSpecificHeaders = parseKeyPairsIntoRecord( signalSpecificRawHeaders @@ -98,17 +100,18 @@ function appendResourcePathToUrl( function getNonSpecificUrlFromEnv( signalResourcePath: string ): string | undefined { - const envUrl = process.env.OTEL_EXPORTER_OTLP_ENDPOINT?.trim(); - if (envUrl == null || envUrl === '') { + const envUrl = getStringFromEnv('OTEL_EXPORTER_OTLP_ENDPOINT'); + if (envUrl === undefined) { return undefined; } return appendResourcePathToUrl(envUrl, signalResourcePath); } function getSpecificUrlFromEnv(signalIdentifier: string): string | undefined { - const envUrl = - process.env[`OTEL_EXPORTER_OTLP_${signalIdentifier}_ENDPOINT`]?.trim(); - if (envUrl == null || envUrl === '') { + const envUrl = getStringFromEnv( + `OTEL_EXPORTER_OTLP_${signalIdentifier}_ENDPOINT` + ); + if (envUrl === undefined) { return undefined; } return appendRootPathToUrlIfNeeded(envUrl);