Skip to content

[pkg/otlp/model] Backport translator changes #9789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mx-psi merged 2 commits into from
Nov 8, 2021
Merged

[pkg/otlp/model] Backport translator changes #9789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebc66da
[pkg/otlp/model] Backport recent changes in the Datadog exporter
mx-psi Nov 8, 2021
a169c56
Add release note
mx-psi Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions pkg/otlp/model/translator/metrics_translator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ func (t *Translator) mapNumberMonotonicMetrics(
for i := 0; i < slice.Len(); i++ {
p := slice.At(i)
ts := uint64(p.Timestamp())
startTs := uint64(p.StartTimestamp())
tags := getTags(p.Attributes())
tags = append(tags, additionalTags...)

Expand All @@ -156,7 +157,7 @@ func (t *Translator) mapNumberMonotonicMetrics(
continue
}

if dx, ok := t.prevPts.putAndGetDiff(name, tags, ts, val); ok {
if dx, ok := t.prevPts.MonotonicDiff(name, tags, startTs, ts, val); ok {
consumer.ConsumeTimeSeries(ctx, name, Count, ts, dx, tags, host)
}
}
Expand All @@ -179,12 +180,13 @@ func (t *Translator) getSketchBuckets(
ctx context.Context,
consumer SketchConsumer,
name string,
ts uint64,
p pdata.HistogramDataPoint,
delta bool,
tags []string,
host string,
) {
startTs := uint64(p.StartTimestamp())
ts := uint64(p.Timestamp())
as := &quantile.Agent{}
for j := range p.BucketCounts() {
lowerBound, upperBound := getBounds(p, j)
Expand All @@ -210,7 +212,7 @@ func (t *Translator) getSketchBuckets(
count := p.BucketCounts()[j]
if delta {
as.InsertInterpolate(lowerBound, upperBound, uint(count))
} else if dx, ok := t.prevPts.putAndGetDiff(name, bucketTags, ts, float64(count)); ok {
} else if dx, ok := t.prevPts.Diff(name, bucketTags, startTs, ts, float64(count)); ok {
as.InsertInterpolate(lowerBound, upperBound, uint(dx))
}

Expand All @@ -231,6 +233,8 @@ func (t *Translator) getLegacyBuckets(
tags []string,
host string,
) {
startTs := uint64(p.StartTimestamp())
ts := uint64(p.Timestamp())
// We have a single metric, 'bucket', which is tagged with the bucket bounds. See:
// https://github.com/DataDog/integrations-core/blob/7.30.1/datadog_checks_base/datadog_checks/base/checks/openmetrics/v2/transformers/histogram.py
fullName := fmt.Sprintf("%s.bucket", name)
Expand All @@ -243,10 +247,9 @@ func (t *Translator) getLegacyBuckets(
bucketTags = append(bucketTags, tags...)

count := float64(val)
ts := uint64(p.Timestamp())
if delta {
consumer.ConsumeTimeSeries(ctx, fullName, Count, ts, count, bucketTags, host)
} else if dx, ok := t.prevPts.putAndGetDiff(fullName, bucketTags, ts, count); ok {
} else if dx, ok := t.prevPts.Diff(fullName, bucketTags, startTs, ts, count); ok {
consumer.ConsumeTimeSeries(ctx, fullName, Count, ts, dx, bucketTags, host)
}
}
Expand Down Expand Up @@ -276,6 +279,7 @@ func (t *Translator) mapHistogramMetrics(
) {
for i := 0; i < slice.Len(); i++ {
p := slice.At(i)
startTs := uint64(p.StartTimestamp())
ts := uint64(p.Timestamp())
tags := getTags(p.Attributes())
tags = append(tags, additionalTags...)
Expand All @@ -285,7 +289,7 @@ func (t *Translator) mapHistogramMetrics(
countName := fmt.Sprintf("%s.count", name)
if delta {
consumer.ConsumeTimeSeries(ctx, countName, Count, ts, count, tags, host)
} else if dx, ok := t.prevPts.putAndGetDiff(countName, tags, ts, count); ok {
} else if dx, ok := t.prevPts.Diff(countName, tags, startTs, ts, count); ok {
consumer.ConsumeTimeSeries(ctx, countName, Count, ts, dx, tags, host)
}
}
Expand All @@ -296,7 +300,7 @@ func (t *Translator) mapHistogramMetrics(
if !t.isSkippable(sumName, p.Sum()) {
if delta {
consumer.ConsumeTimeSeries(ctx, sumName, Count, ts, sum, tags, host)
} else if dx, ok := t.prevPts.putAndGetDiff(sumName, tags, ts, sum); ok {
} else if dx, ok := t.prevPts.Diff(sumName, tags, startTs, ts, sum); ok {
consumer.ConsumeTimeSeries(ctx, sumName, Count, ts, dx, tags, host)
}
}
Expand All @@ -306,7 +310,7 @@ func (t *Translator) mapHistogramMetrics(
case HistogramModeCounters:
t.getLegacyBuckets(ctx, consumer, name, p, delta, tags, host)
case HistogramModeDistributions:
t.getSketchBuckets(ctx, consumer, name, ts, p, delta, tags, host)
t.getSketchBuckets(ctx, consumer, name, p, delta, tags, host)
}
}
}
Expand Down Expand Up @@ -350,22 +354,23 @@ func (t *Translator) mapSummaryMetrics(

for i := 0; i < slice.Len(); i++ {
p := slice.At(i)
startTs := uint64(p.StartTimestamp())
ts := uint64(p.Timestamp())
tags := getTags(p.Attributes())
tags = append(tags, additionalTags...)

// count and sum are increasing; we treat them as cumulative monotonic sums.
{
countName := fmt.Sprintf("%s.count", name)
if dx, ok := t.prevPts.putAndGetDiff(countName, tags, ts, float64(p.Count())); ok && !t.isSkippable(countName, dx) {
if dx, ok := t.prevPts.Diff(countName, tags, startTs, ts, float64(p.Count())); ok && !t.isSkippable(countName, dx) {
consumer.ConsumeTimeSeries(ctx, countName, Count, ts, dx, tags, host)
}
}

{
sumName := fmt.Sprintf("%s.sum", name)
if !t.isSkippable(sumName, p.Sum()) {
if dx, ok := t.prevPts.putAndGetDiff(sumName, tags, ts, p.Sum()); ok {
if dx, ok := t.prevPts.Diff(sumName, tags, startTs, ts, p.Sum()); ok {
consumer.ConsumeTimeSeries(ctx, sumName, Count, ts, dx, tags, host)
}
}
Expand Down Expand Up @@ -442,7 +447,7 @@ func (t *Translator) MapMetrics(ctx context.Context, md pdata.Metrics, consumer
}
case pdata.MetricAggregationTemporalityDelta:
t.mapNumberMetrics(ctx, consumer, md.Name(), Count, md.Sum().DataPoints(), additionalTags, host)
default: // pdata.MetricAggregationTemporalityUnspecified or any other not supported type
default: // pdata.AggregationTemporalityUnspecified or any other not supported type
t.logger.Debug("Unknown or unsupported aggregation temporality",
zap.String(metricName, md.Name()),
zap.Any("aggregation temporality", md.Sum().AggregationTemporality()),
Expand All @@ -454,7 +459,7 @@ func (t *Translator) MapMetrics(ctx context.Context, md pdata.Metrics, consumer
case pdata.MetricAggregationTemporalityCumulative, pdata.MetricAggregationTemporalityDelta:
delta := md.Histogram().AggregationTemporality() == pdata.MetricAggregationTemporalityDelta
t.mapHistogramMetrics(ctx, consumer, md.Name(), md.Histogram().DataPoints(), delta, additionalTags, host)
default: // pdata.MetricAggregationTemporalityUnspecified or any other not supported type
default: // pdata.AggregationTemporalityUnspecified or any other not supported type

@mx-psi mx-psi Nov 8, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and the comment above were changed on #9398 but are still unchanged on the contrib repo

t.logger.Debug("Unknown or unsupported aggregation temporality",
zap.String("metric name", md.Name()),
zap.Any("aggregation temporality", md.Histogram().AggregationTemporality()),
Expand All @@ -470,6 +475,5 @@ func (t *Translator) MapMetrics(ctx context.Context, md pdata.Metrics, consumer
}
}
}

@mx-psi mx-psi Nov 8, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comes from open-telemetry/opentelemetry-collector-contrib/pull/5315

return nil
}
Loading