Skip to content
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.

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

[processor/deltatocumulative]: do not drop Gauge, Summary #35372

Merged
merged 5 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 29 additions & 0 deletions .chloggen/deltatocumulative-fix-drops.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: deltatocumulative

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: do not drop gauges and summaries

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [35284]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
Gauges and Summaries are no longer dropped from processor output.
Instead, they are passed through as-is

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
1 change: 1 addition & 0 deletions processor/deltatocumulativeprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.22.0
require (
github.com/google/go-cmp v0.6.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.109.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.109.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.109.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.110.0
Expand Down
5 changes: 5 additions & 0 deletions processor/deltatocumulativeprocessor/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,10 @@ func (p *Processor) ConsumeMetrics(ctx context.Context, md pmetric.Metrics) erro
var errs error
metrics.Filter(md, func(m metrics.Metric) bool {
var n int
//exhaustive:enforce
switch m.Type() {
case pmetric.MetricTypeGauge:
n = m.Gauge().DataPoints().Len()
case pmetric.MetricTypeSum:
sum := m.Sum()
if sum.AggregationTemporality() == pmetric.AggregationTemporalityDelta {
Expand All @@ -163,6 +166,8 @@ func (p *Processor) ConsumeMetrics(ctx context.Context, md pmetric.Metrics) erro
expo.SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
}
n = expo.DataPoints().Len()
case pmetric.MetricTypeSummary:
n = m.Summary().DataPoints().Len()
}
return n > 0
})
Expand Down
26 changes: 26 additions & 0 deletions processor/deltatocumulativeprocessor/processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"context"
"math"
"math/rand"
"path/filepath"
"strconv"
"testing"
"time"
Expand All @@ -20,6 +21,7 @@ import (
"go.opentelemetry.io/collector/processor/processortest"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/identity"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
self "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/data"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/data/datatest/compare"
Expand Down Expand Up @@ -282,3 +284,27 @@ func stream() SumBuilder {
_, base := sum.Stream()
return SumBuilder{Metric: sum, base: base}
}

func TestIgnore(t *testing.T) {
proc, sink := setup(t, nil)

dir := "./testdata/notemporality-ignored"
open := func(file string) pmetric.Metrics {
t.Helper()
md, err := golden.ReadMetrics(filepath.Join(dir, file))
require.NoError(t, err)
return md
}

in := open("in.yaml")
out := open("out.yaml")

ctx := context.Background()

err := proc.ConsumeMetrics(ctx, in)
require.NoError(t, err)

if diff := compare.Diff([]pmetric.Metrics{out}, sink.AllMetrics()); diff != "" {
t.Fatal(diff)
Copy link
Member

Choose a reason for hiding this comment

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

t.Fatal? Why not "assert.Fail()", as the other ones? Or assert.Len(t, "", compare.Diff(...)) ?

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
resourceMetrics:
- schemaUrl: https://test.com/resource
resource:
attributes:
- key: resattr
value: { stringValue: stringoo }
scopeMetrics:
- schemaUrl: https://test.com/scope
scope:
name: Test
version: 1.2.3
attributes:
- key: scopeattr
value: { stringValue: string }
metrics:
- name: test.gauge
gauge:
dataPoints:
- timeUnixNano: 1
asDouble: 1
- name: test.summary
summary:
dataPoints:
- timeUnixNano: 1
quantileValues:
- quantile: 0.25
value: 25
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
resourceMetrics:
- schemaUrl: https://test.com/resource
resource:
attributes:
- key: resattr
value: { stringValue: stringoo }
scopeMetrics:
- schemaUrl: https://test.com/scope
scope:
name: Test
version: 1.2.3
attributes:
- key: scopeattr
value: { stringValue: string }
metrics:
- name: test.gauge
gauge:
dataPoints:
- timeUnixNano: 1
asDouble: 1
- name: test.summary
summary:
dataPoints:
- timeUnixNano: 1
quantileValues:
- quantile: 0.25
value: 25
Loading