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.

Sign up for GitHub

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

Jump to bottom

PMM-12848 Refactoring currentop_collector. #886

Merged
merged 4 commits into from
Aug 15, 2024
Merged

PMM-12848 Refactoring currentop_collector. #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
771d0fa
PMM-12848 Refactoring currentop_collector.
BupycHuk Aug 8, 2024
8c0d907
PMM-12848 fix linter.
BupycHuk Aug 8, 2024
bf8a50b
PMM-12848 fix linter.
BupycHuk Aug 8, 2024
9b9767c
PMM-12848 fix linter.
BupycHuk Aug 8, 2024
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
22 changes: 10 additions & 12 deletions exporter/currentop_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ func (d *currentopCollector) collect(ch chan<- prometheus.Metric) {
client := d.base.client
slowtime, err := time.ParseDuration(d.currentopslowtime)
if err != nil {
logger.Errorf("Failed to parse slowtime: %s", err)
ch <- prometheus.NewInvalidMetric(prometheus.NewInvalidDesc(err), err)
return
}
Expand All @@ -89,6 +90,7 @@ func (d *currentopCollector) collect(ch chan<- prometheus.Metric) {

var r primitive.M
if err := res.Decode(&r); err != nil {
logger.Errorf("Failed to decode currentOp response: %s", err)
ch <- prometheus.NewInvalidMetric(prometheus.NewInvalidDesc(err), err)
return
}
Expand All @@ -99,10 +101,16 @@ func (d *currentopCollector) collect(ch chan<- prometheus.Metric) {
inprog, ok := r["inprog"].(primitive.A)

if !ok {
logger.Errorf("Invalid type primitive.A assertion for 'inprog': %T", r["inprog"])
ch <- prometheus.NewInvalidMetric(prometheus.NewInvalidDesc(ErrInvalidOrMissingInprogEntry),
ErrInvalidOrMissingInprogEntry)
}

labels := d.topologyInfo.baseLabels()
ln := []string{"opid", "op", "desc", "database", "collection", "ns"}
const name = "mongodb_currentop_query_uptime"
pd := prometheus.NewDesc(name, " mongodb_currentop_query_uptime currentop_query", ln, labels)

for _, bsonMap := range inprog {

bsonMapElement, ok := bsonMap.(primitive.M)
Expand Down Expand Up @@ -137,18 +145,8 @@ func (d *currentopCollector) collect(ch chan<- prometheus.Metric) {
continue
}

labels := d.topologyInfo.baseLabels()
labels["opid"] = strconv.Itoa(int(opid))
labels["op"] = op
labels["desc"] = desc
labels["database"] = db
labels["collection"] = collection
labels["ns"] = namespace

m := primitive.M{"uptime": microsecs_running}
lv := []string{strconv.Itoa(int(opid)), op, desc, db, collection, namespace}

for _, metric := range makeMetrics("currentop_query", m, labels, d.compatibleMode) {
ch <- metric
}
ch <- prometheus.MustNewConstMetric(pd, prometheus.GaugeValue, float64(microsecs_running), lv...)
}
}
22 changes: 12 additions & 10 deletions exporter/currentop_collector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package exporter

import (
"context"
"fmt"
"sync"
"testing"
"time"
Expand All @@ -31,32 +30,31 @@ import (
)

func TestCurrentopCollector(t *testing.T) {
// It seems like this test needs the queries to continue running so that current oplog is not empty.
// TODO: figure out how to restore this test.
t.Skip()

ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()

var wg sync.WaitGroup

client := tu.DefaultTestClient(ctx, t)

database := client.Database("testdb")
database.Drop(ctx)
_ = database.Drop(ctx)

defer func() {
err := database.Drop(ctx)
assert.NoError(t, err)
}()
ch := make(chan struct{})
wg.Add(1)
go func() {
defer wg.Done()
for i := 0; i < 300; i++ {
coll := fmt.Sprintf("testcol_%02d", i)
_, err := database.Collection(coll).InsertOne(ctx, bson.M{"f1": 1, "f2": "2"})
coll := "testcol_01"
for j := 0; j < 100; j++ { //nolint:intrange // false positive
_, err := database.Collection(coll).InsertOne(ctx, bson.M{"f1": j, "f2": "2"})
assert.NoError(t, err)
}
ch <- struct{}{}
_, _ = database.Collection(coll).Find(ctx, bson.M{"$where": "function() {return sleep(100)}"})
}()

ti := labelsGetterMock{}
Expand All @@ -76,6 +74,10 @@ func TestCurrentopCollector(t *testing.T) {
"mongodb_currentop_query_uptime",
}

<-ch

time.Sleep(1 * time.Second)

count := testutil.CollectAndCount(c, filter...)
assert.True(t, count > 0)
wg.Wait()
Expand Down