Remove enabled from telemetry

ironfish/src/node.ts

@@ -188,7 +188,7 @@ export class IronfishNode {
     strategyClass = strategyClass || Strategy
     const strategy = new strategyClass(workerPool)
 
-    const telemetry = new Telemetry(config, workerPool, logger, [
+    const telemetry = new Telemetry(workerPool, logger, [
       { name: 'node_id', value: internal.get('telemetryNodeId') },
       { name: 'session_id', value: uuid() },
       { name: 'version', value: pkg.version },

ironfish/src/telemetry/telemetry.test.ts

@@ -1,6 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+import { mockLogger, mockWorkerPool } from '../testUtilities/mocks'
 import { Metric } from './interfaces/metric'
 import { Telemetry } from './telemetry'
 
@@ -10,22 +11,6 @@ import { Telemetry } from './telemetry'
 describe('Telemetry', () => {
   let telemetry: Telemetry
 
-  const mockTelemetry = (enabled = true): Telemetry => {
-    /* eslint-disable @typescript-eslint/no-explicit-any */
-    const mockConfig: any = {
-      get: jest.fn().mockResolvedValueOnce(enabled),
-    }
-    const mockPool: any = {
-      submitTelemetry: jest.fn(),
-    }
-    const mockLogger: any = {
-      debug: jest.fn(),
-      error: jest.fn(),
-    }
-    /* eslint-enable @typescript-eslint/no-explicit-any */
-    return new Telemetry(mockConfig, mockPool, mockLogger, [])
-  }
-
   const mockMetric: Metric = {
     measurement: 'node',
     name: 'memory',
@@ -39,7 +24,12 @@ describe('Telemetry', () => {
   }
 
   beforeEach(() => {
-    telemetry = mockTelemetry()
+    telemetry = new Telemetry(mockWorkerPool(), mockLogger(), [])
+    telemetry.start()
+  })
+
+  afterEach(() => {
+    telemetry?.stop()
   })
 
   describe('stop', () => {
@@ -55,7 +45,7 @@ describe('Telemetry', () => {
   describe('submit', () => {
     describe('when disabled', () => {
       it('does nothing', () => {
-        const disabledTelemetry = mockTelemetry(false)
+        const disabledTelemetry = new Telemetry(mockWorkerPool(), mockLogger(), [])
         const currentPoints = disabledTelemetry['points']
         disabledTelemetry.submit(mockMetric)
         expect(disabledTelemetry['points']).toEqual(currentPoints)

ironfish/src/telemetry/telemetry.ts

@@ -1,7 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-import { Config } from '../fileStores'
 import { Logger } from '../logger'
 import { Block } from '../primitives/block'
 import { renderError, SetIntervalToken } from '../utils'
@@ -13,39 +12,46 @@ export class Telemetry {
   private readonly FLUSH_INTERVAL = 5000
   private readonly MAX_QUEUE_SIZE = 1000
 
-  private readonly enabled: boolean
   private readonly defaultTags: Tag[]
   private readonly logger: Logger
   private readonly pool: WorkerPool
 
+  private started: boolean
   private flushInterval: SetIntervalToken | null
   private points: Metric[]
 
-  constructor(config: Config, pool: WorkerPool, logger: Logger, defaultTags: Tag[]) {
-    this.enabled = config.get('enableTelemetry')
+  constructor(pool: WorkerPool, logger: Logger, defaultTags: Tag[]) {
     this.logger = logger
     this.pool = pool
     this.defaultTags = defaultTags
 
+    this.started = false
     this.flushInterval = null
     this.points = []
   }
 
   start(): void {
-    if (this.enabled) {
-      void this.flushLoop()
+    if (this.started) {
+      return
     }
+
+    this.started = true
+    void this.flushLoop()
   }
 
   async stop(): Promise<void> {
-    if (this.enabled) {
-      this.submitNodeStopped()
-      await this.flush()
+    if (!this.started) {
+      return
     }
 
+    this.started = false
+
     if (this.flushInterval) {
       clearTimeout(this.flushInterval)
     }
+
+    this.submitNodeStopped()
+    await this.flush()
   }
 
   async flushLoop(): Promise<void> {
@@ -57,7 +63,7 @@ export class Telemetry {
   }
 
   submit(metric: Metric): void {
-    if (!this.enabled) {
+    if (!this.started) {
       return
     }
 

ironfish/src/testUtilities/mocks.ts

@@ -67,8 +67,16 @@ export function mockSyncer(): any {
   }
 }
 
-function mockWorkerPool(): unknown {
+export function mockLogger(): any {
+  return {
+    debug: jest.fn(),
+    error: jest.fn(),
+  }
+}
+
+export function mockWorkerPool(): any {
   return {
     saturated: jest.fn(),
+    submitTelemetry: jest.fn(),
   }
 }