mirror of
https://github.com/open-telemetry/opentelemetry-go.git
synced 2025-03-03 14:52:56 +02:00
8ef02a61aa
This PR adds histogram support to the prometheus exporter. - Adds a new aggregator selector that returns a histogram for `MeasureKind`. The selector can be constructed using `simple.NewWithHistogramMeasure` - Adds support for histogram aggregators in prometheus collect method. With this PR, the default selector is changed to use histograms. In order to support the prometheus histogram, the `aggregator.Histogram` interface is extended with the `Sum` method. fixes #487 Co-authored-by: Rahul Patel <rahulpa@google.com>
114 lines
3.7 KiB
Go
114 lines
3.7 KiB
Go
// Copyright The OpenTelemetry Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
|
|
"go.opentelemetry.io/otel/api/core"
|
|
"go.opentelemetry.io/otel/api/metric"
|
|
export "go.opentelemetry.io/otel/sdk/export/metric"
|
|
"go.opentelemetry.io/otel/sdk/export/metric/aggregator"
|
|
"go.opentelemetry.io/otel/sdk/metric/aggregator/array"
|
|
"go.opentelemetry.io/otel/sdk/metric/aggregator/histogram"
|
|
"go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue"
|
|
"go.opentelemetry.io/otel/sdk/metric/aggregator/sum"
|
|
)
|
|
|
|
type CheckpointSet struct {
|
|
encoder export.LabelEncoder
|
|
records map[string]export.Record
|
|
updates []export.Record
|
|
}
|
|
|
|
// NewCheckpointSet returns a test CheckpointSet that new records could be added.
|
|
// Records are grouped by their encoded labels.
|
|
func NewCheckpointSet(encoder export.LabelEncoder) *CheckpointSet {
|
|
return &CheckpointSet{
|
|
encoder: encoder,
|
|
records: make(map[string]export.Record),
|
|
}
|
|
}
|
|
|
|
func (p *CheckpointSet) Reset() {
|
|
p.records = make(map[string]export.Record)
|
|
p.updates = nil
|
|
}
|
|
|
|
// Add a new descriptor to a Checkpoint.
|
|
//
|
|
// If there is an existing record with the same descriptor and labels,
|
|
// the stored aggregator will be returned and should be merged.
|
|
func (p *CheckpointSet) Add(desc *metric.Descriptor, newAgg export.Aggregator, labels ...core.KeyValue) (agg export.Aggregator, added bool) {
|
|
elabels := export.NewSimpleLabels(p.encoder, labels...)
|
|
|
|
key := desc.Name() + "_" + elabels.Encoded(p.encoder)
|
|
if record, ok := p.records[key]; ok {
|
|
return record.Aggregator(), false
|
|
}
|
|
|
|
rec := export.NewRecord(desc, elabels, newAgg)
|
|
p.updates = append(p.updates, rec)
|
|
p.records[key] = rec
|
|
return newAgg, true
|
|
}
|
|
|
|
func createNumber(desc *metric.Descriptor, v float64) core.Number {
|
|
if desc.NumberKind() == core.Float64NumberKind {
|
|
return core.NewFloat64Number(v)
|
|
}
|
|
return core.NewInt64Number(int64(v))
|
|
}
|
|
|
|
func (p *CheckpointSet) AddLastValue(desc *metric.Descriptor, v float64, labels ...core.KeyValue) {
|
|
p.updateAggregator(desc, lastvalue.New(), v, labels...)
|
|
}
|
|
|
|
func (p *CheckpointSet) AddCounter(desc *metric.Descriptor, v float64, labels ...core.KeyValue) {
|
|
p.updateAggregator(desc, sum.New(), v, labels...)
|
|
}
|
|
|
|
func (p *CheckpointSet) AddMeasure(desc *metric.Descriptor, v float64, labels ...core.KeyValue) {
|
|
p.updateAggregator(desc, array.New(), v, labels...)
|
|
}
|
|
|
|
func (p *CheckpointSet) AddHistogramMeasure(desc *metric.Descriptor, boundaries []core.Number, v float64, labels ...core.KeyValue) {
|
|
p.updateAggregator(desc, histogram.New(desc, boundaries), v, labels...)
|
|
}
|
|
|
|
func (p *CheckpointSet) updateAggregator(desc *metric.Descriptor, newAgg export.Aggregator, v float64, labels ...core.KeyValue) {
|
|
ctx := context.Background()
|
|
// Updates and checkpoint the new aggregator
|
|
_ = newAgg.Update(ctx, createNumber(desc, v), desc)
|
|
newAgg.Checkpoint(ctx, desc)
|
|
|
|
// Try to add this aggregator to the CheckpointSet
|
|
agg, added := p.Add(desc, newAgg, labels...)
|
|
if !added {
|
|
// An aggregator already exist for this descriptor and label set, we should merge them.
|
|
_ = agg.Merge(newAgg, desc)
|
|
}
|
|
}
|
|
|
|
func (p *CheckpointSet) ForEach(f func(export.Record) error) error {
|
|
for _, r := range p.updates {
|
|
if err := f(r); err != nil && !errors.Is(err, aggregator.ErrNoData) {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|