Use user URL if validation returns empty endpoint

open-telemetry · Jul 28, 2021 · b7bc7df · b7bc7df
1 parent fd2410c
commit b7bc7df
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/packages/opentelemetry-exporter-collector-grpc/src/util.ts b/packages/opentelemetry-exporter-collector-grpc/src/util.ts
@@ -108,11 +108,15 @@ export function send<ExportItem, ServiceRequest>(
 }
 
 export function validateAndNormalizeUrl(url: string): string {
-  const hasProtocol = url.match(/^([\w]{1,8}):\/\//);
-  if (!hasProtocol) {
-    url = `https://${url}`;
-  }
   const target = new URL(url);
+
+  if (target.host === '') {
+    diag.warn(
+      'Parsing URL failed to return a valid host. Returning raw url.'
+    );
+    return url
+  }
+
   if (target.pathname && target.pathname !== '/') {
     diag.warn(
       'URL path should not be set when using grpc, the path part of the URL will be ignored.'
@@ -123,5 +127,6 @@ export function validateAndNormalizeUrl(url: string): string {
       'URL protocol should be http(s):// or grpc(s)://. Using grpc://.'
     );
   }
-  return target.host;
+
+  return target.host
 }
diff --git a/packages/opentelemetry-exporter-collector-grpc/test/util.test.ts b/packages/opentelemetry-exporter-collector-grpc/test/util.test.ts
@@ -24,19 +24,21 @@ import { validateAndNormalizeUrl } from '../src/util';
 describe('validateAndNormalizeUrl()', () => {
   const tests = [
     {
-      name: 'bare hostname should return same value',
+      name: 'grpc://host:port should trim off protocol',
+      input: 'grpc://api.datacat.io:1234',
+      expected: 'api.datacat.io:1234',
+    },
+    {
+      name: 'bare hostname should warn but return same value',
       input: 'api.datacat.io',
       expected: 'api.datacat.io',
+      warn: 'Parsing URL failed to return a valid host. Returning raw url.',
     },
     {
-      name: 'host:port should return same value',
+      name: 'host:port should warn but return same value',
       input: 'api.datacat.io:1234',
       expected: 'api.datacat.io:1234',
-    },
-    {
-      name: 'grpc://host:port should trim off protocol',
-      input: 'grpc://api.datacat.io:1234',
-      expected: 'api.datacat.io:1234',
+      warn: 'Parsing URL failed to return a valid host. Returning raw url.',
     },
     {
       name: 'bad protocol should warn but return host:port',