fix tests

open-telemetry · Apr 17, 2024 · 101488b · 101488b
1 parent 32a2564
commit 101488b
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 60 deletions.
diff --git a/...rimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts b/...rimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts
@@ -227,39 +227,53 @@ describe('HttpInstrumentation', () => {
       });
     });
 
-    it('allows to disable outgoing request instrumentation', () => {
-      server.close();
-      instrumentation.disable();
-
-      instrumentation.setConfig({
-        instrumentOutgoingRequests: false,
+    describe('partially disable instrumentation', () => {
+      beforeEach(() => {
+        memoryExporter.reset();
       });
-      instrumentation.enable();
-      server = http.createServer((_request, response) => {
-        response.end('Test Server Response');
+
+      afterEach(() => {
+        server.close();
+        instrumentation.disable();
       });
 
-      server.listen(serverPort);
+      it('allows to disable outgoing request instrumentation', () => {
+        server.close();
+        instrumentation.disable();
 
-      assert.strictEqual(isWrapped(http.Server.prototype.emit), true);
-      assert.strictEqual(isWrapped(http.get), false);
-      assert.strictEqual(isWrapped(http.request), false);
-    });
+        instrumentation.setConfig({
+          instrumentOutgoingRequests: false,
+        });
+        instrumentation.enable();
+        server = http.createServer((_request, response) => {
+          response.end('Test Server Response');
+        });
 
-    it('allows to disable incoming request instrumentation', () => {
-      instrumentation.setConfig({
-        instrumentIncomingRequests: false,
-      });
-      instrumentation.enable();
-      server = http.createServer((_request, response) => {
-        response.end('Test Server Response');
+        server.listen(serverPort);
+
+        assert.strictEqual(isWrapped(http.Server.prototype.emit), true);
+        assert.strictEqual(isWrapped(http.get), false);
+        assert.strictEqual(isWrapped(http.request), false);
       });
 
-      server.listen(serverPort);
+      it('allows to disable incoming request instrumentation', () => {
+        server.close();
+        instrumentation.disable();
+
+        instrumentation.setConfig({
+          instrumentIncomingRequests: false,
+        });
+        instrumentation.enable();
+        server = http.createServer((_request, response) => {
+          response.end('Test Server Response');
+        });
 
-      assert.strictEqual(isWrapped(http.Server.prototype.emit), false);
-      assert.strictEqual(isWrapped(http.get), true);
-      assert.strictEqual(isWrapped(http.request), true);
+        server.listen(serverPort);
+
+        assert.strictEqual(isWrapped(http.Server.prototype.emit), false);
+        assert.strictEqual(isWrapped(http.get), true);
+        assert.strictEqual(isWrapped(http.request), true);
+      });
     });
 
     describe('with good instrumentation options', () => {

diff --git a/...imental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts b/...imental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts
@@ -185,41 +185,6 @@ describe('HttpsInstrumentation', () => {
       });
     });
 
-    it('allows to disable outgoing request instrumentation', () => {
-      server.close();
-      instrumentation.disable();
-
-      instrumentation.setConfig({
-        instrumentOutgoingRequests: false,
-      });
-      instrumentation.enable();
-      server = https.createServer((_request, response) => {
-        response.end('Test Server Response');
-      });
-
-      server.listen(serverPort);
-
-      assert.strictEqual(isWrapped(http.Server.prototype.emit), true);
-      assert.strictEqual(isWrapped(http.get), false);
-      assert.strictEqual(isWrapped(http.request), false);
-    });
-
-    it('allows to disable incoming request instrumentation', () => {
-      instrumentation.setConfig({
-        instrumentIncomingRequests: false,
-      });
-      instrumentation.enable();
-      server = https.createServer((_request, response) => {
-        response.end('Test Server Response');
-      });
-
-      server.listen(serverPort);
-
-      assert.strictEqual(isWrapped(http.Server.prototype.emit), false);
-      assert.strictEqual(isWrapped(http.get), true);
-      assert.strictEqual(isWrapped(http.request), true);
-    });
-
     describe('with good instrumentation options', () => {
       beforeEach(() => {
         memoryExporter.reset();
@@ -740,5 +705,60 @@ describe('HttpsInstrumentation', () => {
         req.end();
       });
     });
+
+    describe('partially disable instrumentation', () => {
+      beforeEach(() => {
+        memoryExporter.reset();
+      });
+
+      afterEach(() => {
+        server.close();
+        instrumentation.disable();
+      });
+
+      it('allows to disable outgoing request instrumentation', () => {
+        instrumentation.setConfig({
+          instrumentOutgoingRequests: false,
+        });
+        instrumentation.enable();
+        server = https.createServer(
+          {
+            key: fs.readFileSync('test/fixtures/server-key.pem'),
+            cert: fs.readFileSync('test/fixtures/server-cert.pem'),
+          },
+          (request, response) => {
+            response.end('Test Server Response');
+          }
+        );
+
+        server.listen(serverPort);
+
+        assert.strictEqual(isWrapped(http.Server.prototype.emit), true);
+        assert.strictEqual(isWrapped(http.get), false);
+        assert.strictEqual(isWrapped(http.request), false);
+      });
+
+      it('allows to disable incoming request instrumentation', () => {
+        instrumentation.setConfig({
+          instrumentIncomingRequests: false,
+        });
+        instrumentation.enable();
+        server = https.createServer(
+          {
+            key: fs.readFileSync('test/fixtures/server-key.pem'),
+            cert: fs.readFileSync('test/fixtures/server-cert.pem'),
+          },
+          (request, response) => {
+            response.end('Test Server Response');
+          }
+        );
+
+        server.listen(serverPort);
+
+        assert.strictEqual(isWrapped(http.Server.prototype.emit), false);
+        assert.strictEqual(isWrapped(http.get), true);
+        assert.strictEqual(isWrapped(http.request), true);
+      });
+    });
   });
 });