patch: update ci and fix TestDrainers tests

- `TestDrainer` tests weren't well made, they led to a race-like condition where a slow running machine will fail some draining tests
- fix metric registry_test.go tests (add default debugger logger)

.github/workflows/ci.yml

@@ -20,11 +20,12 @@ on:
 
 jobs:
   ci:
-    uses: xmidt-org/shared-go/.github/workflows/ci.yml@5bc4b83f25ff4c944cd6253ba189e50d1997ab3c # v4.1.0
+    uses: xmidt-org/shared-go/.github/workflows/ci.yml@3d552804b9a20638508bf359cdd2e9b46bc06879 # v4.4.24
     with:
-      copyright-skip: true
-      lint-skip:      true
-      style-skip:     true
-      # tests-skip:     true
-      release-type:   library
+      style-skip:            true
+      yaml-lint-skip:        true
+      copyright-skip:        true
+      lint-skip:             true
+      release-type:          library
+      release-docker:        false
     secrets: inherit

device/drain/drainer_test.go

@@ -336,7 +336,7 @@ func testDrainerDrainAll(t *testing.T, deviceCount int) {
 	select {
 	case <-done:
 		// passed
-	case <-time.After(5 * time.Second):
+	case <-time.After(10 * time.Second):
 		assert.Fail("Drain failed to complete")
 		return
 	}
@@ -594,7 +594,7 @@ func testDrainerDrainCancel(t *testing.T) {
 	select {
 	case <-done:
 		// passing
-	case <-time.After(5 * time.Second):
+	case <-time.After(10 * time.Second):
 		assert.Fail("Drain failed to complete")
 		return
 	}
@@ -645,6 +645,7 @@ func testDrainFilter(t *testing.T, deviceTypeOne deviceInfo, deviceTypeTwo devic
 
 		stopCalled = false
 		stop       = func() {
+			time.Sleep(time.Second * 5)
 			stopCalled = true
 		}
 
@@ -744,7 +745,7 @@ func testDrainFilter(t *testing.T, deviceTypeOne deviceInfo, deviceTypeTwo devic
 	select {
 	case <-done:
 		// passed
-	case <-time.After(5 * time.Second):
+	case <-time.After(10 * time.Second):
 		assert.Fail("Drain failed to complete")
 		return
 	}
@@ -882,7 +883,7 @@ func testDisconnectFilter(t *testing.T, deviceTypeOne deviceInfo, deviceTypeTwo
 	select {
 	case <-done:
 		// passed
-	case <-time.After(5 * time.Second):
+	case <-time.After(10 * time.Second):
 		assert.Fail("Drain failed to complete")
 		return
 	}

xmetrics/registry_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/xmidt-org/sallust"
 )
 
 func testRegistryAsPrometheusProvider(t *testing.T) {
@@ -38,6 +39,7 @@ func testRegistryAsPrometheusProvider(t *testing.T) {
 					MaxAge: 15 * time.Hour,
 				},
 			},
+			Logger: sallust.Default(),
 		}
 	)
 
@@ -143,6 +145,7 @@ func testRegistryAsGoKitProvider(t *testing.T) {
 					MaxAge: 15 * time.Hour,
 				},
 			},
+			Logger: sallust.Default(),
 		}
 	)
 
@@ -216,6 +219,7 @@ func testRegistryMissingName(t *testing.T) {
 					Type: "counter",
 				},
 			},
+			Logger: sallust.Default(),
 		})
 	)
 
@@ -257,6 +261,7 @@ func testRegistryModules(t *testing.T) {
 					Type: "gauge",
 				},
 			},
+			Logger: sallust.Default(),
 		}
 	)
 
@@ -293,6 +298,7 @@ func testRegistryDuplicate(t *testing.T) {
 						Type: "gauge",
 					},
 				},
+				Logger: sallust.Default(),
 			}
 		)
 
@@ -330,6 +336,7 @@ func testRegistryDuplicate(t *testing.T) {
 						Type: "counter",
 					},
 				},
+				Logger: sallust.Default(),
 			}
 		)
 
@@ -349,6 +356,7 @@ func testRegistryUnsupportedType(t *testing.T) {
 					Type: "huh?",
 				},
 			},
+			Logger: sallust.Default(),
 		})
 	)
 
@@ -368,6 +376,7 @@ func testRegistryCounterLabel(t *testing.T) {
 					LabelNames: []string{"label"},
 				},
 			},
+			Logger: sallust.Default(),
 		})
 	)