-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
feat: add support for MetricTypeSum #37156
base: main
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Use this changelog template to create an entry for release notes. | ||
|
||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
change_type: enhancement | ||
|
||
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) | ||
component: pkg/translator/prometheusremotewrite | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: add support for metric type sum in FromMetricsV2 | ||
|
||
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. | ||
issues: [33661] | ||
|
||
# (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: The public function is partially implemented and not ready for use | ||
|
||
# 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: [api] |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -80,7 +80,12 @@ func (c *prometheusConverterV2) fromMetrics(md pmetric.Metrics, settings Setting | |
} | ||
c.addGaugeNumberDataPoints(dataPoints, resource, settings, promName) | ||
case pmetric.MetricTypeSum: | ||
// TODO implement | ||
dataPoints := metric.Sum().DataPoints() | ||
if dataPoints.Len() == 0 { | ||
errs = multierr.Append(errs, fmt.Errorf("empty data points. %s is dropped", metric.Name())) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @dashpole you did a comment here saying to remove the error line. Should I remove it? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, but please remove it from the gauge case above as well There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed |
||
break | ||
} | ||
c.addSumNumberDataPoints(dataPoints, resource, metric, settings, promName) | ||
case pmetric.MetricTypeHistogram: | ||
// TODO implement | ||
case pmetric.MetricTypeExponentialHistogram: | ||
|
@@ -130,3 +135,7 @@ func (c *prometheusConverterV2) addSample(sample *writev2.Sample, lbls []prompb. | |
|
||
return &ts | ||
} | ||
|
||
// TODO: implement this function. | ||
func (c *prometheusConverterV2) addTimeSeriesIfNeeded(_ []prompb.Label, _ pcommon.Timestamp, _ pcommon.Timestamp) { | ||
} |
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -7,7 +7,9 @@ import ( | |||
"math" | ||||
|
||||
"github.com/prometheus/common/model" | ||||
"github.com/prometheus/prometheus/model/timestamp" | ||||
"github.com/prometheus/prometheus/model/value" | ||||
"github.com/prometheus/prometheus/prompb" | ||||
writev2 "github.com/prometheus/prometheus/prompb/io/prometheus/write/v2" | ||||
"go.opentelemetry.io/collector/pdata/pcommon" | ||||
"go.opentelemetry.io/collector/pdata/pmetric" | ||||
|
@@ -45,3 +47,85 @@ func (c *prometheusConverterV2) addGaugeNumberDataPoints(dataPoints pmetric.Numb | |||
c.addSample(sample, labels) | ||||
} | ||||
} | ||||
|
||||
func (c *prometheusConverterV2) addSumNumberDataPoints(dataPoints pmetric.NumberDataPointSlice, | ||||
resource pcommon.Resource, metric pmetric.Metric, settings Settings, name string, | ||||
) { | ||||
for x := 0; x < dataPoints.Len(); x++ { | ||||
pt := dataPoints.At(x) | ||||
lbls := createAttributes( | ||||
resource, | ||||
pt.Attributes(), | ||||
settings.ExternalLabels, | ||||
nil, | ||||
true, | ||||
model.MetricNameLabel, | ||||
name, | ||||
) | ||||
|
||||
sample := &writev2.Sample{ | ||||
// convert ns to ms | ||||
Timestamp: convertTimeStamp(pt.Timestamp()), | ||||
} | ||||
switch pt.ValueType() { | ||||
case pmetric.NumberDataPointValueTypeInt: | ||||
sample.Value = float64(pt.IntValue()) | ||||
case pmetric.NumberDataPointValueTypeDouble: | ||||
sample.Value = pt.DoubleValue() | ||||
} | ||||
if pt.Flags().NoRecordedValue() { | ||||
sample.Value = math.Float64frombits(value.StaleNaN) | ||||
} | ||||
ts := c.addSample(sample, lbls) | ||||
if ts != nil { | ||||
exemplars := getPromExemplarsV2[pmetric.NumberDataPoint](pt) | ||||
ts.Exemplars = append(ts.Exemplars, exemplars...) | ||||
} | ||||
|
||||
if settings.ExportCreatedMetric && metric.Sum().IsMonotonic() { | ||||
startTimestamp := pt.StartTimestamp() | ||||
if startTimestamp != 0 { | ||||
return | ||||
} | ||||
|
||||
createdLabels := make([]prompb.Label, len(lbls)) | ||||
copy(createdLabels, lbls) | ||||
for i, l := range createdLabels { | ||||
if l.Name == model.MetricNameLabel { | ||||
createdLabels[i].Value = name + createdSuffix | ||||
break | ||||
} | ||||
} | ||||
// TODO: implement this function. | ||||
c.addTimeSeriesIfNeeded(createdLabels, startTimestamp, pt.Timestamp()) | ||||
} | ||||
} | ||||
} | ||||
|
||||
// getPromExemplarsV2 returns a slice of writev2.Exemplar from pdata exemplars. | ||||
func getPromExemplarsV2[T exemplarType](pt T) []writev2.Exemplar { | ||||
promExemplars := make([]writev2.Exemplar, 0, pt.Exemplars().Len()) | ||||
for i := 0; i < pt.Exemplars().Len(); i++ { | ||||
exemplar := pt.Exemplars().At(i) | ||||
|
||||
var promExemplar writev2.Exemplar | ||||
|
||||
switch exemplar.ValueType() { | ||||
case pmetric.ExemplarValueTypeInt: | ||||
promExemplar = writev2.Exemplar{ | ||||
Value: float64(exemplar.IntValue()), | ||||
Timestamp: timestamp.FromTime(exemplar.Timestamp().AsTime()), | ||||
} | ||||
case pmetric.ExemplarValueTypeDouble: | ||||
promExemplar = writev2.Exemplar{ | ||||
Value: exemplar.DoubleValue(), | ||||
Timestamp: timestamp.FromTime(exemplar.Timestamp().AsTime()), | ||||
} | ||||
} | ||||
// TODO append labels to promExemplar.Labels | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I tried to implement something similar to the current version, but the type of LabelsRefs([]uint32) is a little different of There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The addSample function does something similar to what you need to do here: opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite/metrics_to_prw_v2.go Line 111 in 667e81e
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks. I'm thinking to solve it in a next PR. Trying to figure out how to make the tests pass now |
||||
|
||||
promExemplars = append(promExemplars, promExemplar) | ||||
} | ||||
|
||||
return promExemplars | ||||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the sum is non-monotonic, we need to emit it as a gauge instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
13ee3b6
Addressed