Merge branch 'main' into cleanup-instrumentations

open-telemetry · Oct 27, 2021 · 1e19790 · 1e19790
2 parents 21cb795 + c0ab952
commit 1e19790
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/opentelemetry-core/src/utils/url.ts b/packages/opentelemetry-core/src/utils/url.ts
@@ -17,7 +17,7 @@ export function urlMatches(url: string, urlToMatch: string | RegExp): boolean {
   if (typeof urlToMatch === 'string') {
     return url === urlToMatch;
   } else {
-    return urlToMatch.test(url);
+    return !!url.match(urlToMatch);
   }
 }
 /**

diff --git a/packages/opentelemetry-core/test/utils/url.test.ts b/packages/opentelemetry-core/test/utils/url.test.ts
@@ -71,5 +71,18 @@ describe('Core - Utils - url', () => {
         );
       });
     });
+    describe('when regex has global flag', () => {
+      it('should return true', () => {
+        const ignoredUrls = [/myaddr/g];
+        // Run test multiple times to ensure same result (git.io/JimS1)
+        for (let i = 0; i < 3; i++) {
+          assert.strictEqual(
+            isUrlIgnored(urlToTest, ignoredUrls),
+            true,
+            urlIgnored
+          );
+        }
+      });
+    });
   });
 });