Skip to content

refactor(otlp-exporter-base): use getStringFromEnv instead of process.env #5594

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
merged 9 commits into from
Aug 22, 2025
Merged

refactor(otlp-exporter-base): use getStringFromEnv instead of process.env #5594

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fe0dc65
refactor: use `getStringFromEnv` instead of `process.env`
weyert Apr 6, 2025
e60acc0
style: resolve linting issues regarding code format
weyert Apr 6, 2025
c45bc69
chore: add missing CHANGELOG entry to package
weyert Apr 6, 2025
5736405
Merge branch 'main' into contribfest-exporter-otlp-http
weyert Apr 6, 2025
ad24bb5
chore: update experimental/CHANGELOG.md
weyert Apr 7, 2025
8731dae
Merge branch 'main' into contribfest-exporter-otlp-http
weyert Apr 10, 2025
0ed3f26
Merge branch 'main' into contribfest-exporter-otlp-http
trentm Aug 22, 2025
af25954
simplify test, knowing `undefined` return from getStringFromEnv
trentm Aug 22, 2025
321a1be
simplify test, knowing `undefined` return from getStringFromEnv
trentm Aug 22, 2025
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
1 change: 1 addition & 0 deletions experimental/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2

### :house: Internal

* refactor: use getStringFromEnv instead of process.env [#5594](https://github.com/open-telemetry/opentelemetry-js/pull/5594) @weyert
* chore(sdk-node): Refactored using `get*FromEnv` utility function instead of `process.env` for NodeSDK's logging setup. [#5563](https://github.com/open-telemetry/opentelemetry-js/issues/5563) @weyert

## 0.200.0
Expand Down
19 changes: 11 additions & 8 deletions experimental/packages/otlp-exporter-base/src/configuration/otlp-http-env-configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -22,10 +22,12 @@ import { wrapStaticHeadersInFunction } from './shared-configuration';
function getStaticHeadersFromEnv(
signalIdentifier: string
): Record<string, string> | 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
Expand Down Expand Up @@ -98,16 +100,17 @@ function appendResourcePathToUrl(
function getNonSpecificUrlFromEnv(
signalResourcePath: string
): string | undefined {
const envUrl = process.env.OTEL_EXPORTER_OTLP_ENDPOINT?.trim();
const envUrl = getStringFromEnv('OTEL_EXPORTER_OTLP_ENDPOINT');
if (envUrl == null || envUrl === '') {
return undefined;
}
return appendResourcePathToUrl(envUrl, signalResourcePath);
}

function getSpecificUrlFromEnv(signalIdentifier: string): string | undefined {
const envUrl =
process.env[`OTEL_EXPORTER_OTLP_${signalIdentifier}_ENDPOINT`]?.trim();
const envUrl = getStringFromEnv(
`OTEL_EXPORTER_OTLP_${signalIdentifier}_ENDPOINT`
);
if (envUrl == null || envUrl === '') {
return undefined;
}
Expand Down