chore: OT dependency upgrade

MetinSeylan · Feb 19, 2022 · a07fc31 · a07fc31
1 parent 03696f7
commit a07fc31
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 220 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,15 +43,15 @@
     "@nestjs/core": "^8.1.1",
     "@nestjs/event-emitter": "^1.0.0",
     "@nestjs/microservices": "^8.1.1",
-    "@nestjs/schedule": "^1.0.1",
-    "@opentelemetry/api": "^1.0.3",
+    "@nestjs/schedule": "^1.0.2",
+    "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/context-async-hooks": "^1.0.1",
     "@opentelemetry/core": "^1.0.1",
-    "@opentelemetry/host-metrics": "^0.26.0",
+    "@opentelemetry/host-metrics": "^0.27.1",
     "@opentelemetry/instrumentation-http": "^0.27.0",
     "@opentelemetry/propagator-b3": "^1.0.1",
     "@opentelemetry/propagator-jaeger": "^1.0.1",
-    "@opentelemetry/resource-detector-aws": "^1.0.1",
+    "@opentelemetry/resource-detector-aws": "^1.0.3",
     "@opentelemetry/resources": "^1.0.1",
     "@opentelemetry/sdk-node": "^0.27.0",
     "@opentelemetry/sdk-trace-base": "^1.0.1",

diff --git a/src/Metric/Injectors/DecoratorObserverMetricInjector.ts b/src/Metric/Injectors/DecoratorObserverMetricInjector.ts
@@ -89,7 +89,7 @@ export class DecoratorObserverMetricInjector extends BaseMetricInjector {
   private generateMetric(name: string, metricOptions: MetricOptions) {
     const metric = this.metricService
       .getMeter()
-      .createValueRecorder(name, metricOptions);
+      .createHistogram(name, metricOptions);
 
     return (time) => {
       metric.record(time, this.metricService.getLabels());

diff --git a/src/Metric/Metrics/ActiveHandlesMetric.ts b/src/Metric/Metrics/ActiveHandlesMetric.ts
@@ -1,15 +1,15 @@
 import { BaseMetric } from './BaseMetric';
 import { MetricService } from '../MetricService';
 import { Injectable } from '@nestjs/common';
-import { ValueObserver } from '@opentelemetry/api-metrics';
+import { ObservableGauge } from '@opentelemetry/api-metrics';
 
 @Injectable()
 export class ActiveHandlesMetric implements BaseMetric {
   name = 'nodejs_active_handles';
   description =
     'Number of active libuv handles grouped by handle type. Every handle type is C++ class name.';
 
-  private valueObserver: ValueObserver;
+  private observableGauge: ObservableGauge;
 
   constructor(private readonly metricService: MetricService) {}
 
@@ -18,10 +18,10 @@ export class ActiveHandlesMetric implements BaseMetric {
       return;
     }
 
-    this.valueObserver = this.metricService
+    this.observableGauge = this.metricService
       .getProvider()
       .getMeter('default')
-      .createValueObserver(
+      .createObservableGauge(
         this.name,
         {
           description: this.description,
@@ -31,7 +31,6 @@ export class ActiveHandlesMetric implements BaseMetric {
   }
 
   private observerCallback(observerResult) {
-    this.valueObserver.clear();
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     const handles = process._getActiveHandles();

diff --git a/src/Metric/Metrics/ActiveHandlesTotalMetric.ts b/src/Metric/Metrics/ActiveHandlesTotalMetric.ts
@@ -1,14 +1,14 @@
 import { BaseMetric } from './BaseMetric';
 import { MetricService } from '../MetricService';
 import { Injectable } from '@nestjs/common';
-import { ValueObserver } from '@opentelemetry/api-metrics';
+import { ObservableGauge } from '@opentelemetry/api-metrics';
 
 @Injectable()
 export class ActiveHandlesTotalMetric implements BaseMetric {
   name = 'nodejs_active_handles_total';
   description = 'Total number of active handles.';
 
-  private valueObserver: ValueObserver;
+  private observableBase: ObservableGauge;
 
   constructor(private readonly metricService: MetricService) {}
 
@@ -17,10 +17,10 @@ export class ActiveHandlesTotalMetric implements BaseMetric {
       return;
     }
 
-    this.valueObserver = this.metricService
+    this.observableBase = this.metricService
       .getProvider()
       .getMeter('default')
-      .createValueObserver(
+      .createObservableGauge(
         this.name,
         {
           description: this.description,
@@ -30,7 +30,6 @@ export class ActiveHandlesTotalMetric implements BaseMetric {
   }
 
   private observerCallback(observerResult) {
-    this.valueObserver.clear();
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     const handles = process._getActiveHandles();

diff --git a/src/Metric/Metrics/Grpc/GrpcRequestDurationSeconds.ts b/src/Metric/Metrics/Grpc/GrpcRequestDurationSeconds.ts
@@ -3,7 +3,7 @@ import { MetricService } from '../../MetricService';
 import { Injectable } from '@nestjs/common';
 import {
   MetricOptions,
-  ValueRecorder,
+  Histogram,
   ValueType,
 } from '@opentelemetry/api-metrics';
 import { OnEvent } from '@nestjs/event-emitter';
@@ -20,23 +20,23 @@ export class GrpcRequestDurationSeconds implements BaseMetric {
   name = 'grpc_request_duration_seconds';
   description = 'grpc_request_duration_seconds';
 
-  private valueRecorder: ValueRecorder;
+  private histogram: Histogram;
 
   constructor(private readonly metricService: MetricService) {}
 
   async inject(): Promise<void> {
-    this.valueRecorder = this.metricService
+    this.histogram = this.metricService
       .getProvider()
       .getMeter('default')
-      .createValueRecorder(this.name, {
+      .createHistogram(this.name, {
         ...GrpcRequestDurationSeconds.metricOptions,
         description: this.description,
       });
   }
 
   @OnEvent(ProducerEvent.GRPC)
   onResult(event: ProducerGrpcEvent) {
-    this.valueRecorder.record(
+    this.histogram.record(
       event.time,
       Object.assign(event.labels, this.metricService.getLabels()),
     );

diff --git a/src/Metric/Metrics/Http/HttpRequestDurationSeconds.ts b/src/Metric/Metrics/Http/HttpRequestDurationSeconds.ts
@@ -1,7 +1,7 @@
 import { BaseMetric } from '../BaseMetric';
 import { MetricService } from '../../MetricService';
 import { Injectable } from '@nestjs/common';
-import { ValueRecorder, ValueType } from '@opentelemetry/api-metrics';
+import { Histogram, ValueType } from '@opentelemetry/api-metrics';
 import { OnEvent } from '@nestjs/event-emitter';
 import { ProducerEvent } from '../../Interceptors/ProducerEvent';
 import { ProducerHttpEvent } from '../../Interceptors/Http/ProducerHttpEvent';
@@ -17,23 +17,23 @@ export class HttpRequestDurationSeconds implements BaseMetric {
   name = 'http_request_duration_seconds';
   description = 'http_request_duration_seconds';
 
-  private valueRecorder: ValueRecorder;
+  private histogram: Histogram;
 
   constructor(private readonly metricService: MetricService) {}
 
   async inject(): Promise<void> {
-    this.valueRecorder = this.metricService
+    this.histogram = this.metricService
       .getProvider()
       .getMeter('default')
-      .createValueRecorder(this.name, {
+      .createHistogram(this.name, {
         ...HttpRequestDurationSeconds.metricOptions,
         description: this.description,
       });
   }
 
   @OnEvent(ProducerEvent.HTTP)
   onResult(event: ProducerHttpEvent) {
-    this.valueRecorder.record(
+    this.histogram.record(
       event.time,
       Object.assign(event.labels, this.metricService.getLabels()),
     );

diff --git a/src/Metric/Metrics/ProcessMaxFdsMetric.ts b/src/Metric/Metrics/ProcessMaxFdsMetric.ts
@@ -1,15 +1,15 @@
 import { BaseMetric } from './BaseMetric';
 import { MetricService } from '../MetricService';
 import { Injectable } from '@nestjs/common';
-import { ValueObserver } from '@opentelemetry/api-metrics';
+import { ObservableGauge } from '@opentelemetry/api-metrics';
 import * as fs from 'fs';
 
 @Injectable()
 export class ProcessMaxFdsMetric implements BaseMetric {
   name = 'process_max_fds';
   description = 'Maximum number of open file descriptors.';
 
-  private valueObserver: ValueObserver;
+  private observableBase: ObservableGauge;
   private maxFds;
 
   constructor(private readonly metricService: MetricService) {}
@@ -33,10 +33,10 @@ export class ProcessMaxFdsMetric implements BaseMetric {
 
     if (this.maxFds === undefined) return;
 
-    this.valueObserver = this.metricService
+    this.observableBase = this.metricService
       .getProvider()
       .getMeter('default')
-      .createValueObserver(
+      .createObservableGauge(
         this.name,
         {
           description: this.description,

diff --git a/src/Metric/Metrics/ProcessOpenFdsMetric.ts b/src/Metric/Metrics/ProcessOpenFdsMetric.ts
@@ -1,15 +1,15 @@
 import { BaseMetric } from './BaseMetric';
 import { MetricService } from '../MetricService';
 import { Injectable } from '@nestjs/common';
-import { ValueObserver } from '@opentelemetry/api-metrics';
+import { ObservableGauge } from '@opentelemetry/api-metrics';
 import * as fs from 'fs';
 
 @Injectable()
 export class ProcessOpenFdsMetric implements BaseMetric {
   name = 'process_open_fds';
   description = 'Number of open file descriptors.';
 
-  private valueObserver: ValueObserver;
+  private observableBase: ObservableGauge;
 
   constructor(private readonly metricService: MetricService) {}
 
@@ -18,10 +18,10 @@ export class ProcessOpenFdsMetric implements BaseMetric {
       return;
     }
 
-    this.valueObserver = this.metricService
+    this.observableBase = this.metricService
       .getProvider()
       .getMeter('default')
-      .createValueObserver(
+      .createObservableGauge(
         this.name,
         {
           description: this.description,

diff --git a/src/Metric/Metrics/ProcessStartTimeMetric.ts b/src/Metric/Metrics/ProcessStartTimeMetric.ts
@@ -3,26 +3,26 @@ import { MetricService } from '../MetricService';
 import { Injectable } from '@nestjs/common';
 import {
   AggregationTemporality,
-  ValueObserver,
+  ObservableGauge,
 } from '@opentelemetry/api-metrics';
 
 @Injectable()
 export class ProcessStartTimeMetric implements BaseMetric {
   name = 'process_start_time_seconds';
   description = 'Start time of the process since unix epoch in seconds.';
 
-  private valueObserver: ValueObserver;
+  private observableGauge: ObservableGauge;
   private readonly uptimeInSecond = Math.round(
     Date.now() / 1000 - process.uptime(),
   );
 
   constructor(private readonly metricService: MetricService) {}
 
   async inject(): Promise<void> {
-    this.valueObserver = this.metricService
+    this.observableGauge = this.metricService
       .getProvider()
       .getMeter('default')
-      .createValueObserver(
+      .createObservableGauge(
         this.name,
         {
           description: this.description,

diff --git a/src/Metric/Metrics/RabbitMQ/GrpcRequestDurationSeconds.ts b/src/Metric/Metrics/RabbitMQ/GrpcRequestDurationSeconds.ts
@@ -3,7 +3,7 @@ import { MetricService } from '../../MetricService';
 import { Injectable } from '@nestjs/common';
 import {
   MetricOptions,
-  ValueRecorder,
+  Histogram,
   ValueType,
 } from '@opentelemetry/api-metrics';
 import { OnEvent } from '@nestjs/event-emitter';
@@ -20,23 +20,23 @@ export class RabbitMqRequestDurationSeconds implements BaseMetric {
   name = 'rmq_request_duration_seconds';
   description = 'rmq_request_duration_seconds';
 
-  private valueRecorder: ValueRecorder;
+  private histogram: Histogram;
 
   constructor(private readonly metricService: MetricService) {}
 
   async inject(): Promise<void> {
-    this.valueRecorder = this.metricService
+    this.histogram = this.metricService
       .getProvider()
       .getMeter('default')
-      .createValueRecorder(this.name, {
+      .createHistogram(this.name, {
         ...RabbitMqRequestDurationSeconds.metricOptions,
         description: this.description,
       });
   }
 
   @OnEvent(ProducerEvent.RMQ)
   onResult(event: ProducerGrpcEvent) {
-    this.valueRecorder.record(
+    this.histogram.record(
       event.time,
       Object.assign(event.labels, this.metricService.getLabels()),
     );