fix

Author: piotr-szewczyk

packages/node-core/src/client.ts

@@ -5,11 +5,13 @@ export abstract class CoreClient implements INodeClient {
     public options: TraceoOptions;
     public headers: { [key: string]: any; };
 
-    constructor(apiKey: string, options: Omit<TraceoOptions, "apiKey">) {
+    constructor(apiKey: string, { collectMetrics = true, offline = false, ...opts }: Omit<TraceoOptions, "apiKey">) {
         this.configGlobalClient();
 
         this.options = {
-            ...options,
+            ...opts,
+            collectMetrics,
+            offline,
             apiKey
         };
 

packages/node-core/src/types/options.ts

@@ -1,25 +1,30 @@
 /**
- * Interface with data provided by client
+ * Interface with data provided by client.
  */
 export interface TraceoOptions {
   apiKey: string;
+
+  /**
+   * In offline mode no data is collected by the SDK.
+   */
+
   offline?: boolean;
+  
+  /**
+   * Host address to your Traceo Platform.
+   */
   host: string;
+
   /* 
-    Determining if Traceo should collect metrics from the application.
-  */
+   * Determining if Traceo should collect metrics from the application.
+   * Default set to true.    
+   */
   collectMetrics?: boolean;
+
   /*
-    The number of seconds that the metrics are downloaded. 
-    The minimum value for this field is 15. If the value is set below this value, 
-    then the data will be downloaded just for this time.
-  */
-  scrapMetricsInterval?: number;
-  /*
-    Default is 60s.
-    Value can't be smaller than 15.
-  */
-  scrapLogsInterval?: number;
+   * The number of miliseconds to scrap metrics and logs.
+   */
+  exportIntervalMillis?: number;
 }
 
 export interface ErrorMiddlewareOptions {

packages/node/src/logger.ts

@@ -2,17 +2,18 @@ import { format } from "util";
 import { CAPTURE_ENDPOINT, LogLevel, transport } from "@traceo-sdk/node-core";
 import { getGlobalTraceo } from "@traceo-sdk/node-core/dist/utils";
 
+const DEFAULT_EXPORT_INTERVAL = 15000;
 export class Logger {
   private logsQueue = [];
-  private INTERVAL = 60;
+  private INTERVAL = DEFAULT_EXPORT_INTERVAL;
 
   constructor() {
     this.logsQueue = [];
 
     const client = getGlobalTraceo();
 
-    const scrapLogsInterval = client.options.scrapLogsInterval;
-    if (scrapLogsInterval && scrapLogsInterval >= 15) {
+    const scrapLogsInterval = client.options.exportIntervalMillis;
+    if (scrapLogsInterval && scrapLogsInterval >= DEFAULT_EXPORT_INTERVAL) {
       this.INTERVAL = scrapLogsInterval;
     }
 

packages/node/src/metrics/index.ts

@@ -1,19 +1,18 @@
-import { Client } from "../client";
 import { CpuUsageMetrics } from "./default/cpu-usage";
 import { EventLoopMetrics } from "./default/event-loop";
 import { HeapMetrics } from "./default/heap";
 import { MemoryUsageMetrics } from "./default/memory-usage";
-import { transport, CAPTURE_ENDPOINT, utils, MetricType, InstrumentType, ValueType } from "@traceo-sdk/node-core";
+import { transport, CAPTURE_ENDPOINT, utils, MetricType, InstrumentType, ValueType, INodeClient } from "@traceo-sdk/node-core";
 import * as os from "os";
 
 /**
  * Runner for metrics collecting
  */
 
-const DEFAULT_INTERVAL = 30; //seconds
+const DEFAULT_INTERVAL = 15000; //ms -> 15s
 
 export class MetricsRunner {
-  private client: Client;
+  private client: INodeClient;
 
   private readonly interval: number;
 
@@ -28,13 +27,13 @@ export class MetricsRunner {
   public clientMeauserementMetrics: Record<string, number[]>;
 
   constructor() {
-    this.client = global["__TRACEO__"];
+    this.client = utils.getGlobalTraceo();
 
     if (!this.client.options.collectMetrics) {
       return;
     }
 
-    this.interval = this.client.options.scrapMetricsInterval || DEFAULT_INTERVAL;
+    this.interval = this.client.options.exportIntervalMillis || DEFAULT_INTERVAL;
 
     this.cpuUsage = new CpuUsageMetrics();
     this.eventLoop = new EventLoopMetrics();