Libvalkey migration

qa/1290

@@ -265,7 +265,7 @@ then
 else
     echo "Warning: no extra suppressions found for valgrind version $__version" >>$seq_full
 fi
-# skip valgrind errors in upstream non-PCP code, like hiredis ...
+# skip valgrind errors in upstream non-PCP code, like libvalkey ...
 # (seen on vm11 Debian 10.13)
 # ... same suppressions as for qa/1662
 #

qa/1602

@@ -59,7 +59,9 @@ _filter_key_server_err()
 {
     sed \
     -e 's;ERR syntax error;expected error;' \
-    -e 's;Parse command error.*;expected error;'
+    -e 's;Failed to find keys of command.*;expected error;' \
+    -e 's;Unknown command.*;expected error;' \
+    -e 's;Command parse error;expected error;'
 }
 
 _stop_auto_restart pmproxy

qa/1662

@@ -96,7 +96,7 @@ path = $dir
 EOF
 src/time_stamp $tmp.stamp 'pmproxy start' >>$seq_full
 grind_extra="--track-origins=yes --read-var-info=yes --read-inline-info=yes"
-# skip valgrind errors in upstream non-PCP code, like hiredis ...
+# skip valgrind errors in upstream non-PCP code, like libvalkey ...
 # (seen on vm11 Debian 10.13)
 # ... same suppressions as for qa/1290
 #

qa/1727

@@ -96,7 +96,35 @@ fi
 
 echo; echo === /metrics webapi listing. The instname label should appear only once.
 curl -Gs 'http://localhost:44322/metrics?names=openmetrics.duplicate_instname_label.somemetric' \
-| _filter_openmetrics_labels
+| _filter_openmetrics_labels \
+| awk '{
+    if (match($0, /\{[^}]+\}/)) {
+        prefix = substr($0, 1, RSTART-1)
+        labels_str = substr($0, RSTART+1, RLENGTH-2)
+        suffix = substr($0, RSTART+RLENGTH)
+
+        split("", labels)
+        n = split(labels_str, pairs, ",")
+        for (i = 1; i <= n; i++) {
+            split(pairs[i], kv, "=")
+            labels[kv[1]] = kv[2]
+        }
+
+        order = "script agent hostname instid instname domainname machineid source"
+        split(order, keys, " ")
+        result = ""
+        for (i = 1; i <= 8; i++) {
+            key = keys[i]
+            if (key in labels) {
+                if (result != "") result = result ","
+                result = result key "=" labels[key]
+            }
+        }
+        print prefix "{" result "}" suffix
+    } else {
+        print
+    }
+}'
 
 echo; echo === verify metric name validity using pminfo
 pminfo -v openmetrics

qa/1890

@@ -56,6 +56,45 @@ _filter_opentelemetry_labels()
     # end
 }
 
+_reorder_labels()
+{
+    awk '
+    /^[^#].*{.*=.*}/ {
+        match($0, /^([^{]+){([^}]+)}(.*)$/, a)
+        metric = a[1]
+        labels_str = a[2]
+        rest = a[3]
+
+        delete labels
+        n = split(labels_str, pairs, ",")
+        for (i = 1; i <= n; i++) {
+            match(pairs[i], /^([^=]+)=(.+)$/, kv)
+            key = kv[1]
+            value = kv[2]
+            labels[key] = value
+        }
+
+        order = "url agent hostname domainname machineid source my_sum_attribute"
+        split(order, order_arr, " ")
+
+        output = metric "{"
+        first = 1
+        for (i = 1; i <= length(order_arr); i++) {
+            key = order_arr[i]
+            if (key in labels) {
+                if (!first) output = output ","
+                output = output key "=" labels[key]
+                first = 0
+            }
+        }
+        output = output "}" rest
+        print output
+        next
+    }
+    {print}
+    '
+}
+
 need_restore=true
 _prepare_pmda opentelemetry
 trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -83,7 +122,7 @@ fi
 
 echo; echo === /metrics webapi listing. The instname label should appear only once.
 curl -Gs 'http://localhost:44322/metrics?names=opentelemetry.duplicate.somemetric' \
-| _filter_opentelemetry_labels
+| _filter_opentelemetry_labels | _reorder_labels
 
 echo; echo === verify metric name validity using pminfo
 pminfo -v opentelemetry

qa/1900.out

@@ -11,14 +11,14 @@ Check bpf metrics have appeared ... X metrics and X values
 == Running pmdabpf with valgrind
 === std out ===
 
-bpf.disk.all.latency PMID: 157.1.0 [Disk latency]
-    Data Type: 64-bit unsigned int  InDom: 157.3 0x27400003
+bpf.disk.all.latency PMID: 157.0.0 [Disk latency]
+    Data Type: 64-bit unsigned int  InDom: 157.2 0x27400002
     Semantics: counter  Units: microsec
 Help:
 Disk latency histogram across all disks, for both reads and writes.
 
-bpf.runq.latency PMID: 157.0.0 [Run queue latency (ns)]
-    Data Type: 64-bit unsigned int  InDom: 157.2 0x27400002
+bpf.runq.latency PMID: 157.1.0 [Run queue latency (ns)]
+    Data Type: 64-bit unsigned int  InDom: 157.3 0x27400003
     Semantics: counter  Units: nanosec
 Help:
 Run queue latency from task switches,