From ecb5ebe86eebc5a1880041b2523adf5f6d022282 Mon Sep 17 00:00:00 2001 From: Nev <54870357+MSNev@users.noreply.github.com> Date: Wed, 8 Mar 2023 09:40:19 -0800 Subject: [PATCH] fix: Minor typing issues for web sandbox (#3660) --- .../opentelemetry-instrumentation-fetch/src/fetch.ts | 2 +- packages/opentelemetry-context-zone-peer-dep/src/util.ts | 9 ++++----- packages/opentelemetry-sdk-trace-web/src/utils.ts | 5 ++++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts b/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts index 75aa38c921..d02269c440 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts +++ b/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts @@ -301,7 +301,7 @@ export class FetchInstrumentation extends InstrumentationBase< ): Promise { 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] || {}; diff --git a/packages/opentelemetry-context-zone-peer-dep/src/util.ts b/packages/opentelemetry-context-zone-peer-dep/src/util.ts index 2d5e87996f..7c4ac5f68d 100644 --- a/packages/opentelemetry-context-zone-peer-dep/src/util.ts +++ b/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' diff --git a/packages/opentelemetry-sdk-trace-web/src/utils.ts b/packages/opentelemetry-sdk-trace-web/src/utils.ts index 30031e0623..e8abd29274 100644 --- a/packages/opentelemetry-sdk-trace-web/src/utils.ts +++ b/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(obj: O, key: keyof any): key is keyof O { +export function hasKey( + obj: O, + key: keyof any +): key is keyof O { return key in obj; }