refactor: moved agent config types to collector

Author: kirrg001

packages/collector/src/agent/opts.js

@@ -16,7 +16,7 @@ exports.agentUuid = undefined;
 // @ts-ignore - Cannot redeclare exported variable
 exports.autoProfile = false;
 
-/** @type {import('@instana/core/src/config').AgentConfig} config */
+/** @type {import('@instana/collector/src/types/collector').AgentConfig} config */
 exports.config = {};
 
 /**

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

@@ -1,12 +1,31 @@
 import { GenericLogger } from '@instana/core/src/core';
 
+export interface AgentConfig {
+  tracing?: {
+    http?: {
+      extraHttpHeadersToCapture?: string[];
+    };
+    kafka?: {
+      traceCorrelation?: boolean;
+    };
+    spanBatchingEnabled?: boolean | string;
+    ignoreEndpoints?: import('@instana/core/src/tracing').IgnoreEndpoints;
+    disable?: import('@instana/core/src/tracing').Disable;
+    [key: string]: any;
+  };
+  [key: string]: any;
+}
+
 export interface CollectorConfig {
   agentPort?: number;
   agentHost?: string;
+  requestTimeout?: number;
+  agentUuid?: string;
   tracing?: {
     stackTraceLength?: number;
     [key: string]: any;
   };
+  agentConfig?: AgentConfig;
   autoProfile?: boolean | string;
   reportUnhandledPromiseRejections?: boolean;
   logger?: GenericLogger;

packages/core/src/config/index.js

@@ -74,30 +74,6 @@ const allowedSecretMatchers = ['equals', 'equals-ignore-case', 'contains', 'cont
  * @property {number} [timeBetweenHealthcheckCalls]
  */
 
-/**
- * @typedef {Object} AgentConfig
- * @property {AgentTracingConfig} [tracing]
- */
-
-/**
- * @typedef {Object} AgentTracingConfig
- * @property {AgentTracingHttpConfig} [http]
- * @property {AgentTracingKafkaConfig} [kafka]
- * @property {boolean|string} [spanBatchingEnabled]
- * @property {import('../tracing').IgnoreEndpoints} [ignoreEndpoints]
- * @property {import('../tracing').Disable} [disable]
- */
-
-/**
- * @typedef {Object} AgentTracingHttpConfig
- * @property {Array.<string>} [extraHttpHeadersToCapture]
- */
-
-/**
- * @typedef {Object} AgentTracingKafkaConfig
- * @property {boolean} [traceCorrelation]
- */
-
 /** @type {import('../core').GenericLogger} */
 let logger;
 

packages/core/src/tracing/spanBuffer.js

@@ -103,7 +103,7 @@ exports.init = function init(config, _downstreamConnection) {
 };
 
 /**
- * @param {import('../config').AgentConfig} extraConfig
+ * @param {import('@instana/collector/src/types/collector').AgentConfig} extraConfig
  */
 exports.activate = function activate(extraConfig) {
   if (!downstreamConnection) {

packages/core/src/util/disableInstrumentation.js

@@ -9,7 +9,7 @@ const { DISABLABLE_INSTRUMENTATION_GROUPS } = require('../tracing/constants');
 /** @type {import('../config').InstanaConfig} */
 let config;
 
-/** @type {import('../config').AgentConfig} */
+/** @type {import('@instana/collector/src/types/collector').AgentConfig} */
 let agentConfig;
 
 /**
@@ -20,7 +20,7 @@ function init(_config) {
 }
 
 /**
- * @param {import('../config').AgentConfig} _agentConfig
+ * @param {import('@instana/collector/src/types/collector').AgentConfig} _agentConfig
  */
 function activate(_agentConfig) {
   agentConfig = _agentConfig;

packages/core/src/util/index.js

@@ -42,7 +42,7 @@ exports.init = function init(config) {
 };
 
 /**
- * @param {import('../config').AgentConfig} extraConfig
+ * @param {import('@instana/collector/src/types/collector').AgentConfig} extraConfig
  */
 exports.activate = function activate(extraConfig) {
   disableInstrumentation.activate(extraConfig);

packages/core/src/util/spanFilter.js

@@ -19,7 +19,7 @@ function init(config) {
 }
 
 /**
- * @param {import('../config').AgentConfig} extraConfig
+ * @param {import('@instana/collector/src/types/collector').AgentConfig} extraConfig
  */
 function activate(extraConfig) {
   /**