fix: sort tags

Required by line protocol encoder `AddTag` method.
cailloumajor · Jul 6, 2022 · 5f1851e · 5f1851e
1 parent cc27be4
commit 5f1851e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"sort"
 	"time"
 
 	"github.com/cailloumajor/opcua-proxy/internal/centrifugo"
@@ -122,7 +123,13 @@ func (p *Proxy) handleInfluxdbMetrics(w http.ResponseWriter, r *http.Request) {
 	enc.SetPrecision(lp.Second)
 	enc.StartLine(m)
 
+	sk := make([]string, 0, len(r.Form))
 	for k := range r.Form {
+		sk = append(sk, k)
+	}
+	sort.Strings(sk)
+
+	for _, k := range sk {
 		enc.AddTag(k, r.Form.Get(k))
 	}
 

diff --git a/internal/proxy/proxy_test.go b/internal/proxy/proxy_test.go
@@ -97,7 +97,7 @@ func TestInfluxdbMetrics(t *testing.T) {
 	}{
 		{
 			name:                "InvalidQueryString",
-			querystring:         "measurement=meas&tag1=val1&tag2=val2;",
+			querystring:         "measurement=meas&tag1=val1&othertag=otherval;",
 			readError:           false,
 			variantConvertError: false,
 			encodingError:       false,
@@ -107,7 +107,7 @@ func TestInfluxdbMetrics(t *testing.T) {
 		},
 		{
 			name:                "MissingMeasurement",
-			querystring:         "tag1=val1&tag2=val2",
+			querystring:         "tag1=val1&othertag=otherval",
 			readError:           false,
 			variantConvertError: false,
 			encodingError:       false,
@@ -117,7 +117,7 @@ func TestInfluxdbMetrics(t *testing.T) {
 		},
 		{
 			name:                "ReadError",
-			querystring:         "measurement=meas&tag1=val1&tag2=val2",
+			querystring:         "measurement=meas&tag1=val1&othertag=otherval",
 			readError:           true,
 			variantConvertError: false,
 			encodingError:       false,
@@ -127,7 +127,7 @@ func TestInfluxdbMetrics(t *testing.T) {
 		},
 		{
 			name:                "VariantConvertError",
-			querystring:         "measurement=meas&tag1=val1&tag2=val2",
+			querystring:         "measurement=meas&tag1=val1&othertag=otherval",
 			readError:           false,
 			variantConvertError: true,
 			encodingError:       false,
@@ -137,7 +137,7 @@ func TestInfluxdbMetrics(t *testing.T) {
 		},
 		{
 			name:                "EncodingError",
-			querystring:         "measurement=meas&tag1=&tag2=val2",
+			querystring:         "measurement=meas&tag1=&othertag=otherval",
 			readError:           false,
 			variantConvertError: false,
 			encodingError:       true,
@@ -147,12 +147,12 @@ func TestInfluxdbMetrics(t *testing.T) {
 		},
 		{
 			name:                "Success",
-			querystring:         "measurement=meas&tag1=val1&tag2=val2",
+			querystring:         "measurement=meas&tag1=val1&othertag=otherval",
 			readError:           false,
 			variantConvertError: false,
 			encodingError:       false,
 			expectStatusCode:    http.StatusOK,
-			expectBody:          `meas,tag1=val1,tag2=val2 field1=37.2,field2="value" 1136239445` + "\n",
+			expectBody:          `meas,othertag=otherval,tag1=val1 field1=37.2,field2="value" 1136239445` + "\n",
 			ignoreBody:          false,
 		},
 	}