test(instrumentation): skip unwrap tests for esm (#5153)

Co-authored-by: Mend Renovate <[email protected]>
open-telemetry · Nov 14, 2024 · d51fa95 · d51fa95
1 parent c78a02f
commit d51fa95
Show file tree

Hide file tree

Showing 46 changed files with 615 additions and 305 deletions.
diff --git a/api/package.json b/api/package.json
@@ -77,7 +77,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack": "5.28.5",

diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json
@@ -64,7 +64,7 @@
     "@opentelemetry/api-logs": "0.54.2"
   },
   "devDependencies": {
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/webpack-env": "1.16.3",
     "babel-plugin-istanbul": "7.0.0",

diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json
@@ -63,7 +63,7 @@
     "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/webpack-env": "1.16.3",
     "babel-plugin-istanbul": "7.0.0",

diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json
@@ -54,7 +54,7 @@
     "@opentelemetry/api-logs": "0.54.2",
     "@opentelemetry/otlp-exporter-base": "0.54.2",
     "@opentelemetry/resources": "1.27.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json
@@ -74,7 +74,7 @@
     "@babel/preset-env": "7.25.4",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/resources": "1.27.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",

diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json
@@ -66,7 +66,7 @@
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.4",
     "@opentelemetry/api": "1.9.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "babel-plugin-istanbul": "7.0.0",

diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json
@@ -51,7 +51,7 @@
     "@grpc/proto-loader": "^0.7.10",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/otlp-exporter-base": "0.54.2",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json
@@ -65,7 +65,7 @@
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.4",
     "@opentelemetry/api": "1.9.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",

diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json
@@ -65,7 +65,7 @@
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.4",
     "@opentelemetry/api": "1.9.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "babel-plugin-istanbul": "7.0.0",

diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json
@@ -56,7 +56,7 @@
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.4",
     "@opentelemetry/api": "1.9.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "babel-plugin-istanbul": "7.0.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
@@ -50,7 +50,7 @@
   "devDependencies": {
     "@grpc/proto-loader": "^0.7.10",
     "@opentelemetry/api": "1.9.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
@@ -65,7 +65,7 @@
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.4",
     "@opentelemetry/api": "1.9.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/semantic-conventions": "1.27.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json
@@ -60,7 +60,7 @@
     "@opentelemetry/context-zone": "1.27.0",
     "@opentelemetry/propagator-b3": "1.27.0",
     "@opentelemetry/sdk-trace-base": "1.27.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json
@@ -57,7 +57,7 @@
     "@protobuf-ts/grpc-transport": "2.9.4",
     "@protobuf-ts/runtime": "2.9.4",
     "@protobuf-ts/runtime-rpc": "2.9.4",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/semver": "7.5.8",
     "@types/sinon": "17.0.3",

diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json
@@ -53,7 +53,7 @@
     "@opentelemetry/sdk-metrics": "1.27.0",
     "@opentelemetry/sdk-trace-base": "1.27.0",
     "@opentelemetry/sdk-trace-node": "1.27.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/request-promise-native": "1.0.21",
     "@types/semver": "7.5.8",

diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
@@ -60,7 +60,7 @@
     "@opentelemetry/context-zone": "1.27.0",
     "@opentelemetry/propagator-b3": "1.27.0",
     "@opentelemetry/sdk-trace-base": "1.27.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",

diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json
@@ -85,7 +85,7 @@
     "@babel/preset-env": "7.25.4",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/sdk-metrics": "1.27.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/semver": "7.5.8",
     "@types/sinon": "17.0.3",

diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs b/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs
@@ -135,38 +135,40 @@ class TestAbsoluteFileInstrumentationPatchFn extends InstrumentationBase {
             this._unwrap(moduleExports, 'testFunction');
             return moduleExports;
           }
-        )
+        ),
       ]
-    )
+    );
   }
 }
 
-describe('when loading esm module', () => {
+describe('when loading esm module', function () {
   const instrumentationWrap = new TestInstrumentationWrapFn({
     enabled: false,
   });
 
-  it('should patch module file directly', async () => {
+  it('should patch module file directly', async function () {
     const instrumentation = new TestInstrumentationSimple({
       enabled: false,
     });
     instrumentation.enable();
     assert.deepEqual(exported.testConstant, 43);
   });
 
-  it('should patch a module with the wrap function', async () => {
+  it('should patch a module with the wrap function', async function () {
     instrumentationWrap.enable();
     assert.deepEqual(exported.testFunction(), 'patched');
   });
 
-  it('should unwrap a patched function', async () => {
+  it('should unwrap a patched function', async function () {
+    // Test skipped due to https://github.com/nodejs/import-in-the-middle/pull/153 breaking unwrap functionality
+    this.skip();
     instrumentationWrap.enable();
     // disable to trigger unwrap
     instrumentationWrap.disable();
     assert.deepEqual(exported.testFunction(), 'original');
   });
 
-  it('should wrap multiple functions with masswrap', () => {
+  it('should wrap multiple functions with masswrap', function () {
     const instrumentation = new TestInstrumentationMasswrapFn({
       enabled: false,
     });
@@ -176,7 +178,9 @@ describe('when loading esm module', () => {
     assert.deepEqual(exported.secondTestFunction(), 'patched');
   });
 
-  it('should unwrap multiple functions with massunwrap', () => {
+  it('should unwrap multiple functions with massunwrap', async function () {
+    // Test skipped due to https://github.com/nodejs/import-in-the-middle/pull/153 breaking unwrap functionality
+    this.skip();
     const instrumentation = new TestInstrumentationMasswrapFn({
       enabled: false,
     });
@@ -187,15 +191,17 @@ describe('when loading esm module', () => {
     assert.deepEqual(exported.secondTestFunction(), 'original');
   });
 
-  it('should patch function from a file with absolute path', async () => {
+  it('should patch function from a file with absolute path', async function () {
     const instrumentation = new TestAbsoluteFileInstrumentationPatchFn({
       enabled: false,
     });
     instrumentation.enable();
     assert.deepEqual(exportedAbsolute.testFunction(), 'patched');
   });
 
-  it('should unwrap a patched function from a file with absolute path', async () => {
+  it('should unwrap a patched function from a file with absolute path', async function () {
+    // Test skipped due to https://github.com/nodejs/import-in-the-middle/pull/153 breaking unwrap functionality
+    this.skip();
     const instrumentation = new TestAbsoluteFileInstrumentationPatchFn({
       enabled: false,
     });

diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json
@@ -68,7 +68,7 @@
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/context-async-hooks": "1.27.0",
     "@opentelemetry/exporter-jaeger": "1.27.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/semver": "7.5.8",
     "@types/sinon": "17.0.3",

diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json
@@ -67,7 +67,7 @@
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.4",
     "@opentelemetry/api": "1.9.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "babel-plugin-istanbul": "7.0.0",

diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json
@@ -49,7 +49,7 @@
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/resources": "1.27.0",
     "@opentelemetry/sdk-trace-base": "1.27.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json
@@ -62,7 +62,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/webpack-env": "1.16.3",
     "babel-plugin-istanbul": "7.0.0",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/sampler-jaeger-remote/package.json b/experimental/packages/sampler-jaeger-remote/package.json
@@ -48,7 +48,7 @@
     "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/sdk-events/package.json b/experimental/packages/sdk-events/package.json
@@ -68,7 +68,7 @@
   "devDependencies": {
     "@babel/core": "7.25.2",
     "@opentelemetry/api": "1.9.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.20",
     "@types/webpack-env": "1.16.3",

diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json
@@ -75,7 +75,7 @@
     "@babel/preset-env": "7.25.4",
     "@opentelemetry/api": ">=1.4.0 <1.10.0",
     "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/[email protected]",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "babel-plugin-istanbul": "7.0.0",

diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json
@@ -52,7 +52,7 @@
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/context-async-hooks": "1.27.0",
     "@opentelemetry/sdk-trace-base": "1.27.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/web-common/package.json b/experimental/packages/web-common/package.json
@@ -75,7 +75,7 @@
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/api-events": "0.54.2",
     "@opentelemetry/api-logs": "0.54.2",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.20",
     "@types/webpack-env": "1.16.3",

diff --git a/integration-tests/api/package.json b/integration-tests/api/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/core": "1.27.0",
-    "@types/mocha": "10.0.8",
+    "@types/mocha": "10.0.9",
     "@types/node": "18.6.5",
     "cross-var": "1.1.0",
     "lerna": "6.6.2",