fix(grpc-exporter): use simplified syntax to determine url

open-telemetry · Jun 8, 2022 · 743aa7c · 743aa7c
1 parent d41f92a
commit 743aa7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/experimental/packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts
@@ -62,12 +62,10 @@ export class OTLPTraceExporter
   getUrlFromConfig(config: OTLPGRPCExporterConfigNode): string {
     if (typeof config.url === 'string') {
       return config.url;
-    } else if (getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT.length > 0) {
-      return getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT;
-    } else if (getEnv().OTEL_EXPORTER_OTLP_ENDPOINT.length > 0) {
-      return getEnv().OTEL_EXPORTER_OTLP_ENDPOINT;
-    } else {
-      return DEFAULT_COLLECTOR_URL;
     }
+
+    return getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||
+      getEnv().OTEL_EXPORTER_OTLP_ENDPOINT ||
+      DEFAULT_COLLECTOR_URL;
   }
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts
@@ -61,13 +61,11 @@ class OTLPMetricExporterProxy extends OTLPGRPCExporterNodeBase<ResourceMetrics,
   getUrlFromConfig(config: OTLPGRPCExporterConfigNode): string {
     if (typeof config.url === 'string') {
       return config.url;
-    } else if (getEnv().OTEL_EXPORTER_OTLP_METRICS_ENDPOINT.length > 0) {
-      return getEnv().OTEL_EXPORTER_OTLP_METRICS_ENDPOINT;
-    } else if (getEnv().OTEL_EXPORTER_OTLP_ENDPOINT.length > 0) {
-      return getEnv().OTEL_EXPORTER_OTLP_ENDPOINT;
-    } else {
-      return DEFAULT_COLLECTOR_URL;
     }
+
+    return getEnv().OTEL_EXPORTER_OTLP_METRICS_ENDPOINT ||
+      getEnv().OTEL_EXPORTER_OTLP_ENDPOINT ||
+      DEFAULT_COLLECTOR_URL;
   }
 }