From 030343d9320bf22721b18ffdb45a063b5f391298 Mon Sep 17 00:00:00 2001 From: restrry Date: Mon, 23 Nov 2020 20:13:47 +0100 Subject: [PATCH 1/2] make fetch compatible with CollectorFetchMethod --- src/plugins/usage_collection/server/collector/collector.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/usage_collection/server/collector/collector.ts b/src/plugins/usage_collection/server/collector/collector.ts index 797fdaa06a620a..49daa08a56bc70 100644 --- a/src/plugins/usage_collection/server/collector/collector.ts +++ b/src/plugins/usage_collection/server/collector/collector.ts @@ -154,7 +154,7 @@ export class Collector< public readonly extendFetchContext: CollectorOptionsFetchExtendedContext; public readonly type: CollectorOptions['type']; public readonly init?: CollectorOptions['init']; - public readonly fetch: CollectorFetchMethod; + public readonly fetch: CollectorFetchMethod; public readonly isReady: CollectorOptions['isReady']; private readonly _formatForBulkUpload?: CollectorFormatForBulkUpload< TFetchReturn, From 0e848a56b16d60b0c00d245eceffc2d49d3c0ae4 Mon Sep 17 00:00:00 2001 From: restrry Date: Tue, 24 Nov 2020 16:02:01 +0100 Subject: [PATCH 2/2] use Alejandros suggestion --- src/plugins/usage_collection/server/collector/collector.ts | 2 +- src/plugins/usage_collection/server/collector/collector_set.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/usage_collection/server/collector/collector.ts b/src/plugins/usage_collection/server/collector/collector.ts index 49daa08a56bc70..797fdaa06a620a 100644 --- a/src/plugins/usage_collection/server/collector/collector.ts +++ b/src/plugins/usage_collection/server/collector/collector.ts @@ -154,7 +154,7 @@ export class Collector< public readonly extendFetchContext: CollectorOptionsFetchExtendedContext; public readonly type: CollectorOptions['type']; public readonly init?: CollectorOptions['init']; - public readonly fetch: CollectorFetchMethod; + public readonly fetch: CollectorFetchMethod; public readonly isReady: CollectorOptions['isReady']; private readonly _formatForBulkUpload?: CollectorFormatForBulkUpload< TFetchReturn, diff --git a/src/plugins/usage_collection/server/collector/collector_set.ts b/src/plugins/usage_collection/server/collector/collector_set.ts index fe4f3536ffed61..cda4ce36d4e230 100644 --- a/src/plugins/usage_collection/server/collector/collector_set.ts +++ b/src/plugins/usage_collection/server/collector/collector_set.ts @@ -29,7 +29,7 @@ import { import { Collector, CollectorOptions } from './collector'; import { UsageCollector, UsageCollectorOptions } from './usage_collector'; -type AnyCollector = Collector; +type AnyCollector = Collector; type AnyUsageCollector = UsageCollector; interface CollectorSetConfig {