Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
d80tb7 committed Jan 5, 2025
1 parent 05f1750 commit edd9734
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
3 changes: 2 additions & 1 deletion internal/common/armadacontext/armada_context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ package armadacontext

import (
"context"
"github.com/armadaproject/armada/internal/common/logging"
"testing"
"time"

"github.com/stretchr/testify/require"

"github.com/armadaproject/armada/internal/common/logging"
)

var defaultLogger = logging.StdLogger().WithField("foo", "bar")
Expand Down
3 changes: 2 additions & 1 deletion internal/common/logging/global.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package logging

import (
"os"

"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"os"
)

// The global Logger. Comes configured with some sensible defaults for e.g. unit tests, but applications should
Expand Down
2 changes: 0 additions & 2 deletions internal/common/logging/logger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
)

func TestWithField(t *testing.T) {

logger, observedLogs := testLogger()

newLogger := logger.WithField("foo", "bar")
Expand All @@ -29,7 +28,6 @@ func TestWithField(t *testing.T) {
}

func TestWithFields(t *testing.T) {

logger, observedLogs := testLogger()

newLogger := logger.WithFields(map[string]any{
Expand Down
1 change: 0 additions & 1 deletion internal/common/startup.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ func ConfigureLogging() {
}

func readEnvironmentLogFormat(pe zapcore.EncoderConfig) zapcore.Encoder {

formatStr, ok := os.LookupEnv("LOG_FORMAT")
if !ok {
formatStr = "text"
Expand Down

0 comments on commit edd9734

Please sign in to comment.