support "log_configuration" levels for jobs

Author: aldenh-viam

config/config.go

@@ -1278,11 +1278,12 @@ type JobConfig struct {
 
 // JobConfigData is the job config data that gets marshaled/unmarshaled.
 type JobConfigData struct {
-	Name     string         `json:"name"`
-	Schedule string         `json:"schedule"`
-	Resource string         `json:"resource"`
-	Method   string         `json:"method"`
-	Command  map[string]any `json:"command,omitempty"`
+	Name             string              `json:"name"`
+	Schedule         string              `json:"schedule"`
+	Resource         string              `json:"resource"`
+	Method           string              `json:"method"`
+	Command          map[string]any      `json:"command,omitempty"`
+	LogConfiguration *resource.LogConfig `json:"log_configuration,omitempty"`
 }
 
 // MarshalJSON marshals out this config.

config/proto_conversions.go

@@ -1032,6 +1032,9 @@ func JobsConfigToProto(jc *JobConfig) (*pb.JobConfig, error) {
 		}
 		protoConfig.Command = command
 	}
+	if jc.LogConfiguration != nil {
+		protoConfig.LogConfiguration = &pb.LogConfiguration{Level: strings.ToLower(jc.LogConfiguration.Level.String())}
+	}
 	return protoConfig, nil
 }
 
@@ -1049,5 +1052,14 @@ func JobsConfigFromProto(proto *pb.JobConfig, _ logging.Logger) (*JobConfig, err
 	if proto.Command != nil {
 		jobConfig.Command = proto.Command.AsMap()
 	}
+	if proto.LogConfiguration != nil {
+		if proto.GetLogConfiguration() != nil {
+			level, err := logging.LevelFromString(proto.GetLogConfiguration().Level)
+			if err != nil {
+				level = logging.INFO
+			}
+			jobConfig.LogConfiguration = &resource.LogConfig{Level: level}
+		}
+	}
 	return jobConfig, nil
 }

go.mod

@@ -85,7 +85,7 @@ require (
 	go.uber.org/atomic v1.11.0
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
-	go.viam.com/api v0.1.490
+	go.viam.com/api v0.1.493
 	go.viam.com/test v1.2.4
 	go.viam.com/utils v0.1.176
 	goji.io v2.0.2+incompatible

go.sum

@@ -1587,8 +1587,8 @@ go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-go.viam.com/api v0.1.490 h1:4ARXkNJOcsHFukj/LH+kDn94nClSMLTjTlXBb+S8X+4=
-go.viam.com/api v0.1.490/go.mod h1:p/am76zx8SZ74V/F4rEAYQIpHaaLUwJgY2q3Uw3FIWk=
+go.viam.com/api v0.1.493 h1:VlOaSQkV2TYGecPHCygSs66vdojBDX3otLCGpLHRM9o=
+go.viam.com/api v0.1.493/go.mod h1:p/am76zx8SZ74V/F4rEAYQIpHaaLUwJgY2q3Uw3FIWk=
 go.viam.com/test v1.2.4 h1:JYgZhsuGAQ8sL9jWkziAXN9VJJiKbjoi9BsO33TW3ug=
 go.viam.com/test v1.2.4/go.mod h1:zI2xzosHdqXAJ/kFqcN+OIF78kQuTV2nIhGZ8EzvaJI=
 go.viam.com/utils v0.1.176 h1:I5TvnuBZtE9i3e6j1VOBzWQ6W3nlUiOR/L4WpTMFhxg=

robot/jobmanager/jobmanager.go

@@ -208,6 +208,9 @@ func (jm *JobManager) createDescriptorSourceAndgRPCMethod(
 // createJobFunction returns a function that the job scheduler puts on its queue.
 func (jm *JobManager) createJobFunction(jc config.JobConfig, continuous bool) func(ctx context.Context) error {
 	jobLogger := jm.logger.Sublogger(jc.Name)
+	if jc.LogConfiguration != nil {
+		jobLogger.SetLevel(jc.LogConfiguration.Level)
+	}
 	// To support logging for quick jobs (~ on the seconds schedule), we disable log
 	// deduplication for job loggers.
 	jobLogger.NeverDeduplicate()