Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix the eslint build #1094

Closed
wants to merge 6 commits into from
Closed

chore: fix the eslint build #1094

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d22e06
chore: fix the eslint build
dyladan May 21, 2020
c3269dc
chore: fix lint in async hooks
dyladan May 22, 2020
be2ac7c
chore: do not use Function type
dyladan May 22, 2020
4458095
chore: update eslint dependencies
dyladan May 22, 2020
5fd8add
chore: fix lint for updated eslint
dyladan May 22, 2020
c29ff16
chore: fix the build
dyladan May 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ import { isListenerObject } from './util';
/* Key name to be used to save a context reference in Zone */
const ZONE_CONTEXT_KEY = 'OT_ZONE_CONTEXT';

// eslint-disable-next-line @typescript-eslint/ban-types
type UserFunction = Function;

/**
* ZoneContextManager
* This module provides an easy functionality for tracing action between asynchronous operations in web.
Expand Down Expand Up @@ -55,7 +58,10 @@ export class ZoneContextManager implements ContextManager {
* @param target Function to be executed within the context
* @param context A context (span) to be executed within target function
*/
private _bindFunction<T extends Function>(target: T, context: Context): T {
private _bindFunction<T extends UserFunction>(
target: T,
context: Context
): T {
const manager = this;
const contextWrapper = function (this: any, ...args: unknown[]) {
return manager.with(context, () => target.apply(this, args));
Expand Down Expand Up @@ -136,13 +142,13 @@ export class ZoneContextManager implements ContextManager {
*/
private _patchAddEventListener(
target: TargetWithEvents,
original: Function,
original: UserFunction,
context: Context
) {
const contextManager = this;

return function (
this: {},
this: unknown,
event: string,
listener: Func<void>,
opts?: any
Expand All @@ -169,9 +175,9 @@ export class ZoneContextManager implements ContextManager {
*/
private _patchRemoveEventListener(
target: TargetWithEvents,
original: Function
original: UserFunction
) {
return function (this: {}, event: string, listener: Func<void>) {
return function (this: unknown, event: string, listener: Func<void>) {
if (
target.__ot_listeners === undefined ||
target.__ot_listeners[event] === undefined
Expand Down