Metrics: Fix DistributionValue buckets properties (#258)

* Fix DistributionValue buckets * Make exemplar optional As per metrics.proto, we omit exemplar field when the distribution does not have a histogram.
census-instrumentation · Jan 2, 2019 · 07e94f7 · 07e94f7
1 parent 52c304e
commit 07e94f7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/packages/opencensus-core/src/metrics/export/types.ts b/packages/opencensus-core/src/metrics/export/types.ts
@@ -238,7 +238,7 @@ export interface Bucket {
   /**
    * If the distribution does not have a histogram, then omit this field.
    */
-  readonly exemplar: Exemplar;
+  readonly exemplar?: Exemplar;
 }
 
 /**

diff --git a/packages/opencensus-core/src/stats/view.ts b/packages/opencensus-core/src/stats/view.ts
@@ -16,7 +16,7 @@
 
 import * as defaultLogger from '../common/console-logger';
 import * as loggerTypes from '../common/types';
-import {LabelValue, Metric, MetricDescriptor, MetricDescriptorType, Point, TimeSeries, Timestamp} from '../metrics/export/types';
+import {DistributionValue, LabelValue, Metric, MetricDescriptor, MetricDescriptorType, Point, TimeSeries, Timestamp} from '../metrics/export/types';
 
 import {BucketBoundaries} from './bucket-boundaries';
 import {MetricUtils} from './metric-utils';
@@ -254,10 +254,12 @@ export class BaseView implements View {
         sum,
         sumOfSquaredDeviation,
         bucketOptions: {explicit: {bounds: data.buckets}},
-        buckets: data.bucketCounts
-      };
+        // Bucket without an Exemplar.
+        buckets:
+            data.bucketCounts.map(bucketCount => ({count: bucketCount}))
+      } as DistributionValue;
     } else {
-      value = data.value;
+      value = data.value as number;
     }
     return {timestamp, value};
   }

diff --git a/packages/opencensus-core/test/test-metric-producer.ts b/packages/opencensus-core/test/test-metric-producer.ts
@@ -98,7 +98,7 @@ describe('Metric producer for stats', () => {
     points: [{
       value: {
         'bucketOptions': {'explicit': {'bounds': [2, 4, 6]}},
-        'buckets': [1, 2, 2, 0],
+        'buckets': [{count: 1}, {count: 2}, {count: 2}, {count: 0}],
         'count': 5,
         'sum': 16.099999999999998,
         'sumOfSquaredDeviation': 10.427999999999997

diff --git a/packages/opencensus-core/test/test-view.ts b/packages/opencensus-core/test/test-view.ts
@@ -292,7 +292,7 @@ describe('BaseView', () => {
         assert.notEqual(typeof value, 'number');
         assert.deepStrictEqual((value as DistributionValue), {
           bucketOptions: {explicit: {bounds: buckets}},
-          buckets: [1, 2, 2, 0],
+          buckets: [{count: 1}, {count: 2}, {count: 2}, {count: 0}],
           count: 5,
           sum: total,
           sumOfSquaredDeviation: 10.427999999999997
@@ -334,7 +334,7 @@ describe('BaseView', () => {
             assert.notEqual(typeof value, 'number');
             assert.deepStrictEqual((value as DistributionValue), {
               bucketOptions: {explicit: {bounds: buckets}},
-              buckets: [1, 2, 2, 0],
+              buckets: [{count: 1}, {count: 2}, {count: 2}, {count: 0}],
               count: 5,
               sum: total,
               sumOfSquaredDeviation: 10.427999999999997
@@ -353,7 +353,7 @@ describe('BaseView', () => {
             assert.notEqual(typeof value, 'number');
             assert.deepStrictEqual((value as DistributionValue), {
               bucketOptions: {explicit: {bounds: buckets}},
-              buckets: [1, 2, 2, 0],
+              buckets: [{count: 1}, {count: 2}, {count: 2}, {count: 0}],
               count: 5,
               sum: total,
               sumOfSquaredDeviation: 10.427999999999997