chore: patch winston module (logform breaking), ts 4.5.5 fixes

open-telemetry · Feb 7, 2023 · 9459979 · 9459979
1 parent 6293719
commit 9459979
Show file tree

Hide file tree

Showing 88 changed files with 115 additions and 114 deletions.
diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json
@@ -57,7 +57,7 @@
     "sinon-chrome": "3.0.1",
     "ts-loader": "9.2.5",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5",
+    "typescript": "4.5.5",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",
     "webpack-merge": "5.8.0"

diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -54,7 +54,7 @@
     "rimraf": "3.0.2",
     "sinon": "14.0.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -53,7 +53,7 @@
     "rimraf": "3.0.2",
     "sinon": "14.0.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsBeanstalkDetector.ts b/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsBeanstalkDetector.ts
@@ -80,7 +80,7 @@ export class AwsBeanstalkDetector implements Detector {
         [SemanticResourceAttributes.SERVICE_INSTANCE_ID]:
           parsedData.deployment_id,
       });
-    } catch (e) {
+    } catch (e: any) {
       diag.debug(`AwsBeanstalkDetector failed: ${e.message}`);
       return Resource.empty();
     }

diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts b/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts
@@ -180,7 +180,7 @@ export class AwsEksDetector implements Detector {
           return str.substring(str.length - this.CONTAINER_ID_LENGTH);
         }
       }
-    } catch (e) {
+    } catch (e: any) {
       diag.warn(`AwsEksDetector failed to read container ID: ${e.message}`);
     }
     return undefined;

diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json
@@ -48,7 +48,7 @@
     "rimraf": "3.0.2",
     "sinon": "14.0.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json
@@ -52,7 +52,7 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -55,7 +55,7 @@
     "rimraf": "3.0.2",
     "sinon": "14.0.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/resources": "^1.0.0"

diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json
@@ -51,7 +51,7 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/resources": "^1.0.0",

diff --git a/...rs/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts b/...rs/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts
@@ -138,7 +138,7 @@ describe('[UNIT] instanaAgentDetector', () => {
       try {
         await instanaAgentDetector.detect();
         assert.ok(false, 'Expected to throw');
-      } catch (err) {
+      } catch (err: any) {
         assert.equal(err.code, 'ECONNREFUSED');
       }
     });

diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -43,7 +43,7 @@
     "rimraf": "3.0.2",
     "sinon": "14.0.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.35.1",

diff --git a/metapackages/auto-instrumentations-node/src/utils.ts b/metapackages/auto-instrumentations-node/src/utils.ts
@@ -119,7 +119,7 @@ export function getNodeAutoInstrumentations(
   >) {
     const Instance = InstrumentationMap[name];
     // Defaults are defined by the instrumentation itself
-    const userConfig = inputConfigs[name] ?? {};
+    const userConfig: any = inputConfigs[name] ?? {};
 
     if (userConfig.enabled === false) {
       diag.debug(`Disabling instrumentation for ${name}`);
@@ -129,7 +129,7 @@ export function getNodeAutoInstrumentations(
     try {
       diag.debug(`Loading instrumentation for ${name}`);
       instrumentations.push(new Instance(userConfig));
-    } catch (e) {
+    } catch (e: any) {
       diag.error(e);
     }
   }

diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
@@ -54,7 +54,7 @@
     "sinon": "14.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5",
+    "typescript": "4.5.5",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",
     "webpack-merge": "5.8.0"

diff --git a/metapackages/auto-instrumentations-web/src/utils.ts b/metapackages/auto-instrumentations-web/src/utils.ts
@@ -65,7 +65,7 @@ export function getWebAutoInstrumentations(
     try {
       diag.debug(`Loading instrumentation for ${name}`);
       instrumentations.push(new Instance(userConfig));
-    } catch (e) {
+    } catch (e: any) {
       diag.error(e);
     }
   }

diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
     "husky": "7.0.4",
     "lerna": "5.5.2",
     "lerna-changelog": "2.2.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "changelog": {
     "labels": {

diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json
@@ -56,7 +56,7 @@
     "rimraf": "3.0.2",
     "sinon": "14.0.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/sdk-metrics": "^1.8.0",

diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -73,7 +73,7 @@
     "sinon": "14.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5",
+    "typescript": "4.5.5",
     "webpack": "4.46.0"
   },
   "dependencies": {

diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json
@@ -55,6 +55,6 @@
     "nyc": "15.1.0",
     "sinon": "13.0.1",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   }
 }
diff --git a/packages/opentelemetry-redis-common/package.json b/packages/opentelemetry-redis-common/package.json
@@ -45,6 +45,6 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   }
 }
diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json
@@ -44,7 +44,7 @@
     "@opentelemetry/api": "^1.3.0",
     "@types/node": "18.11.7",
     "gts": "3.1.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/core": "^1.0.0",

diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json
@@ -67,7 +67,7 @@
     "gts": "3.1.0",
     "sinon": "14.0.0",
     "test-all-versions": "5.0.1",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "engines": {
     "node": ">=14"

diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json
@@ -59,7 +59,7 @@
     "rimraf": "3.0.2",
     "test-all-versions": "5.0.1",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.35.1"

diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json
@@ -56,7 +56,7 @@
     "rimraf": "3.0.2",
     "sinon": "14.0.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/core": "^1.8.0",

diff --git a/plugins/node/instrumentation-fs/src/instrumentation.ts b/plugins/node/instrumentation-fs/src/instrumentation.ts
@@ -160,7 +160,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
         );
         instrumentation._runEndHook(functionName, { args: args, span });
         return res;
-      } catch (error) {
+      } catch (error: any) {
         span.recordException(error);
         span.setStatus({
           message: error.message,
@@ -234,7 +234,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
             this,
             ...args
           );
-        } catch (error) {
+        } catch (error: any) {
           span.recordException(error);
           span.setStatus({
             message: error.message,
@@ -307,7 +307,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
             this,
             ...args
           );
-        } catch (error) {
+        } catch (error: any) {
           span.recordException(error);
           span.setStatus({
             message: error.message,
@@ -377,7 +377,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
         );
         instrumentation._runEndHook(functionName, { args: args, span });
         return res;
-      } catch (error) {
+      } catch (error: any) {
         span.recordException(error);
         span.setStatus({
           message: error.message,

diff --git a/plugins/node/instrumentation-fs/test/hooks.test.ts b/plugins/node/instrumentation-fs/test/hooks.test.ts
@@ -107,7 +107,7 @@ describe('fs instrumentation: hooks', () => {
     it('should not shadow the error from original call when hooks throw', () => {
       try {
         fs.accessSync('./test/fixtures/readtest-404', fs.constants.R_OK);
-      } catch (e) {
+      } catch (e: any) {
         assertNotHookError(e);
       }
 

diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json
@@ -55,7 +55,7 @@
     "rimraf": "3.0.2",
     "test-all-versions": "5.0.1",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.35.1"

diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json
@@ -58,7 +58,7 @@
     "rimraf": "3.0.2",
     "test-all-versions": "5.0.1",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/core": "^1.8.0",

diff --git a/plugins/node/instrumentation-mongoose/test/mongoose.test.ts b/plugins/node/instrumentation-mongoose/test/mongoose.test.ts
@@ -44,7 +44,7 @@ describe('mongoose instrumentation', () => {
         useCreateIndex: true,
         dbName: DB_NAME,
       } as any); // TODO: amir - document older mongoose support
-    } catch (err) {
+    } catch (err: any) {
       // connect signature changed from mongo v5 to v6.
       // the following check tries both signatures, so test-all-versions
       // can run against both versions.

diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json
@@ -56,7 +56,7 @@
     "socket.io-client": "^4.1.3",
     "test-all-versions": "5.0.1",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.35.1",

diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json
@@ -60,7 +60,7 @@
     "tedious": "14.1.0",
     "test-all-versions": "5.0.1",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.35.1",

diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
@@ -56,7 +56,7 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.35.1",

diff --git a/...ns/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts b/...ns/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts
@@ -214,7 +214,7 @@ describe('lambda handler', () => {
       let err: Error;
       try {
         await lambdaRequire('lambda-test/async').error('arg', ctx);
-      } catch (e) {
+      } catch (e: any) {
         err = e;
       }
       assert.strictEqual(err!.message, 'handler error');
@@ -231,7 +231,7 @@ describe('lambda handler', () => {
       let err: string;
       try {
         await lambdaRequire('lambda-test/async').stringerror('arg', ctx);
-      } catch (e) {
+      } catch (e: any) {
         err = e;
       }
       assert.strictEqual(err!, 'handler error');
@@ -301,7 +301,7 @@ describe('lambda handler', () => {
           ctx,
           (err: Error, res: any) => {}
         );
-      } catch (e) {
+      } catch (e: any) {
         err = e;
       }
       assert.strictEqual(err!.message, 'handler error');
@@ -330,7 +330,7 @@ describe('lambda handler', () => {
             }
           );
         });
-      } catch (e) {
+      } catch (e: any) {
         err = e;
       }
       assert.strictEqual(err!.message, 'handler error');
@@ -351,7 +351,7 @@ describe('lambda handler', () => {
           ctx,
           (err: Error, res: any) => {}
         );
-      } catch (e) {
+      } catch (e: any) {
         err = e;
       }
       assert.strictEqual(err!, 'handler error');
@@ -423,7 +423,7 @@ describe('lambda handler', () => {
           }
         );
       });
-    } catch (e) {
+    } catch (e: any) {
       err = e;
     }
     assert.strictEqual(err!, 'handler error');
@@ -806,7 +806,7 @@ describe('lambda handler', () => {
         let err: Error;
         try {
           await lambdaRequire('lambda-test/async').error('arg', ctx);
-        } catch (e) {
+        } catch (e: any) {
           err = e;
         }
         const [span] = memoryExporter.getFinishedSpans();
@@ -833,7 +833,7 @@ describe('lambda handler', () => {
         let err: Error;
         try {
           lambdaRequire('lambda-test/sync').error('arg', ctx, () => {});
-        } catch (e) {
+        } catch (e: any) {
           err = e;
         }
         const [span] = memoryExporter.getFinishedSpans();

diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json
@@ -62,7 +62,7 @@
     "sinon": "14.0.0",
     "test-all-versions": "5.0.1",
     "ts-mocha": "10.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.5.5"
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.35.1",