diff --git a/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-node-http-options.ts b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-node-http-options.ts index 1c703720e..e77a0327c 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-node-http-options.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-node-http-options.ts @@ -56,7 +56,7 @@ export function convertLegacyHttpOptions( signalIdentifier: string, signalResourcePath: string, requiredHeaders: Record -): OtlpNodeHttpConfiguration { +): Required { // eslint-disable-next-line @typescript-eslint/no-explicit-any if ((config as any).metadata) { diag.warn('Metadata cannot be set when using http'); diff --git a/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-configuration.ts b/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-configuration.ts index e2f2c8253..aa24fa5e9 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-configuration.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-configuration.ts @@ -46,7 +46,7 @@ export interface OtlpNodeHttpConfiguration extends OtlpHttpConfiguration { * Ref: https://github.com/open-telemetry/opentelemetry-specification/pull/4654 * Ref: https://opentelemetry.io/docs/specs/otel/protocol/exporter/#user-agent */ - userAgent: string; + userAgent?: string; } export function httpAgentFactoryFromOptions( @@ -67,8 +67,8 @@ export function httpAgentFactoryFromOptions( export function mergeOtlpNodeHttpConfigurationWithDefaults( userProvidedConfiguration: Partial, fallbackConfiguration: Partial, - defaultConfiguration: OtlpNodeHttpConfiguration -): OtlpNodeHttpConfiguration { + defaultConfiguration: Required +): Required { let userAgent = defaultConfiguration.userAgent; if (userProvidedConfiguration.userAgent) { userAgent = `${userProvidedConfiguration.userAgent} ${userAgent}`; @@ -90,7 +90,7 @@ export function mergeOtlpNodeHttpConfigurationWithDefaults( export function getNodeHttpConfigurationDefaults( requiredHeaders: Record, signalResourcePath: string -): OtlpNodeHttpConfiguration { +): Required { return { ...getHttpConfigurationDefaults(requiredHeaders, signalResourcePath), agentFactory: httpAgentFactoryFromOptions({ keepAlive: true }), diff --git a/experimental/packages/otlp-exporter-base/src/otlp-http-export-delegate.ts b/experimental/packages/otlp-exporter-base/src/otlp-http-export-delegate.ts index 10ddb9723..3411c941f 100644 --- a/experimental/packages/otlp-exporter-base/src/otlp-http-export-delegate.ts +++ b/experimental/packages/otlp-exporter-base/src/otlp-http-export-delegate.ts @@ -24,7 +24,7 @@ import { createRetryingTransport } from './retrying-transport'; import { OtlpNodeHttpConfiguration } from './configuration/otlp-node-http-configuration'; export function createOtlpHttpExportDelegate( - options: OtlpNodeHttpConfiguration, + options: Required, serializer: ISerializer ): IOtlpExportDelegate { return createOtlpExportDelegate( diff --git a/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-configuration.test.ts b/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-configuration.test.ts index cb268ba7f..5b88f4e4e 100644 --- a/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-configuration.test.ts +++ b/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-configuration.test.ts @@ -18,7 +18,7 @@ import { mergeOtlpNodeHttpConfigurationWithDefaults } from '../../../src/configu import { OtlpNodeHttpConfiguration } from '../../../src/configuration/otlp-node-http-configuration'; describe('mergeOtlpNodeHttpConfigurationWithDefaults', function () { - const testDefaults: OtlpNodeHttpConfiguration = { + const testDefaults: Required = { url: 'http://default.example.test', timeoutMillis: 1, compression: 'none',