Skip to content

Commit e5175ed

Browse files
author
Naseem
authored
configure obsReport.NewProcessor with struct (#2669)
* configure obsReport.NewProcessor with struct fixes #2640 Signed-off-by: naseemkullah <[email protected]> * s/ProcessorConfig/ProcessorSettings Signed-off-by: naseemkullah <[email protected]>
1 parent dbf45c9 commit e5175ed

File tree

4 files changed

+28
-10
lines changed

4 files changed

+28
-10
lines changed

obsreport/obsreport_processor.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,15 @@ type Processor struct {
121121
mutators []tag.Mutator
122122
}
123123

124-
func NewProcessor(level configtelemetry.Level, processorName string) *Processor {
124+
type ProcessorSettings struct {
125+
Level configtelemetry.Level
126+
ProcessorName string
127+
}
128+
129+
func NewProcessor(cfg ProcessorSettings) *Processor {
125130
return &Processor{
126-
level: level,
127-
mutators: []tag.Mutator{tag.Upsert(tagKeyProcessor, processorName, tag.WithTTL(tag.TTLNoPropagation))},
131+
level: cfg.Level,
132+
mutators: []tag.Mutator{tag.Upsert(tagKeyProcessor, cfg.ProcessorName, tag.WithTTL(tag.TTLNoPropagation))},
128133
}
129134
}
130135

obsreport/obsreport_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ func TestProcessorTraceData(t *testing.T) {
547547
const refusedSpans = 19
548548
const droppedSpans = 13
549549

550-
obsrep := obsreport.NewProcessor(configtelemetry.LevelNormal, processor)
550+
obsrep := obsreport.NewProcessor(obsreport.ProcessorSettings{configtelemetry.LevelNormal, processor})
551551
obsrep.TracesAccepted(context.Background(), acceptedSpans)
552552
obsrep.TracesRefused(context.Background(), refusedSpans)
553553
obsrep.TracesDropped(context.Background(), droppedSpans)
@@ -564,7 +564,7 @@ func TestProcessorMetricsData(t *testing.T) {
564564
const refusedPoints = 11
565565
const droppedPoints = 17
566566

567-
obsrep := obsreport.NewProcessor(configtelemetry.LevelNormal, processor)
567+
obsrep := obsreport.NewProcessor(obsreport.ProcessorSettings{configtelemetry.LevelNormal, processor})
568568
obsrep.MetricsAccepted(context.Background(), acceptedPoints)
569569
obsrep.MetricsRefused(context.Background(), refusedPoints)
570570
obsrep.MetricsDropped(context.Background(), droppedPoints)
@@ -635,7 +635,7 @@ func TestProcessorLogRecords(t *testing.T) {
635635
const refusedRecords = 11
636636
const droppedRecords = 17
637637

638-
obsrep := obsreport.NewProcessor(configtelemetry.LevelNormal, processor)
638+
obsrep := obsreport.NewProcessor(obsreport.ProcessorSettings{configtelemetry.LevelNormal, processor})
639639
obsrep.LogsAccepted(context.Background(), acceptedRecords)
640640
obsrep.LogsRefused(context.Background(), refusedRecords)
641641
obsrep.LogsDropped(context.Background(), droppedRecords)

processor/memorylimiter/memorylimiter.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@ func newMemoryLimiter(logger *zap.Logger, cfg *Config) (*memoryLimiter, error) {
118118
readMemStatsFn: runtime.ReadMemStats,
119119
procName: cfg.Name(),
120120
logger: logger,
121-
obsrep: obsreport.NewProcessor(configtelemetry.GetMetricsLevelFlagValue(), cfg.Name()),
121+
obsrep: obsreport.NewProcessor(obsreport.ProcessorSettings{
122+
Level: configtelemetry.GetMetricsLevelFlagValue(),
123+
ProcessorName: cfg.Name(),
124+
}),
122125
}
123126

124127
ml.startMonitoring()

processor/memorylimiter/memorylimiter_test.go

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ func TestMetricsMemoryPressureResponse(t *testing.T) {
110110
readMemStatsFn: func(ms *runtime.MemStats) {
111111
ms.Alloc = currentMemAlloc
112112
},
113-
obsrep: obsreport.NewProcessor(configtelemetry.LevelNone, ""),
113+
obsrep: obsreport.NewProcessor(obsreport.ProcessorSettings{
114+
Level: configtelemetry.LevelNone,
115+
ProcessorName: "",
116+
}),
117+
114118
logger: zap.NewNop(),
115119
}
116120
mp, err := processorhelper.NewMetricsProcessor(
@@ -181,7 +185,10 @@ func TestTraceMemoryPressureResponse(t *testing.T) {
181185
readMemStatsFn: func(ms *runtime.MemStats) {
182186
ms.Alloc = currentMemAlloc
183187
},
184-
obsrep: obsreport.NewProcessor(configtelemetry.LevelNone, ""),
188+
obsrep: obsreport.NewProcessor(obsreport.ProcessorSettings{
189+
Level: configtelemetry.LevelNone,
190+
ProcessorName: "",
191+
}),
185192
logger: zap.NewNop(),
186193
}
187194
tp, err := processorhelper.NewTraceProcessor(
@@ -252,7 +259,10 @@ func TestLogMemoryPressureResponse(t *testing.T) {
252259
readMemStatsFn: func(ms *runtime.MemStats) {
253260
ms.Alloc = currentMemAlloc
254261
},
255-
obsrep: obsreport.NewProcessor(configtelemetry.LevelNone, ""),
262+
obsrep: obsreport.NewProcessor(obsreport.ProcessorSettings{
263+
Level: configtelemetry.LevelNone,
264+
ProcessorName: "",
265+
}),
256266
logger: zap.NewNop(),
257267
}
258268
lp, err := processorhelper.NewLogsProcessor(

0 commit comments

Comments
 (0)