add root tag reference to fix bug in k6

pmalhaire · Dec 29, 2022 · 77edbaf · 77edbaf
1 parent f9d21ad
commit 77edbaf
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -35,6 +35,12 @@ jobs:
     - name: Test tls from source
       run: xk6 run ./examples/test_ssl.js -i 1
 
+    - name: Run influx
+      run: docker run --rm --name influx -d -p 8086:8086 influxdb:1.8-alpine
+
+    - name: Test influx
+      run: K6_OUT=influxdb=localhost:8086 xk6 run --vus 50 --duration 10s examples/test.js
+
   golangci:
     name: lint
     runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -130,6 +130,14 @@ default ✓ [======================================] 50 VUs  1m0s
 
 ```
 
+### optional test influx
+
+```
+docker run --rm --name mosquitto -d -p 1883:1883 eclipse-mosquitto mosquitto -c /mosquitto-no-auth.conf
+docker run --rm --name influx -d -p 8086:8086 influxdb:1.8-alpine
+K6_OUT=influxdb=localhost:8086 xk6 run --vus 50 --duration 1m examples/test.js
+```
+
 ## ROADMAP
 
 - Add examples with events for async functions (k6/events)

diff --git a/publish.go b/publish.go
@@ -126,12 +126,12 @@ func (c *client) publishMessageMetric(msgLen float64) error {
 		return ErrState
 	}
 	metrics.PushIfNotDone(ctx, state.Samples, metrics.Sample{
-		TimeSeries: metrics.TimeSeries{Metric: c.metrics.SentMessages, Tags: nil},
+		TimeSeries: metrics.TimeSeries{Metric: c.metrics.SentMessages, Tags: c.metrics.TagsAndMeta.Tags},
 		Time:       now,
 		Value:      float64(1),
 	})
 	metrics.PushIfNotDone(ctx, state.Samples, metrics.Sample{
-		TimeSeries: metrics.TimeSeries{Metric: c.metrics.SentBytes, Tags: nil},
+		TimeSeries: metrics.TimeSeries{Metric: c.metrics.SentBytes, Tags: c.metrics.TagsAndMeta.Tags},
 		Time:       now,
 		Value:      msgLen,
 	})

diff --git a/stats.go b/stats.go
@@ -12,6 +12,7 @@ type mqttMetrics struct {
 	ReceivedBytes    *metrics.Metric
 	SentMessages     *metrics.Metric
 	ReceivedMessages *metrics.Metric
+	TagsAndMeta      *metrics.TagsAndMeta
 }
 
 // registerMetrics registers the metrics for the mqtt module in the metrics registry
@@ -45,5 +46,8 @@ func registerMetrics(vu modules.VU) (mqttMetrics, error) {
 	if err != nil {
 		return m, err
 	}
+	m.TagsAndMeta = &metrics.TagsAndMeta{
+		Tags: registry.RootTagSet(),
+	}
 	return m, nil
 }
diff --git a/subscribe.go b/subscribe.go
@@ -64,12 +64,12 @@ func (c *client) receiveMessageMetric(msgLen float64) error {
 		return ErrState
 	}
 	metrics.PushIfNotDone(ctx, state.Samples, metrics.Sample{
-		TimeSeries: metrics.TimeSeries{Metric: c.metrics.ReceivedMessages, Tags: nil},
+		TimeSeries: metrics.TimeSeries{Metric: c.metrics.ReceivedMessages, Tags: c.metrics.TagsAndMeta.Tags},
 		Time:       now,
 		Value:      float64(1),
 	})
 	metrics.PushIfNotDone(ctx, state.Samples, metrics.Sample{
-		TimeSeries: metrics.TimeSeries{Metric: c.metrics.ReceivedBytes, Tags: nil},
+		TimeSeries: metrics.TimeSeries{Metric: c.metrics.ReceivedBytes, Tags: c.metrics.TagsAndMeta.Tags},
 		Time:       now,
 		Value:      msgLen,
 	})