Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit e0e82f1

Browse files
authored
Fix equalMeasureAggTagKeys for Stackdriver exporter. (#685)
Fixes #683. Count aggregation will always be exported as INT64 MetricDescriptor, no matter whether Measure is INT64 or FLOAT64.
1 parent ead56c4 commit e0e82f1

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

exporter/stackdriver/stats.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ func equalMeasureAggTagKeys(md *metricpb.MetricDescriptor, m stats.Measure, agg
404404
var aggTypeMatch bool
405405
switch md.ValueType {
406406
case metricpb.MetricDescriptor_INT64:
407-
if _, ok := m.(*stats.Int64Measure); !ok {
407+
if _, ok := m.(*stats.Int64Measure); !(ok || agg.Type == view.AggTypeCount) {
408408
return fmt.Errorf("stackdriver metric descriptor was not created as int64")
409409
}
410410
aggTypeMatch = agg.Type == view.AggTypeCount || agg.Type == view.AggTypeSum || agg.Type == view.AggTypeLastValue

exporter/stackdriver/stats_test.go

+12-1
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ func TestEqualAggWindowTagKeys(t *testing.T) {
424424
wantErr bool
425425
}{
426426
{
427-
name: "count agg",
427+
name: "count agg with in64 measure",
428428
md: &metricpb.MetricDescriptor{
429429
MetricKind: metricpb.MetricDescriptor_CUMULATIVE,
430430
ValueType: metricpb.MetricDescriptor_INT64,
@@ -434,6 +434,17 @@ func TestEqualAggWindowTagKeys(t *testing.T) {
434434
agg: view.Count(),
435435
wantErr: false,
436436
},
437+
{
438+
name: "count agg with double measure",
439+
md: &metricpb.MetricDescriptor{
440+
MetricKind: metricpb.MetricDescriptor_CUMULATIVE,
441+
ValueType: metricpb.MetricDescriptor_INT64,
442+
Labels: []*label.LabelDescriptor{{Key: opencensusTaskKey}},
443+
},
444+
m: stats.Float64("name", "", ""),
445+
agg: view.Count(),
446+
wantErr: false,
447+
},
437448
{
438449
name: "sum agg double",
439450
md: &metricpb.MetricDescriptor{

0 commit comments

Comments
 (0)