Skip to content

Commit dde3046

Browse files
nadiamoeNadia Santalla
authored and
Nadia Santalla
committed
fix: k6runner: add level=error to deferred log reporting code from runner
1 parent ce90bfb commit dde3046

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

internal/k6runner/http_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func TestScriptHTTPRun(t *testing.T) {
191191
expectSuccess: false,
192192
expectError: ErrFromRunner,
193193
expectLogs: nonDebugLogLine + fmt.Sprintf(
194-
"msg=\"script did not execute successfully\" error=%q errorCode=%q\n",
194+
"level=\"error\" msg=\"script did not execute successfully\" error=%q errorCode=%q\n",
195195
"something went wrong",
196196
"something-wrong",
197197
),
@@ -209,7 +209,7 @@ func TestScriptHTTPRun(t *testing.T) {
209209
expectSuccess: false,
210210
expectError: nil,
211211
expectLogs: nonDebugLogLine + fmt.Sprintf(
212-
"msg=\"script did not execute successfully\" error=%q errorCode=%q\n",
212+
"level=\"error\" msg=\"script did not execute successfully\" error=%q errorCode=%q\n",
213213
"syntax error somewhere or something",
214214
"aborted",
215215
),
@@ -226,7 +226,7 @@ func TestScriptHTTPRun(t *testing.T) {
226226
expectSuccess: false,
227227
expectErrorAs: &logfmt.SyntaxError{},
228228
expectLogs: `level="error"` + "\n" + fmt.Sprintf(
229-
"msg=\"script did not execute successfully\" error=%q errorCode=%q\n",
229+
"level=\"error\" msg=\"script did not execute successfully\" error=%q errorCode=%q\n",
230230
"we killed k6",
231231
"aborted",
232232
),
@@ -243,7 +243,7 @@ func TestScriptHTTPRun(t *testing.T) {
243243
expectSuccess: false,
244244
expectErrorAs: expfmt.ParseError{},
245245
expectLogs: nonDebugLogLine + fmt.Sprintf(
246-
"msg=\"script did not execute successfully\" error=%q errorCode=%q\n",
246+
"level=\"error\" msg=\"script did not execute successfully\" error=%q errorCode=%q\n",
247247
"we killed k6",
248248
"aborted",
249249
),

internal/k6runner/k6runner.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,12 @@ func (r Processor) Run(ctx context.Context, registry *prometheus.Registry, logge
151151
// other logs.
152152
if result.ErrorCode != "" {
153153
defer func() {
154-
err := logger.Log("msg", "script did not execute successfully", "error", result.Error, "errorCode", result.ErrorCode)
154+
err := logger.Log(
155+
"level", "error",
156+
"msg", "script did not execute successfully",
157+
"error", result.Error,
158+
"errorCode", result.ErrorCode,
159+
)
155160
if err != nil {
156161
internalLogger.Error().
157162
Err(err).

0 commit comments

Comments
 (0)