-
Notifications
You must be signed in to change notification settings - Fork 525
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move monitoring event counters to model processor
Also, remove unused metrics.
- Loading branch information
Showing
7 changed files
with
128 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package modelprocessor | ||
|
|
||
| import ( | ||
| "context" | ||
| "sync" | ||
|
|
||
| "github.com/elastic/beats/v7/libbeat/monitoring" | ||
|
|
||
| "github.com/elastic/apm-server/model" | ||
| ) | ||
|
|
||
| // EventCounter is a model.BatchProcessor that counts the number of events processed, | ||
| // recording the counts as metrics in a monitoring.Registry. | ||
| // | ||
| // Metrics are named after the event type: `processor.<processor.event>.transformations`. | ||
| // These metrics are used to populate the "Processed Events" graphs in Stack Monitoring. | ||
| type EventCounter struct { | ||
| registry *monitoring.Registry | ||
|
|
||
| mu sync.RWMutex | ||
| eventCounters map[string]*monitoring.Int | ||
| } | ||
|
|
||
| // NewEventCounter returns an EventCounter that counts events processed, recording | ||
| // them as `<processor.event>.transformations` under the given registry. | ||
| func NewEventCounter(registry *monitoring.Registry) *EventCounter { | ||
| return &EventCounter{ | ||
| registry: registry, | ||
| eventCounters: make(map[string]*monitoring.Int), | ||
| } | ||
| } | ||
|
|
||
| // ProcessBatch counts events in b, grouping by APMEvent.Processor.Event. | ||
| func (c *EventCounter) ProcessBatch(ctx context.Context, b *model.Batch) error { | ||
| for _, event := range *b { | ||
| pe := event.Processor.Event | ||
| if pe == "" { | ||
| continue | ||
| } | ||
| c.mu.RLock() | ||
| eventCounter := c.eventCounters[pe] | ||
| c.mu.RUnlock() | ||
| if eventCounter == nil { | ||
| c.mu.Lock() | ||
| eventCounter = c.eventCounters[pe] | ||
| if eventCounter == nil { | ||
| eventCounter = monitoring.NewInt( | ||
| c.registry, | ||
| "processor."+pe+".transformations", | ||
| ) | ||
| c.eventCounters[pe] = eventCounter | ||
| } | ||
| c.mu.Unlock() | ||
| } | ||
| eventCounter.Inc() | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package modelprocessor_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| "github.com/elastic/beats/v7/libbeat/monitoring" | ||
|
|
||
| "github.com/elastic/apm-server/model" | ||
| "github.com/elastic/apm-server/model/modelprocessor" | ||
| ) | ||
|
|
||
| func TestEventCounter(t *testing.T) { | ||
| batch := model.Batch{ | ||
| {}, | ||
| {Processor: model.TransactionProcessor}, | ||
| {Processor: model.SpanProcessor}, | ||
| {Processor: model.TransactionProcessor}, | ||
| } | ||
|
|
||
| expected := monitoring.MakeFlatSnapshot() | ||
| expected.Ints["processor.span.transformations"] = 1 | ||
| expected.Ints["processor.transaction.transformations"] = 2 | ||
|
|
||
| registry := monitoring.NewRegistry() | ||
| processor := modelprocessor.NewEventCounter(registry) | ||
| err := processor.ProcessBatch(context.Background(), &batch) | ||
| assert.NoError(t, err) | ||
| snapshot := monitoring.CollectFlatSnapshot(registry, monitoring.Full, false) | ||
| assert.Equal(t, expected, snapshot) | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters