Harden interval conversion in agent

ammario · ammario · commit 93de24e5d2aa · 2023-03-24T19:31:57.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -258,7 +258,7 @@ func convertInterval(i int64) time.Duration {
 	// impatient.
 	base := time.Second
 	if flag.Lookup("test.v") != nil {
-		base = time.Millisecond
+		base = time.Millisecond * 100
 	}
 	return time.Duration(i) * base
 }
@@ -269,14 +269,7 @@ type metadataResultAndKey struct {
 }
 
 func (a *agent) reportMetadataLoop(ctx context.Context) {
-	// In production, the minimum report interval is one second because
-	// `coder_agent.metadata` accepts `interval` in integer seconds.
-	// In tests, it helps to set shorter intervals because engineers are
-	// expensive.
-	baseInterval := time.Second
-	if flag.Lookup("test.v") != nil {
-		baseInterval = time.Millisecond * 100
-	}
+	baseInterval := convertInterval(1)
 
 	var (
 		baseTicker       = time.NewTicker(baseInterval)
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -821,7 +821,7 @@ func TestAgent_Metadata(t *testing.T) {
 	t.Run("Basic", func(t *testing.T) {
 		t.Parallel()
 		dir := t.TempDir()
-		const reportInterval = 200
+		const reportInterval = 2
 		greetingPath := filepath.Join(dir, "greeting")
 		_, client, _, _, _ := setupAgent(t, agentsdk.Manifest{
 			Metadata: []codersdk.WorkspaceAgentMetadataDescription{
@@ -856,7 +856,7 @@ func TestAgent_Metadata(t *testing.T) {
 
 			var (
 				numGreetings      = bytes.Count(greetingByt, []byte("hello"))
-				idealNumGreetings = time.Since(start) / (reportInterval * time.Millisecond)
+				idealNumGreetings = time.Since(start) / (reportInterval * 100 * time.Millisecond)
 				upperBound        = int(idealNumGreetings) + 1
 				lowerBound        = (int(idealNumGreetings) / 2)
 			)
