Fix missing Prometheus label

h2zh · Feb 16, 2024 · a377d10 · a377d10
1 parent 0dc47d9
commit a377d10
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/metrics/xrootd_metrics.go b/metrics/xrootd_metrics.go
@@ -580,6 +580,7 @@ func HandlePacket(packet []byte) error {
 					"dn":   "",
 					"role": "",
 					"org":  "",
+					"proj": "",
 				}
 				var oldReadvSegs uint64 = 0
 				var oldReadOps uint32 = 0
@@ -683,6 +684,7 @@ func HandlePacket(packet []byte) error {
 					"dn":   "",
 					"role": "",
 					"org":  "",
+					"proj": "",
 				}
 
 				if item != nil {

diff --git a/metrics/xrootd_metrics_test.go b/metrics/xrootd_metrics_test.go
@@ -582,23 +582,23 @@ func TestHandlePacket(t *testing.T) {
 		expectedTransferReadvSegs := `
 		# HELP xrootd_transfer_readv_segments_count Number of segments in readv operations
 		# TYPE xrootd_transfer_readv_segments_count counter
-		xrootd_transfer_readv_segments_count{ap="",dn="",org="",path="/",role=""} 1000
+		xrootd_transfer_readv_segments_count{ap="",dn="",org="",path="/",proj="",role=""} 1000
 		`
 
 		expectedTransferOps := `
 		# HELP xrootd_transfer_operations_count Number of transfer operations performed
 		# TYPE xrootd_transfer_operations_count counter
-		xrootd_transfer_operations_count{ap="",dn="",org="",path="/",role="",type="read"} 120
-		xrootd_transfer_operations_count{ap="",dn="",org="",path="/",role="",type="readv"} 10
-		xrootd_transfer_operations_count{ap="",dn="",org="",path="/",role="",type="write"} 30
+		xrootd_transfer_operations_count{ap="",dn="",org="",path="/",proj="",role="",type="read"} 120
+		xrootd_transfer_operations_count{ap="",dn="",org="",path="/",proj="",role="",type="readv"} 10
+		xrootd_transfer_operations_count{ap="",dn="",org="",path="/",proj="",role="",type="write"} 30
 		`
 
 		expectedTransferBytes := `
 		# HELP xrootd_transfer_bytes Bytes of transfers
 		# TYPE xrootd_transfer_bytes counter
-		xrootd_transfer_bytes{ap="",dn="",org="",path="/",role="",type="read"} 10000
-		xrootd_transfer_bytes{ap="",dn="",org="",path="/",role="",type="readv"} 20000
-		xrootd_transfer_bytes{ap="",dn="",org="",path="/",role="",type="write"} 120
+		xrootd_transfer_bytes{ap="",dn="",org="",path="/",proj="",role="",type="read"} 10000
+		xrootd_transfer_bytes{ap="",dn="",org="",path="/",proj="",role="",type="readv"} 20000
+		xrootd_transfer_bytes{ap="",dn="",org="",path="/",proj="",role="",type="write"} 120
 		`
 
 		expectedTransferReadvSegsReader := strings.NewReader(expectedTransferReadvSegs)