From 61b8ab7b22e663c5ba8e88d6f3b7d7d77922bc09 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 28 Sep 2021 11:02:39 +0200 Subject: [PATCH 1/4] [pkg/otlp/model] Fix default for sendCountSum --- pkg/otlp/model/translator/metrics_translator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/otlp/model/translator/metrics_translator.go b/pkg/otlp/model/translator/metrics_translator.go index 2e35c20f08fc..127551ccc853 100644 --- a/pkg/otlp/model/translator/metrics_translator.go +++ b/pkg/otlp/model/translator/metrics_translator.go @@ -40,7 +40,7 @@ type Translator struct { func New(logger *zap.Logger, options ...Option) (*Translator, error) { cfg := translatorConfig{ HistMode: HistogramModeNoBuckets, - SendCountSum: true, + SendCountSum: false, Quantiles: false, SendMonotonic: true, ResourceAttributesAsTags: false, From 84bbd9414e7f4e1cedbd26a871b4e17499c55154 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 28 Sep 2021 11:29:02 +0200 Subject: [PATCH 2/4] Address review comment --- pkg/otlp/model/translator/metrics_translator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/otlp/model/translator/metrics_translator.go b/pkg/otlp/model/translator/metrics_translator.go index 127551ccc853..acf474e26cf6 100644 --- a/pkg/otlp/model/translator/metrics_translator.go +++ b/pkg/otlp/model/translator/metrics_translator.go @@ -39,7 +39,7 @@ type Translator struct { // New creates a new translator with given options. func New(logger *zap.Logger, options ...Option) (*Translator, error) { cfg := translatorConfig{ - HistMode: HistogramModeNoBuckets, + HistMode: HistogramModeDistributions, SendCountSum: false, Quantiles: false, SendMonotonic: true, From 95945e8d4cc90dab686f62b62757f57872fedceb Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 28 Sep 2021 11:32:43 +0200 Subject: [PATCH 3/4] Add check for illegal configuration --- pkg/otlp/model/translator/metrics_translator.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/otlp/model/translator/metrics_translator.go b/pkg/otlp/model/translator/metrics_translator.go index acf474e26cf6..f34e965c2ccd 100644 --- a/pkg/otlp/model/translator/metrics_translator.go +++ b/pkg/otlp/model/translator/metrics_translator.go @@ -55,6 +55,10 @@ func New(logger *zap.Logger, options ...Option) (*Translator, error) { return nil, err } } + + if cfg.HistMode == HistogramModeNoBuckets && !cfg.SendCountSum { + return nil, fmt.Errorf("no buckets mode and no send count sum are incompatible") + } cache := newTTLCache(cfg.sweepInterval, cfg.deltaTTL) return &Translator{cache, logger, cfg}, nil From 463ef63101e2a0d4a3a6b98d0f70ff7d466d6679 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 28 Sep 2021 11:47:49 +0200 Subject: [PATCH 4/4] Fix format --- pkg/otlp/model/translator/metrics_translator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/otlp/model/translator/metrics_translator.go b/pkg/otlp/model/translator/metrics_translator.go index f34e965c2ccd..ac9318842643 100644 --- a/pkg/otlp/model/translator/metrics_translator.go +++ b/pkg/otlp/model/translator/metrics_translator.go @@ -55,7 +55,7 @@ func New(logger *zap.Logger, options ...Option) (*Translator, error) { return nil, err } } - + if cfg.HistMode == HistogramModeNoBuckets && !cfg.SendCountSum { return nil, fmt.Errorf("no buckets mode and no send count sum are incompatible") }