Fixing TS errors

api/src/api/diag.ts

@@ -22,6 +22,7 @@ import {
   DiagLogger,
   DiagLoggerApi,
   DiagLogLevel,
+  DiagLoggerOptions,
 } from '../diag/types';
 import {
   getGlobal,
@@ -67,8 +68,8 @@ export class DiagAPI implements DiagLogger, DiagLoggerApi {
     // DiagAPI specific functions
 
     const setLogger: DiagLoggerApi['setLogger'] = (
-      logger,
-      optionsOrLogLevel = { logLevel: DiagLogLevel.INFO }
+      logger: DiagLogger,
+      optionsOrLogLevel: DiagLoggerOptions | DiagLogLevel = { logLevel: DiagLogLevel.INFO }
     ) => {
       if (logger === self) {
         // There isn't much we can do here.

experimental/packages/opentelemetry-instrumentation/src/platform/node/RequireInTheMiddleSingleton.ts

@@ -38,7 +38,6 @@ const isMocha = [
   'describe',
   'it',
 ].every(fn => {
-  // @ts-expect-error TS7053: Element implicitly has an 'any' type
   return typeof global[fn] === 'function';
 });
 

packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts

@@ -43,7 +43,7 @@ export abstract class BatchSpanProcessorBase<T extends BufferConfig>
 
   private _isExporting = false;
   private _finishedSpans: ReadableSpan[] = [];
-  private _timer: NodeJS.Timeout | undefined;
+  private _timer: number | undefined;
   private _shutdownOnce: BindOnceFuture<void>;
   private _droppedSpansCount: number = 0;
 
@@ -150,7 +150,7 @@ export abstract class BatchSpanProcessorBase<T extends BufferConfig>
    * */
   private _flushAll(): Promise<void> {
     return new Promise((resolve, reject) => {
-      const promises = [];
+      const promises: Promise<void>[] = [];
       // calculate number of batches
       const count = Math.ceil(
         this._finishedSpans.length / this._maxExportBatchSize
@@ -172,7 +172,7 @@ export abstract class BatchSpanProcessorBase<T extends BufferConfig>
       return Promise.resolve();
     }
     return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
+      const timer = window.setTimeout(() => {
         // don't wait anymore for export, this way the next batch can start
         reject(new Error('Timeout'));
       }, this._exportTimeoutMillis);
@@ -238,7 +238,7 @@ export abstract class BatchSpanProcessorBase<T extends BufferConfig>
       return flush();
     }
     if (this._timer !== undefined) return;
-    this._timer = setTimeout(() => flush(), this._scheduledDelayMillis);
+    this._timer = window.setTimeout(() => flush(), this._scheduledDelayMillis);
     unrefTimer(this._timer);
   }
 

packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts

@@ -55,7 +55,7 @@ export type PeriodicExportingMetricReaderOptions = {
  * the configured {@link PushMetricExporter}
  */
 export class PeriodicExportingMetricReader extends MetricReader {
-  private _interval?: ReturnType<typeof setInterval>;
+  private _interval?: number;
   private _exporter: PushMetricExporter;
   private readonly _exportInterval: number;
   private readonly _exportTimeout: number;
@@ -150,7 +150,7 @@ export class PeriodicExportingMetricReader extends MetricReader {
 
   protected override onInitialized(): void {
     // start running the interval as soon as this reader is initialized and keep handle for shutdown.
-    this._interval = setInterval(() => {
+    this._interval = window.setInterval(() => {
       // this._runOnce never rejects. Using void operator to suppress @typescript-eslint/no-floating-promises.
       void this._runOnce();
     }, this._exportInterval);

packages/sdk-metrics/src/state/MetricStorageRegistry.ts

@@ -122,7 +122,7 @@ export class MetricStorageRegistry {
     expectedDescriptor: InstrumentDescriptor,
     existingStorages: MetricStorage[]
   ): T | null {
-    let compatibleStorage = null;
+    let compatibleStorage: T | null = null;
 
     for (const existingStorage of existingStorages) {
       const existingDescriptor = existingStorage.getInstrumentDescriptor();