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

[FIX] Remove datasetIDs from metricsRequest object #2013

Merged
merged 2 commits into from
Nov 16, 2022
Merged
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
35 changes: 35 additions & 0 deletions sinker/otel/orbreceiver/otlp.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,37 @@ func (r *OrbReceiver) injectAttribute(metricsRequest pmetricotlp.Request, attrib
return metricsRequest
}

// delete attribute on all metricsRequest metrics
func (r *OrbReceiver) deleteAttribute(metricsRequest pmetricotlp.Request, attribute string) pmetricotlp.Request {
if metricsRequest.Metrics().ResourceMetrics().Len() > 0 {
if metricsRequest.Metrics().ResourceMetrics().At(0).ScopeMetrics().Len() > 0 {
metrics := metricsRequest.Metrics().ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics()
for i := 0; i < metrics.Len(); i++ {
metricItem := metrics.At(i)
switch metricItem.Type() {
case pmetric.MetricTypeExponentialHistogram:
metricsRequest.Metrics().ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(i).ExponentialHistogram().DataPoints().At(0).Attributes().Remove(attribute)
case pmetric.MetricTypeGauge:
metricsRequest.Metrics().ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(i).Gauge().DataPoints().At(0).Attributes().Remove(attribute)
case pmetric.MetricTypeHistogram:
metricsRequest.Metrics().ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(i).Histogram().DataPoints().At(0).Attributes().Remove(attribute)
case pmetric.MetricTypeSum:
metricsRequest.Metrics().ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(i).Sum().DataPoints().At(0).Attributes().Remove(attribute)
case pmetric.MetricTypeSummary:
metricsRequest.Metrics().ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(i).Summary().DataPoints().At(0).Attributes().Remove(attribute)
default:
r.cfg.Logger.Error("Unknown metric type: " + metricItem.Type().String())
}
}
} else {
r.cfg.Logger.Error("Unable to delete attribute, ScopeMetrics length 0")
}
} else {
r.cfg.Logger.Error("Unable to delete attribute, ResourceMetrics length 0")
}
return metricsRequest
}

func (r *OrbReceiver) MessageInbound(msg messaging.Message) error {
go func() {
r.cfg.Logger.Debug("received agent message",
Expand All @@ -205,6 +236,10 @@ func (r *OrbReceiver) MessageInbound(msg messaging.Message) error {
return
}
datasetIDs := strings.Split(datasets, ",")

// Delete datasets_ids and policy_ids from metricsRequest
mr = r.deleteAttribute(mr, "dataset_ids")
etaques marked this conversation as resolved.
Show resolved Hide resolved
mr = r.deleteAttribute(mr, "policy_ids")

// Add tags in Context
execCtx, execCancelF := context.WithCancel(r.ctx)
Expand Down