chore: normalizing env settings url

open-telemetry · May 19, 2021 · f862630 · f862630
1 parent 504be46
commit f862630
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/opentelemetry-exporter-collector-grpc/src/CollectorMetricExporter.ts b/packages/opentelemetry-exporter-collector-grpc/src/CollectorMetricExporter.ts
@@ -53,9 +53,9 @@ export class CollectorMetricExporter
     return typeof config.url === 'string'
       ? validateAndNormalizeUrl(config.url)
       : getEnv().OTEL_EXPORTER_OTLP_METRICS_ENDPOINT.length > 0
-      ? getEnv().OTEL_EXPORTER_OTLP_METRICS_ENDPOINT
+      ? validateAndNormalizeUrl(getEnv().OTEL_EXPORTER_OTLP_METRICS_ENDPOINT)
       : getEnv().OTEL_EXPORTER_OTLP_ENDPOINT.length > 0
-      ? getEnv().OTEL_EXPORTER_OTLP_ENDPOINT
+      ? validateAndNormalizeUrl(getEnv().OTEL_EXPORTER_OTLP_ENDPOINT)
       : DEFAULT_COLLECTOR_URL;
   }
 

diff --git a/packages/opentelemetry-exporter-collector-grpc/src/CollectorTraceExporter.ts b/packages/opentelemetry-exporter-collector-grpc/src/CollectorTraceExporter.ts
@@ -46,9 +46,9 @@ export class CollectorTraceExporter
     return typeof config.url === 'string'
       ? validateAndNormalizeUrl(config.url)
       : getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT.length > 0
-      ? getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+      ? validateAndNormalizeUrl(getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT)
       : getEnv().OTEL_EXPORTER_OTLP_ENDPOINT.length > 0
-      ? getEnv().OTEL_EXPORTER_OTLP_ENDPOINT
+      ? validateAndNormalizeUrl(getEnv().OTEL_EXPORTER_OTLP_ENDPOINT)
       : DEFAULT_COLLECTOR_URL;
   }
 

diff --git a/packages/opentelemetry-exporter-collector-grpc/test/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector-grpc/test/CollectorMetricExporter.test.ts
@@ -266,7 +266,7 @@ describe('when configuring via environment', () => {
     const collectorExporter = new CollectorMetricExporter();
     assert.strictEqual(
       collectorExporter.url,
-      envSource.OTEL_EXPORTER_OTLP_ENDPOINT
+      'foo.bar'
     );
     envSource.OTEL_EXPORTER_OTLP_ENDPOINT = '';
   });
@@ -276,7 +276,7 @@ describe('when configuring via environment', () => {
     const collectorExporter = new CollectorMetricExporter();
     assert.strictEqual(
       collectorExporter.url,
-      envSource.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT
+      'foo.metrics'
     );
     envSource.OTEL_EXPORTER_OTLP_ENDPOINT = '';
     envSource.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT = '';

diff --git a/packages/opentelemetry-exporter-collector-grpc/test/CollectorTraceExporter.test.ts b/packages/opentelemetry-exporter-collector-grpc/test/CollectorTraceExporter.test.ts
@@ -228,7 +228,7 @@ describe('when configuring via environment', () => {
     const collectorExporter = new CollectorTraceExporter();
     assert.strictEqual(
       collectorExporter.url,
-      envSource.OTEL_EXPORTER_OTLP_ENDPOINT
+      'foo.bar'
     );
     envSource.OTEL_EXPORTER_OTLP_ENDPOINT = '';
   });
@@ -238,7 +238,7 @@ describe('when configuring via environment', () => {
     const collectorExporter = new CollectorTraceExporter();
     assert.strictEqual(
       collectorExporter.url,
-      envSource.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+      'foo.traces'
     );
     envSource.OTEL_EXPORTER_OTLP_ENDPOINT = '';
     envSource.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = '';