Merge commit '6f640b44adf128c6a16b605321fa72e16ae2ff9a' into feature/…

…slog

Signed-off-by: Pavel Okhlopkov <[email protected]>

.github/workflows/build.yaml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Restore Go modules
         id: go-modules-cache
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
           path: |
             ~/go/pkg/mod

.github/workflows/lint.yaml

@@ -20,7 +20,7 @@ jobs:
 
       - name: Restore Go modules
         id: go-modules-cache
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
           path: |
             ~/go/pkg/mod

.github/workflows/tests-labeled.yaml

@@ -73,7 +73,7 @@ jobs:
 
       - name: Restore Go modules
         id: go-modules-cache
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
           path: |
             ~/go/pkg/mod

.github/workflows/tests.yaml

@@ -19,7 +19,7 @@ jobs:
 
       - name: Restore Go modules
         id: go-modules-cache
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
           path: |
             ~/go/pkg/mod

go.mod

@@ -15,9 +15,10 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/kennygrant/sanitize v1.2.4
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.34.1
+	github.com/onsi/gomega v1.34.2
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.19.1
+	github.com/prometheus/client_golang v1.20.5
+	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/time v0.7.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
@@ -41,12 +42,12 @@ require (
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-openapi/analysis v0.19.10 // indirect
 	github.com/go-openapi/errors v0.19.7 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -67,6 +68,8 @@ require (
 	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -75,22 +78,19 @@ require (
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.48.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	go.mongodb.org/mongo-driver v1.5.4 // indirect
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/oauth2 v0.16.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/term v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
-	golang.org/x/tools v0.23.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/term v0.23.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

pkg/executor/executor_test.go

@@ -139,6 +139,20 @@ c d
 
 		buf.Reset()
 	})
+
+	t.Run("multiline non json", func(t *testing.T) {
+		app.LogProxyHookJSON = false
+		cmd := exec.Command("echo", `
+a b
+c d
+`)
+		_, err := RunAndLogLines(cmd, map[string]string{"foor": "baar"})
+		assert.NoError(t, err)
+		assert.Contains(t, buf.String(), `level=info msg="a b" foor=baar output=stdout`)
+		assert.Contains(t, buf.String(), `level=info msg="c d" foor=baar output=stdout`)
+
+		buf.Reset()
+	})
 }
 
 var letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")