chore: upgrade for opentelemtry js v0.12.0

GoogleCloudPlatform · Oct 28, 2020 · 8b42fd6 · 8b42fd6
1 parent 48898d5
commit 8b42fd6
Show file tree

Hide file tree

Showing 15 changed files with 183 additions and 205 deletions.
diff --git a/packages/opentelemetry-cloud-monitoring-exporter/package-lock.json b/packages/opentelemetry-cloud-monitoring-exporter/package-lock.json
diff --git a/packages/opentelemetry-cloud-monitoring-exporter/package.json b/packages/opentelemetry-cloud-monitoring-exporter/package.json
@@ -37,10 +37,10 @@
     "registry": "https://wombat-dressing-room.appspot.com"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.11.0",
-    "@opentelemetry/core": "^0.11.0",
-    "@opentelemetry/metrics": "^0.11.0",
-    "@opentelemetry/resources": "^0.11.0",
+    "@opentelemetry/api": "^0.12.0",
+    "@opentelemetry/core": "^0.12.0",
+    "@opentelemetry/metrics": "^0.12.0",
+    "@opentelemetry/resources": "^0.12.0",
     "@types/mocha": "7.0.2",
     "@types/nock": "11.1.0",
     "@types/node": "12.12.51",
@@ -60,9 +60,9 @@
     "googleapis": "^46.0.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.11.0",
-    "@opentelemetry/core": "^0.11.0",
-    "@opentelemetry/metrics": "^0.11.0",
-    "@opentelemetry/resources": "^0.11.0"
+    "@opentelemetry/api": "^0.12.0",
+    "@opentelemetry/core": "^0.12.0",
+    "@opentelemetry/metrics": "^0.12.0",
+    "@opentelemetry/resources": "^0.12.0"
   }
 }
diff --git a/packages/opentelemetry-cloud-monitoring-exporter/src/monitoring.ts b/packages/opentelemetry-cloud-monitoring-exporter/src/monitoring.ts
@@ -140,7 +140,7 @@ export class MetricExporter implements IMetricExporter {
     cb(ExportResult.SUCCESS);
   }
 
-  shutdown(): void {}
+  async shutdown(): Promise<void> {}
 
   /**
    * Returns true if the given metricDescriptor is successfully registered to

diff --git a/packages/opentelemetry-cloud-monitoring-exporter/src/transform.ts b/packages/opentelemetry-cloud-monitoring-exporter/src/transform.ts
@@ -16,7 +16,6 @@ import {
   MetricDescriptor as OTMetricDescriptor,
   MetricKind as OTMetricKind,
   MetricRecord,
-  Distribution as OTDistribution,
   Histogram as OTHistogram,
   Point as OTPoint,
   PointValueType,
@@ -232,10 +231,6 @@ function transformPoint(
 
 /** Transforms a OpenTelemetry Point's value to a StackDriver Point value. */
 function transformValue(valueType: OTValueType, value: PointValueType) {
-  if (isDistributionValue(value)) {
-    throw Error('unsupported distribution value type');
-    // no buckets aggregated, which is a required param in `distributionValue` for Cloud Monitoring v3
-  }
   if (isHistogramValue(value)) {
     return {
       distributionValue: {
@@ -258,17 +253,8 @@ function transformValue(valueType: OTValueType, value: PointValueType) {
   throw Error(`unsupported value type: ${valueType}`);
 }
 
-/** Returns true if value is of type OTDistribution */
-function isDistributionValue(
-  value: number | OTDistribution | OTHistogram
-): value is OTDistribution {
-  return Object.prototype.hasOwnProperty.call(value, 'min');
-}
-
 /** Returns true if value is of type OTHistogram */
-function isHistogramValue(
-  value: number | OTDistribution | OTHistogram
-): value is OTHistogram {
+function isHistogramValue(value: PointValueType): value is OTHistogram {
   return Object.prototype.hasOwnProperty.call(value, 'buckets');
 }
 

diff --git a/packages/opentelemetry-cloud-monitoring-exporter/test/transform.test.ts b/packages/opentelemetry-cloud-monitoring-exporter/test/transform.test.ts
@@ -24,7 +24,6 @@ import {
   MetricDescriptor as OTMetricDescriptor,
   Point as OTPoint,
   MeterProvider,
-  Distribution,
   Histogram,
 } from '@opentelemetry/metrics';
 import { ValueType as OTValueType, Labels } from '@opentelemetry/api';
@@ -342,34 +341,6 @@ describe('transform', () => {
       assert(result.interval.startTime);
     });
 
-    it('should export a distribution value', () => {
-      const metricDescriptor: OTMetricDescriptor = {
-        name: METRIC_NAME,
-        description: METRIC_DESCRIPTION,
-        unit: DEFAULT_UNIT,
-        metricKind: OTMetricKind.COUNTER,
-        valueType: OTValueType.DOUBLE,
-      };
-      const point: OTPoint<Distribution> = {
-        value: {
-          min: 20.0,
-          max: 75.4,
-          last: 40.3,
-          count: 22,
-          sum: 150,
-        },
-        timestamp: process.hrtime(),
-      };
-
-      assert.throws(() => {
-        return TEST_ONLY.transformPoint(
-          point,
-          metricDescriptor,
-          new Date().toISOString()
-        );
-      }, /unsupported distribution value type/);
-    });
-
     it('should export a histogram value', () => {
       const metricDescriptor: OTMetricDescriptor = {
         name: METRIC_NAME,

diff --git a/packages/opentelemetry-cloud-trace-exporter/package-lock.json b/packages/opentelemetry-cloud-trace-exporter/package-lock.json
diff --git a/packages/opentelemetry-cloud-trace-exporter/package.json b/packages/opentelemetry-cloud-trace-exporter/package.json
@@ -37,9 +37,9 @@
     "registry": "https://wombat-dressing-room.appspot.com"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.11.0",
-    "@opentelemetry/resources": "^0.11.0",
-    "@opentelemetry/tracing": "^0.11.0",
+    "@opentelemetry/api": "^0.12.0",
+    "@opentelemetry/resources": "^0.12.0",
+    "@opentelemetry/tracing": "^0.12.0",
     "@types/mocha": "7.0.2",
     "@types/node": "12.12.51",
     "@types/sinon": "9.0.4",
@@ -61,9 +61,9 @@
     "grpc": "^1.24.3"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.11.0",
-    "@opentelemetry/core": "^0.11.0",
-    "@opentelemetry/resources": "^0.11.0",
-    "@opentelemetry/tracing": "^0.11.0"
+    "@opentelemetry/api": "^0.12.0",
+    "@opentelemetry/core": "^0.12.0",
+    "@opentelemetry/resources": "^0.12.0",
+    "@opentelemetry/tracing": "^0.12.0"
   }
 }
diff --git a/packages/opentelemetry-cloud-trace-exporter/src/trace.ts b/packages/opentelemetry-cloud-trace-exporter/src/trace.ts
@@ -80,7 +80,7 @@ export class TraceExporter implements SpanExporter {
     resultCallback(result);
   }
 
-  shutdown(): void {}
+  async shutdown(): Promise<void> {}
 
   /**
    * Sends new spans to new or existing traces in the Google Cloud Trace format to the

diff --git a/packages/opentelemetry-cloud-trace-exporter/test/transform.test.ts b/packages/opentelemetry-cloud-trace-exporter/test/transform.test.ts
@@ -130,6 +130,7 @@ describe('transform', () => {
   });
 
   it('should drop unknown attribute types', () => {
+    // @ts-expect-error
     readableSpan.attributes.testUnknownType = { message: 'dropped' };
     const result = transformer(readableSpan);
     assert.deepStrictEqual(result.attributes!.droppedAttributesCount, 1);
@@ -172,6 +173,7 @@ describe('transform', () => {
       },
       attributes: {
         testAttr: 'value',
+        // @ts-expect-error
         droppedAttr: {},
       },
     });
@@ -230,6 +232,7 @@ describe('transform', () => {
       name: 'something happened',
       attributes: {
         error: true,
+        // @ts-expect-error
         dropped: {},
       },
       time: [1566156729, 809],

diff --git a/packages/opentelemetry-cloud-trace-propagator/package-lock.json b/packages/opentelemetry-cloud-trace-propagator/package-lock.json