Merge e55a52c into 48ecf22

experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts

@@ -301,7 +301,7 @@ export class FetchInstrumentation extends InstrumentationBase<
       ): Promise<Response> {
         const self = this;
         const url = web.parseUrl(
-          args[0] instanceof Request ? args[0].url : args[0]
+          args[0] instanceof Request ? args[0].url : String(args[0])
         ).href;
 
         const options = args[0] instanceof Request ? args[0] : args[1] || {};

packages/opentelemetry-context-zone-peer-dep/src/util.ts

@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-import { TargetWithEvents } from './types';
-
 /**
- * check if an object has addEventListener and removeEventListener functions then it will return true
- * @param obj
+ * check if an object has addEventListener and removeEventListener functions then it will return true.
+ * Generally only called with a `TargetWithEvents` but may be called with an unknown / any.
+ * @param obj - The object to check.
  */
-export function isListenerObject(obj: TargetWithEvents = {}): boolean {
+export function isListenerObject(obj: any = {}): boolean {
   return (
     typeof obj.addEventListener === 'function' &&
     typeof obj.removeEventListener === 'function'

packages/opentelemetry-sdk-trace-web/src/utils.ts

@@ -44,7 +44,10 @@ function getUrlNormalizingAnchor(): HTMLAnchorElement {
  * @param key
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function hasKey<O>(obj: O, key: keyof any): key is keyof O {
+export function hasKey<O extends object>(
+  obj: O,
+  key: keyof any
+): key is keyof O {
   return key in obj;
 }