fix tests by moving serverAddress checks earlier

open-telemetry · Apr 20, 2021 · edcb871 · edcb871
1 parent 28b16d3
commit edcb871
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts
@@ -26,6 +26,7 @@ import {
   ServiceClientType,
 } from './types';
 import { ServiceClient } from './types';
+import { fixUrl } from './util';
 
 /**
  * Collector Metric Exporter abstract base class
@@ -41,13 +42,16 @@ export abstract class CollectorExporterNodeBase<
   grpcQueue: GRPCQueueItem<ExportItem>[] = [];
   metadata?: Metadata;
   serviceClient?: ServiceClient = undefined;
+  private serverAddress!: string;
   private _send!: Function;
 
   constructor(config: CollectorExporterConfigNode = {}) {
     super(config);
     if (config.headers) {
       diag.warn('Headers cannot be set when using grpc');
     }
+
+    this.serverAddress = fixUrl(this.url)
     this.metadata = config.metadata;
   }
   private _sendPromise(

diff --git a/packages/opentelemetry-exporter-collector-grpc/src/util.ts b/packages/opentelemetry-exporter-collector-grpc/src/util.ts
@@ -32,10 +32,6 @@ export function onInit<ExportItem, ServiceRequest>(
   config: CollectorExporterConfigNode
 ): void {
   collector.grpcQueue = [];
-  const serverAddress = removeProtocol(collector.url);
-  if (collector.url.includes('/')) {
-    diag.warn('URL path cannot be set when using grpc');
-  }
   const credentials: grpc.ChannelCredentials =
     config.credentials || grpc.credentials.createInsecure();
 
@@ -55,12 +51,12 @@ export function onInit<ExportItem, ServiceRequest>(
 
       if (collector.getServiceClientType() === ServiceClientType.SPANS) {
         collector.serviceClient = new packageObject.opentelemetry.proto.collector.trace.v1.TraceService(
-          serverAddress,
+          collector.serverAddress,
           credentials
         );
       } else {
         collector.serviceClient = new packageObject.opentelemetry.proto.collector.metrics.v1.MetricsService(
-          serverAddress,
+          collector.serverAddress,
           credentials
         );
       }
@@ -108,6 +104,10 @@ export function send<ExportItem, ServiceRequest>(
   }
 }
 
-function removeProtocol(url: string): string {
-  return url.replace(/^(http|grpc)s?:\/\//, '');
+export function fixUrl(url: string): string {
+  const serverAddress = url.replace(/^(http|grpc)s?:\/\//, '');
+  if (serverAddress.includes('/')) {
+    diag.warn('URL path cannot be set when using grpc');
+  }
+  return serverAddress;
 }