chore: fixed tests

Author: kirrg001

packages/collector/src/announceCycle/unannounced.js

@@ -43,9 +43,9 @@ const maxRetryDelay = 60 * 1000; // one minute
  * @typedef {Object} TracingConfig
  * @property {Array.<string>} [extra-http-headers]
  * @property {KafkaTracingConfig} [kafka]
- * @property {import('@instana/core/src/tracing').IgnoreEndpoints} [ignore-endpoints]
+ * @property {import('@instana/core/src/config/types').IgnoreEndpoints} [ignore-endpoints]
  * @property {boolean} [span-batching-enabled]
- * @property {import('@instana/core/src/tracing').Disable} [disable]
+ * @property {import('@instana/core/src/config/types').Disable} [disable]
  */
 
 /**

packages/collector/src/types/collector.d.ts

@@ -1,4 +1,5 @@
 import { GenericLogger } from '@instana/core/src/core';
+import { IgnoreEndpoints, Disable } from '@instana/core/src/config/types';
 
 export interface AgentConfig {
   tracing?: {
@@ -9,8 +10,8 @@ export interface AgentConfig {
       traceCorrelation?: boolean;
     };
     spanBatchingEnabled?: boolean | string;
-    ignoreEndpoints?: import('@instana/core/src/tracing').IgnoreEndpoints;
-    disable?: import('@instana/core/src/tracing').Disable;
+    ignoreEndpoints?: IgnoreEndpoints;
+    disable?: Disable;
     [key: string]: any;
   };
   [key: string]: any;

packages/core/src/config/configNormalizers/disable.js

@@ -104,7 +104,7 @@ exports.normalizeExternalConfig = function normalizeExternalConfig(config) {
  * 3. INSTANA_TRACING_DISABLE=list
  * 4. INSTANA_DISABLED_TRACERS (deprecated)
  *
- * @returns {import('../../tracing').Disable}
+ * @returns {import('../../config/types').Disable}
  */
 function getDisableFromEnv() {
   const disable = {};

packages/core/src/config/configNormalizers/ignoreEndpoints.js

@@ -25,8 +25,8 @@ exports.init = function init(config) {
  * Normalized internal structure:
  * - { [serviceName: string]: [{ methods: string[], endpoints: string[] }] }
  *
- * @param {import('../../tracing').IgnoreEndpoints} ignoreEndpointConfig
- * @returns {import('../../tracing').IgnoreEndpoints}
+ * @param {import('../../config/types').IgnoreEndpoints} ignoreEndpointConfig
+ * @returns {import('../../config/types').IgnoreEndpoints}
  */
 
 exports.normalizeConfig = function normalizeConfig(ignoreEndpointConfig) {

packages/core/src/config/index.js

@@ -23,13 +23,13 @@ const deepMerge = require('../util/deepMerge');
  * @property {number} [transmissionDelay]
  * @property {number} [stackTraceLength]
  * @property {HTTPTracingOptions} [http]
- * @property {import('../tracing').Disable} [disable]
+ * @property {import('../config/types').Disable} [disable]
  * @property {Array<string>} [disabledTracers]
  * @property {boolean} [spanBatchingEnabled]
  * @property {boolean} [disableW3cTraceCorrelation]
  * @property {KafkaTracingOptions} [kafka]
  * @property {boolean} [allowRootExitSpan]
- * @property {import('../tracing').IgnoreEndpoints} [ignoreEndpoints]
+ * @property {import('../config/types').IgnoreEndpoints} [ignoreEndpoints]
  * @property {boolean} [ignoreEndpointsDisableSuppression]
  * @property {boolean} [disableEOLEvents]
  */

packages/core/src/config/types.d.ts

@@ -0,0 +1,16 @@
+export interface IgnoreEndpoints {
+  [key: string]: IgnoreEndpointsFields[];
+}
+
+export interface IgnoreEndpointsFields {
+  methods?: string[];
+  endpoints?: string[];
+  connections?: string[];
+}
+
+export interface TracingDisableOptions {
+  instrumentations?: string[];
+  groups?: string[];
+}
+
+export type Disable = TracingDisableOptions | boolean;

packages/core/src/tracing/index.js

@@ -118,27 +118,6 @@ if (customInstrumentations.length > 0) {
  * @property {boolean} [traceCorrelation]
  */
 
-/**
- * @typedef {Object.<string,IgnoreEndpointsFields[]>}  IgnoreEndpoints
- */
-
-/**
- * @typedef {Object} IgnoreEndpointsFields
- * @property {string[]} [methods]
- * @property {string[]} [endpoints]
- * @property {string[]} [connections]
- */
-
-/**
- * @typedef {TracingDisableOptions|boolean} Disable
- */
-
-/**
- * @typedef {Object} TracingDisableOptions
- * @property {string[]} [instrumentations]
- * @property {string[]} [groups]
- */
-
 /** @type {Array.<InstanaInstrumentedModule>} */
 let additionalInstrumentationModules = [];
 /** @type {Object.<string, InstanaInstrumentedModule>} */

packages/core/src/util/spanFilter.js

@@ -5,7 +5,7 @@
 'use strict';
 
 /**
- * @type {import('../tracing').IgnoreEndpoints}
+ * @type {import('../config/types').IgnoreEndpoints}
  */
 let ignoreEndpoints;
 
@@ -48,7 +48,7 @@ const IGNORABLE_SPAN_TYPES = ['redis', 'dynamodb', 'kafka', 'node.http.server'];
 /**
  * @param {import('../core').InstanaBaseSpan} span
  * @param {string} spanTypeKey
- * @param {import('../tracing').IgnoreEndpointsFields} ignoreconfig
+ * @param {import('../config/types').IgnoreEndpointsFields} ignoreconfig
  * @returns {boolean}
  */
 function matchEndpoints(span, spanTypeKey, ignoreconfig) {
@@ -87,7 +87,7 @@ function matchEndpoints(span, spanTypeKey, ignoreconfig) {
 /**
  * @param {import("../core").InstanaBaseSpan} span
  * @param {string} spanTypeKey
- * @param {import('../tracing').IgnoreEndpointsFields} ignoreconfig
+ * @param {import('../config/types').IgnoreEndpointsFields} ignoreconfig
  * @returns {boolean}
  */
 function matchMethods(span, spanTypeKey, ignoreconfig) {
@@ -107,7 +107,7 @@ function matchMethods(span, spanTypeKey, ignoreconfig) {
 /**
  * @param {import("../core").InstanaBaseSpan} span
  * @param {string} spanTypeKey
- * @param {import('../tracing').IgnoreEndpointsFields} ignoreconfig
+ * @param {import('../config/types').IgnoreEndpointsFields} ignoreconfig
  * @returns {boolean}
  */
 function matchConnections(span, spanTypeKey, ignoreconfig) {
@@ -127,7 +127,7 @@ function matchConnections(span, spanTypeKey, ignoreconfig) {
 
 /**
  * @param {import("../core").InstanaBaseSpan} span
- * @param {import('../tracing').IgnoreEndpoints} ignoreEndpointsConfig
+ * @param {import('../config/types').IgnoreEndpoints} ignoreEndpointsConfig
  * @returns {boolean}
  */
 function shouldIgnore(span, ignoreEndpointsConfig) {