@@ -2531,17 +2531,17 @@ func TestAgent_Metrics_SSH(t *testing.T) {
25312531 err = session .Shell ()
25322532 require .NoError (t , err )
25332533
2534- expected := []agentsdk. AgentMetric {
2534+ expected := []* proto. Stats_Metric {
25352535 {
25362536 Name : "agent_reconnecting_pty_connections_total" ,
2537- Type : agentsdk . AgentMetricTypeCounter ,
2537+ Type : proto . Stats_Metric_COUNTER ,
25382538 Value : 0 ,
25392539 },
25402540 {
25412541 Name : "agent_sessions_total" ,
2542- Type : agentsdk . AgentMetricTypeCounter ,
2542+ Type : proto . Stats_Metric_COUNTER ,
25432543 Value : 1 ,
2544- Labels : []agentsdk. AgentMetricLabel {
2544+ Labels : []* proto. Stats_Metric_Label {
25452545 {
25462546 Name : "magic_type" ,
25472547 Value : "ssh" ,
@@ -2554,30 +2554,46 @@ func TestAgent_Metrics_SSH(t *testing.T) {
25542554 },
25552555 {
25562556 Name : "agent_ssh_server_failed_connections_total" ,
2557- Type : agentsdk . AgentMetricTypeCounter ,
2557+ Type : proto . Stats_Metric_COUNTER ,
25582558 Value : 0 ,
25592559 },
25602560 {
25612561 Name : "agent_ssh_server_sftp_connections_total" ,
2562- Type : agentsdk . AgentMetricTypeCounter ,
2562+ Type : proto . Stats_Metric_COUNTER ,
25632563 Value : 0 ,
25642564 },
25652565 {
25662566 Name : "agent_ssh_server_sftp_server_errors_total" ,
2567- Type : agentsdk . AgentMetricTypeCounter ,
2567+ Type : proto . Stats_Metric_COUNTER ,
25682568 Value : 0 ,
25692569 },
25702570 {
2571- Name : "coderd_agentstats_startup_script_seconds " ,
2572- Type : agentsdk . AgentMetricTypeGauge ,
2571+ Name : "coderd_agentstats_currently_reachable_peers " ,
2572+ Type : proto . Stats_Metric_GAUGE ,
25732573 Value : 0 ,
2574- Labels : []agentsdk.AgentMetricLabel {
2574+ Labels : []* proto.Stats_Metric_Label {
2575+ {
2576+ Name : "connection_type" ,
2577+ Value : "derp" ,
2578+ },
2579+ },
2580+ },
2581+ {
2582+ Name : "coderd_agentstats_currently_reachable_peers" ,
2583+ Type : proto .Stats_Metric_GAUGE ,
2584+ Value : 1 ,
2585+ Labels : []* proto.Stats_Metric_Label {
25752586 {
2576- Name : "success " ,
2577- Value : "true " ,
2587+ Name : "connection_type " ,
2588+ Value : "p2p " ,
25782589 },
25792590 },
25802591 },
2592+ {
2593+ Name : "coderd_agentstats_startup_script_seconds" ,
2594+ Type : proto .Stats_Metric_GAUGE ,
2595+ Value : 1 ,
2596+ },
25812597 }
25822598
25832599 var actual []* promgo.MetricFamily
@@ -2586,17 +2602,33 @@ func TestAgent_Metrics_SSH(t *testing.T) {
25862602 if err != nil {
25872603 return false
25882604 }
2589-
2590- if len ( expected ) != len ( actual ) {
2591- return false
2605+ count := 0
2606+ for _ , m := range actual {
2607+ count += len ( m . GetMetric ())
25922608 }
2593-
2594- return verifyCollectedMetrics (t , expected , actual )
2609+ return count == len (expected )
25952610 }, testutil .WaitLong , testutil .IntervalFast )
25962611
2597- require .Len (t , actual , len (expected ))
2598- collected := verifyCollectedMetrics (t , expected , actual )
2599- require .True (t , collected , "expected metrics were not collected" )
2612+ i := 0
2613+ for _ , mf := range actual {
2614+ for _ , m := range mf .GetMetric () {
2615+ assert .Equal (t , expected [i ].Name , mf .GetName ())
2616+ assert .Equal (t , expected [i ].Type .String (), mf .GetType ().String ())
2617+ // Value is max expected
2618+ if expected [i ].Type == proto .Stats_Metric_GAUGE {
2619+ assert .GreaterOrEqualf (t , expected [i ].Value , m .GetGauge ().GetValue (), "expected %s to be greater than or equal to %f, got %f" , expected [i ].Name , expected [i ].Value , m .GetGauge ().GetValue ())
2620+ } else if expected [i ].Type == proto .Stats_Metric_COUNTER {
2621+ assert .GreaterOrEqualf (t , expected [i ].Value , m .GetCounter ().GetValue (), "expected %s to be greater than or equal to %f, got %f" , expected [i ].Name , expected [i ].Value , m .GetCounter ().GetValue ())
2622+ }
2623+ for j , lbl := range expected [i ].Labels {
2624+ assert .Equal (t , m .GetLabel ()[j ], & promgo.LabelPair {
2625+ Name : & lbl .Name ,
2626+ Value : & lbl .Value ,
2627+ })
2628+ }
2629+ i ++
2630+ }
2631+ }
26002632
26012633 _ = stdin .Close ()
26022634 err = session .Wait ()
@@ -2828,28 +2860,6 @@ func TestAgent_ManageProcessPriority(t *testing.T) {
28282860 })
28292861}
28302862
2831- func verifyCollectedMetrics (t * testing.T , expected []agentsdk.AgentMetric , actual []* promgo.MetricFamily ) bool {
2832- t .Helper ()
2833-
2834- for i , e := range expected {
2835- assert .Equal (t , e .Name , actual [i ].GetName ())
2836- assert .Equal (t , string (e .Type ), strings .ToLower (actual [i ].GetType ().String ()))
2837-
2838- for _ , m := range actual [i ].GetMetric () {
2839- assert .Equal (t , e .Value , m .Counter .GetValue ())
2840-
2841- if len (m .GetLabel ()) > 0 {
2842- for j , lbl := range m .GetLabel () {
2843- assert .Equal (t , e .Labels [j ].Name , lbl .GetName ())
2844- assert .Equal (t , e .Labels [j ].Value , lbl .GetValue ())
2845- }
2846- }
2847- m .GetLabel ()
2848- }
2849- }
2850- return true
2851- }
2852-
28532863type syncWriter struct {
28542864 mu sync.Mutex
28552865 w io.Writer
0 commit comments