go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2025-07-15 01:04:25 +02:00
Code Issues Releases Activity

Do not return agg if adding err-ed

Browse Source
This commit is contained in:
Tyler Yahn
2022-09-29 08:28:20 -07:00
parent b42f829606
commit b56efb06a7
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sdk/metric/pipeline.go
View File

@ -216,14 +216,17 @@ func (i *inserter[N]) Instrument(inst view.Instrument, instUnit unit.Unit) ([]in
if agg == nil { // Drop aggregator. if agg == nil { // Drop aggregator.
continue continue
} }
err = i.pipeline.addAggregator(inst.Scope, inst.Name, inst.Description, instUnit, agg)
if err != nil {
errs.append(err)
// Do not return the aggregator to be updated if the pipeline will
// never produce from it.
continue
}
// TODO (#3011): If filtering is done at the instrument level add here. // TODO (#3011): If filtering is done at the instrument level add here.
// This is where the aggregator and the view are both in scope. // This is where the aggregator and the view are both in scope.
aggs = append(aggs, agg) aggs = append(aggs, agg)
seen[id] = struct{}{} seen[id] = struct{}{}
err = i.pipeline.addAggregator(inst.Scope, inst.Name, inst.Description, instUnit, agg)
if err != nil {
errs.append(err)
}
} }
if !matched { // Apply implicit default view if no explicit matched. if !matched { // Apply implicit default view if no explicit matched.
@ -232,10 +235,13 @@ func (i *inserter[N]) Instrument(inst view.Instrument, instUnit unit.Unit) ([]in
errs.append(err) errs.append(err)
} }
if a != nil { if a != nil {
aggs = append(aggs, a)
err = i.pipeline.addAggregator(inst.Scope, inst.Name, inst.Description, instUnit, a) err = i.pipeline.addAggregator(inst.Scope, inst.Name, inst.Description, instUnit, a)
if err != nil { if err != nil {
// Do not return the aggregator to be updated if the pipeline
// will never produce from it.
errs.append(err) errs.append(err)
} else {
aggs = append(aggs, a)
} }
} }
} }