Applies gofmt and linter suggestions

open-telemetry · Oct 30, 2024 · c95551c · c95551c
1 parent 12434a9
commit c95551c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/pkg/stanza/operator/input/journald/config_all.go b/pkg/stanza/operator/input/journald/config_all.go
@@ -27,17 +27,17 @@ func NewConfigWithID(operatorID string) *Config {
 type Config struct {
 	helper.InputConfig `mapstructure:",squash"`
 
-	Directory   *string       `mapstructure:"directory,omitempty"`
-	Files       []string      `mapstructure:"files,omitempty"`
-	StartAt     string        `mapstructure:"start_at,omitempty"`
-	Units       []string      `mapstructure:"units,omitempty"`
-	Priority    string        `mapstructure:"priority,omitempty"`
-	Matches     []MatchConfig `mapstructure:"matches,omitempty"`
-	Identifiers []string      `mapstructure:"identifiers,omitempty"`
-	Grep        string        `mapstructure:"grep,omitempty"`
-	Dmesg       bool          `mapstructure:"dmesg,omitempty"`
-	All         bool          `mapstructure:"all,omitempty"`
-	Namespace   string        `mapstructure:"namespace,omitempty"`
+	Directory           *string       `mapstructure:"directory,omitempty"`
+	Files               []string      `mapstructure:"files,omitempty"`
+	StartAt             string        `mapstructure:"start_at,omitempty"`
+	Units               []string      `mapstructure:"units,omitempty"`
+	Priority            string        `mapstructure:"priority,omitempty"`
+	Matches             []MatchConfig `mapstructure:"matches,omitempty"`
+	Identifiers         []string      `mapstructure:"identifiers,omitempty"`
+	Grep                string        `mapstructure:"grep,omitempty"`
+	Dmesg               bool          `mapstructure:"dmesg,omitempty"`
+	All                 bool          `mapstructure:"all,omitempty"`
+	Namespace           string        `mapstructure:"namespace,omitempty"`
 	ConvertMessageBytes bool          `mapstructure:"convert_message_bytes,omitempty"`
 }
 

diff --git a/pkg/stanza/operator/input/journald/config_linux.go b/pkg/stanza/operator/input/journald/config_linux.go
@@ -48,8 +48,8 @@ func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error
 			return exec.CommandContext(ctx, "journalctl", journalArgs...) // #nosec - ...
 			// journalctl is an executable that is required for this operator to function
 		},
-		convert_message_bytes: c.ConvertMessageBytes,
-		json:                  jsoniter.ConfigFastest,
+		convertMessageBytes: c.ConvertMessageBytes,
+		json:                jsoniter.ConfigFastest,
 	}, nil
 }
 

diff --git a/pkg/stanza/operator/input/journald/input.go b/pkg/stanza/operator/input/journald/input.go
@@ -30,12 +30,12 @@ type Input struct {
 
 	newCmd func(ctx context.Context, cursor []byte) cmd
 
-	persister             operator.Persister
-	json                  jsoniter.API
-	convert_message_bytes bool
-	cancel                context.CancelFunc
-	wg                    sync.WaitGroup
-	errChan               chan error
+	persister           operator.Persister
+	json                jsoniter.API
+	convertMessageBytes bool
+	cancel              context.CancelFunc
+	wg                  sync.WaitGroup
+	errChan             chan error
 }
 
 type cmd interface {
@@ -228,18 +228,18 @@ func (operator *Input) parseJournalEntry(line []byte) (*entry.Entry, string, err
 		return nil, "", fmt.Errorf("parse timestamp: %w", err)
 	}
 
-	if operator.convert_message_bytes {
+	if operator.convertMessageBytes {
 		// Convert the message bytes to string if given as a byte array
-		msg_arr, ok := body["MESSAGE"].([]interface{})
-		if ok {
+		msgArr, msgArrayOk := body["MESSAGE"].([]any)
+		if msgArrayOk {
 			var bytes []byte
-			for _, val := range msg_arr {
-				float_val, ok := val.(float64)
-				if ok {
-					bytes = append(bytes, byte(int(float_val)))
+			for _, val := range msgArr {
+				floatVal, floatCheckOk := val.(float64)
+				if floatCheckOk {
+					bytes = append(bytes, byte(int(floatVal)))
 				}
 			}
-			body["MESSAGE"] = string(bytes[:])
+			body["MESSAGE"] = string(bytes)
 		}
 	}