test: updated the otel tests

Author: aryamohanan

package-lock.json

@@ -12,14 +12,7 @@ process.on('SIGTERM', () => {
   process.exit(0);
 });
 
-const expect = require('chai').expect;
-
-/**
- * We install the latest version of the collector here locally.
- * This ensures we are using the Opentelemetry production dependencies.
- */
-expect(require.resolve('@instana/collector')).to.contain('opentelemetry/node_modules/@instana/collector');
-require('@instana/collector')();
+require('../../../src')();
 
 const express = require('express');
 const fs = require('fs');

packages/collector/test/tracing/opentelemetry/fs-app.js

@@ -14,7 +14,7 @@ process.on('SIGTERM', () => {
 
 const opentelemetryDisabled = process.env.INSTANA_DISABLE_USE_OPENTELEMETRY === 'true';
 
-require('@instana/collector')({
+require('../../../src')({
   tracing: {
     useOpentelemetry: !opentelemetryDisabled
   }

packages/collector/test/tracing/opentelemetry/oracle-app.js

@@ -15,7 +15,7 @@ process.on('SIGTERM', () => {
 const agentPort = process.env.INSTANA_AGENT_PORT;
 const opentelemetryDisabled = process.env.INSTANA_DISABLE_USE_OPENTELEMETRY === 'true';
 
-require('@instana/collector')({
+require('../../../src')({
   tracing: {
     useOpentelemetry: !opentelemetryDisabled
   }

packages/collector/test/tracing/opentelemetry/package.json

@@ -12,7 +12,7 @@ process.on('SIGTERM', () => {
   process.exit(0);
 });
 
-require('@instana/collector')();
+require('../../../src')();
 
 const socketioclient = require('socket.io-client');
 const express = require('express');

packages/collector/test/tracing/opentelemetry/preinstall.sh

@@ -12,7 +12,7 @@ process.on('SIGTERM', () => {
   process.exit(0);
 });
 
-require('@instana/collector')();
+require('../../../src')();
 
 const express = require('express');
 const port = require('../../test_util/app-port')();

packages/collector/test/tracing/opentelemetry/restify-app.js

@@ -11,7 +11,7 @@ process.on('SIGTERM', () => {
 });
 
 /* eslint-disable no-console */
-require('@instana/collector')({
+require('../../../src')({
   tracing: {
     useOpentelemetry: process.env.OTEL_ENABLED
   }

packages/collector/test/tracing/opentelemetry/socketio-client.js

@@ -11,7 +11,6 @@ const supportedVersion = require('@instana/core').tracing.supportedVersion;
 const constants = require('@instana/core').tracing.constants;
 const config = require('../../../../core/test/config');
 const portfinder = require('../../test_util/portfinder');
-const { execSync } = require('child_process');
 const {
   retry,
   verifyHttpRootEntry,
@@ -35,24 +34,6 @@ const runTests =
 mochaSuiteFn('opentelemetry/instrumentations', function () {
   this.timeout(config.getTestTimeout() * 2);
 
-  before(() => {
-    if (process.env.INSTANA_TEST_SKIP_INSTALLING_DEPS === 'true') {
-      return;
-    }
-
-    execSync('./preinstall.sh', { cwd: __dirname, stdio: 'inherit' });
-
-    execSync('npm install --no-save --no-package-lock --prefix ./ ./core.tgz', {
-      cwd: __dirname,
-      stdio: 'inherit'
-    });
-
-    execSync('npm install --no-save --no-package-lock --prefix ./ ./collector.tgz', {
-      cwd: __dirname,
-      stdio: 'inherit'
-    });
-  });
-
   // TODO: Restify test is broken in v24. See Issue: https://github.com/restify/node-restify/issues/1984
   runTests('restify', function () {
     describe('opentelemetry is enabled', function () {