feat/time series instrumet type

Author: piotr-szewczyk

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

@@ -18,7 +18,7 @@ export interface Attributes {
  *
  * null or undefined attribute values are invalid and will result in undefined behavior.
  */
-export declare type AttributeValue = string | number | boolean | Array<null | undefined | string> | Array<null | undefined | number> | Array<null | undefined | boolean>;
+export type AttributeValue = string | number | boolean | Array<null | undefined | string> | Array<null | undefined | number> | Array<null | undefined | boolean>;
 
 /**
  * Defines High-Resolution Time.
@@ -32,7 +32,7 @@ export declare type AttributeValue = string | number | boolean | Array<null | un
  * HrTime[1] = Number((1609504210.150 - HrTime[0]).toFixed(9)) * 1e9 = 150000000.
  * This is represented in HrTime format as [1609504210, 150000000].
  */
-export declare type HrTime = [number, number];
+export type HrTime = [number, number];
 
 /**
  * An instrumentation scope consists of the name and optional version
@@ -136,7 +136,7 @@ export interface ExponentialHistogramMetricData extends BaseMetricData {
 /**
  * Represents an aggregated metric data.
  */
-export declare type MetricData = SumMetricData | GaugeMetricData | HistogramMetricData | ExponentialHistogramMetricData;
+export type MetricData = SumMetricData | GaugeMetricData | HistogramMetricData | ExponentialHistogramMetricData;
 export interface ScopeMetrics {
     scope: InstrumentationScope;
     metrics: MetricData[];
@@ -145,7 +145,7 @@ export interface ScopeMetrics {
 /**
  * The aggregated point data type.
  */
-export declare enum DataPointType {
+export enum DataPointType {
     /**
      * A histogram data point contains a histogram statistics of collected
      * values with a list of explicit bucket boundaries and statistics such
@@ -199,17 +199,20 @@ export interface DataPoint<T> {
 /**
  * Supported types of metric instruments.
  */
-export declare enum InstrumentType {
+export enum InstrumentType {
     COUNTER = "COUNTER",
     HISTOGRAM = "HISTOGRAM",
     UP_DOWN_COUNTER = "UP_DOWN_COUNTER",
     OBSERVABLE_COUNTER = "OBSERVABLE_COUNTER",
     OBSERVABLE_GAUGE = "OBSERVABLE_GAUGE",
-    OBSERVABLE_UP_DOWN_COUNTER = "OBSERVABLE_UP_DOWN_COUNTER"
+    OBSERVABLE_UP_DOWN_COUNTER = "OBSERVABLE_UP_DOWN_COUNTER",
+
+    // NEW
+    TIME_SERIES = "TIME_SERIES"
 }
 
 /** The Type of value. It describes how the data is reported. */
-export declare enum ValueType {
+export enum ValueType {
     INT = 0,
     DOUBLE = 1
 }
@@ -294,7 +297,7 @@ export interface ResourceMetrics {
     scopeMetrics: ScopeMetrics[];
 }
 
-export declare enum ExportResultCode {
+export enum ExportResultCode {
     SUCCESS = 0,
     FAILED = 1
 }

packages/node/src/client.ts

@@ -23,6 +23,8 @@ export class Client extends CoreClient implements INodeClient {
     const scrapper = new Scrapper();
     scrapper.collect();
 
+    console.log("options: ", this.options);
+
     if (this.options.collectMetrics) {
       const metrics = new MetricsRunner();
       metrics.register();

packages/node/src/metrics/default/cpu-usage.ts

@@ -19,7 +19,7 @@ export class CpuUsageMetrics implements IMetrics {
     return [{
       descriptor: {
         name: "cpu_usage",
-        type: InstrumentType.HISTOGRAM,
+        type: InstrumentType.TIME_SERIES,
         valueType: ValueType.DOUBLE
       },
       dataPoints: [{ value: cpuUsage }]

packages/node/src/metrics/default/event-loop.ts

@@ -35,7 +35,7 @@ export class EventLoopMetrics implements IMetrics {
     const response: MetricType = metrics.map((metric) => ({
       descriptor: {
         name: metric,
-        type: InstrumentType.HISTOGRAM,
+        type: InstrumentType.TIME_SERIES,
         valueType: ValueType.DOUBLE
       },
       dataPoints: [{ value: data[metric] }]

packages/node/src/metrics/default/heap.ts

@@ -12,15 +12,15 @@ export class HeapMetrics implements IMetrics {
   collect(): MetricType {
     return [
       {
-        descriptor: { name: "heap_used", type: InstrumentType.HISTOGRAM, unit: "", },
+        descriptor: { name: "heap_used", type: InstrumentType.TIME_SERIES },
         dataPoints: [{ value: this.usedHeap }]
       },
       {
-        descriptor: { name: "heap_total", type: InstrumentType.HISTOGRAM, unit: "", },
+        descriptor: { name: "heap_total", type: InstrumentType.TIME_SERIES },
         dataPoints: [{ value: this.totalHeap }]
       },
       {
-        descriptor: { name: "heap_rss", type: InstrumentType.HISTOGRAM, unit: "", },
+        descriptor: { name: "heap_rss", type: InstrumentType.TIME_SERIES },
         dataPoints: [{ value: this.rss }]
       },
     ];

packages/node/src/metrics/default/memory-usage.ts

@@ -7,11 +7,11 @@ export class MemoryUsageMetrics implements IMetrics {
   public collect(): MetricType {
     return [
       {
-        descriptor: { name: "memory_usage_mb", type: InstrumentType.HISTOGRAM, unit: "", },
+        descriptor: { name: "memory_usage_mb", type: InstrumentType.TIME_SERIES, unit: "mb", },
         dataPoints: [{ value: this.usedMemory }]
       },
       {
-        descriptor: { name: "memory_usage_percentage", type: InstrumentType.HISTOGRAM, unit: "", },
+        descriptor: { name: "memory_usage_percentage", type: InstrumentType.TIME_SERIES, unit: "mb", },
         dataPoints: [{ value: this.percentageUsage }]
       }
     ];

packages/node/src/metrics/index.ts

@@ -42,7 +42,7 @@ export class MetricsRunner {
   }
 
   public register(): void {
-    setInterval(() => this.collectMetrics(), this.interval * 1000);
+    setInterval(() => this.collectMetrics(), this.interval);
   }
 
   private collectMetrics(): void {