lower job succeeded & triggered logs to debug; renamed triggered to added

Author: aldenh-viam

robot/impl/jobmanager_test.go

@@ -62,7 +62,7 @@ func TestJobManagerDurationAndCronFromJson(t *testing.T) {
 		tb.Helper()
 		// the jobs in the config are on 4-5s schedules so after 6-7 seconds, all of them
 		// should run at least once
-		test.That(tb, logs.FilterMessage("Job triggered").Len(),
+		test.That(tb, logs.FilterMessage("Job added").Len(),
 			test.ShouldBeGreaterThanOrEqualTo, 3)
 		test.That(tb, logs.FilterMessage("Job succeeded").Len(),
 			test.ShouldBeGreaterThanOrEqualTo, 3)
@@ -845,7 +845,7 @@ func TestJobManagerComponents(t *testing.T) {
 		tb.Helper()
 		// we will test for succeeded jobs to be the amount we started,
 		// and that there are no failed jobs
-		test.That(tb, logs.FilterMessage("Job triggered").Len(),
+		test.That(tb, logs.FilterMessage("Job added").Len(),
 			test.ShouldBeGreaterThanOrEqualTo, 18)
 		test.That(tb, logs.FilterMessage("Job succeeded").Len(),
 			test.ShouldBeGreaterThanOrEqualTo, 18)
@@ -1174,7 +1174,7 @@ func TestJobManagerServices(t *testing.T) {
 
 	testutils.WaitForAssertionWithSleep(t, time.Second, 5, func(tb testing.TB) {
 		tb.Helper()
-		test.That(tb, logs.FilterMessage("Job triggered").Len(),
+		test.That(tb, logs.FilterMessage("Job added").Len(),
 			test.ShouldBeGreaterThanOrEqualTo, 8)
 		test.That(tb, logs.FilterMessage("Job succeeded").Len(),
 			test.ShouldBeGreaterThanOrEqualTo, 8)
@@ -1209,7 +1209,7 @@ func TestJobManagerErrors(t *testing.T) {
 
 	testutils.WaitForAssertionWithSleep(t, time.Second, 5, func(tb testing.TB) {
 		tb.Helper()
-		test.That(tb, logs.FilterMessage("Job triggered").Len(),
+		test.That(tb, logs.FilterMessage("Job added").Len(),
 			test.ShouldBeGreaterThanOrEqualTo, 1)
 		test.That(tb, logs.FilterMessage("Job failed").Len(),
 			test.ShouldBeGreaterThanOrEqualTo, 1)

robot/jobmanager/jobmanager.go

@@ -218,13 +218,13 @@ func (jm *JobManager) createJobFunction(jc config.JobConfig) func(ctx context.Co
 			return err
 		}
 		if jc.Method == "DoCommand" {
-			jobLogger.CInfo(jm.ctx, "Job triggered")
+			jobLogger.CDebugw(jm.ctx, "Job added", "name", jc.Name)
 			response, err := res.DoCommand(jm.ctx, jc.Command)
 			if err != nil {
 				jobLogger.CWarnw(jm.ctx, "Job failed", "error", err.Error())
 				return err
 			}
-			jobLogger.CInfow(jm.ctx, "Job succeeded", "response", response)
+			jobLogger.CDebugw(jm.ctx, "Job succeeded", "name", jc.Name, "response", response)
 			return nil
 		}
 
@@ -264,23 +264,25 @@ func (jm *JobManager) createJobFunction(jc config.JobConfig) func(ctx context.Co
 			Formatter:      formatter,
 			VerbosityLevel: 0,
 		}
-		jobLogger.CInfo(jm.ctx, "Job triggered")
+		// Job added for scheduling; may not immediately run.
+		jobLogger.CDebugw(jm.ctx, "Job added", "name", jc.Name)
 		grpcMethodCombined := grpcService + "." + grpcMethod
 		err = grpcurl.InvokeRPC(jm.ctx, descSource, jm.conn, grpcMethodCombined, nil, h, rf.Next)
 		if err != nil {
-			jobLogger.CWarnw(jm.ctx, "Job failed", "error", err.Error())
+			jobLogger.CWarnw(jm.ctx, "Job failed", "name", jc.Name, "error", err.Error())
 			return err
 		} else if h.Status != nil && h.Status.Err() != nil {
-			jobLogger.CWarnw(jm.ctx, "Job failed", "error", h.Status.Err())
+			jobLogger.CWarnw(jm.ctx, "Job failed", "name", jc.Name, "error", h.Status.Err())
 			return h.Status.Err()
 		}
 		response := map[string]any{}
 		err = json.Unmarshal(buffer.Bytes(), &response)
 		if err != nil {
-			jobLogger.CWarnw(jm.ctx, "Unmarshalling grpc response failed with error", "error", err.Error())
+			jobLogger.CWarnw(jm.ctx, "Unmarshalling grpc response failed with error", "name", jc.Name,
+				"error", err.Error())
 			return err
 		}
-		jobLogger.CInfow(jm.ctx, "Job succeeded", "response", response)
+		jobLogger.CDebugw(jm.ctx, "Job succeeded", "name", jc.Name, "response", response)
 		return nil
 	}
 }