Skip to content

Commit 7d57f4f

Browse files
committed
fix(logger): format source code
1 parent 74d0a84 commit 7d57f4f

File tree

7 files changed

+28
-20
lines changed

7 files changed

+28
-20
lines changed

common/constant/key.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -440,16 +440,16 @@ const (
440440
)
441441

442442
const (
443-
LoggerLevelKey = "logger.level"
444-
LoggerDriverKey = "logger.driver"
445-
LoggerFormatKey = "logger.format"
446-
LoggerAppenderKey = "logger.appender"
447-
LoggerFileNameKey = "logger.file.name"
448-
LoggerFileNaxSizeKey = "logger.file.max-size"
449-
LoggerFileMaxBackupsKey = "logger.file.max-backups"
450-
LoggerFileMaxAgeKey = "logger.file.max-age"
451-
LoggerFileLocalTimeKey = "logger.file.local-time"
452-
LoggerFileCompressKey = "logger.file.compress"
443+
LoggerLevelKey = "logger.level"
444+
LoggerDriverKey = "logger.driver"
445+
LoggerFormatKey = "logger.format"
446+
LoggerAppenderKey = "logger.appender"
447+
LoggerFileNameKey = "logger.file.name"
448+
LoggerFileNaxSizeKey = "logger.file.max-size"
449+
LoggerFileMaxBackupsKey = "logger.file.max-backups"
450+
LoggerFileMaxAgeKey = "logger.file.max-age"
451+
LoggerFileLocalTimeKey = "logger.file.local-time"
452+
LoggerFileCompressKey = "logger.file.compress"
453453
LoggerTraceEnabledKey = "logger.trace-integration.enabled"
454454
LoggerTraceRecordErrorKey = "logger.trace-integration.record-error-to-span"
455455
)

logger/base.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ package logger
1919

2020
import (
2121
"context"
22+
)
2223

24+
import (
2325
"github.com/natefinch/lumberjack"
2426

2527
"go.uber.org/zap"

logger/core/logrus/ctx_logger.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"github.com/sirupsen/logrus"
3030

3131
"go.opentelemetry.io/otel/codes"
32+
3233
"go.opentelemetry.io/otel/trace"
3334
)
3435

logger/core/logrus/ctx_logger_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ import (
2828
dubbogoLogger "github.com/dubbogo/gost/log/logger"
2929

3030
"github.com/sirupsen/logrus"
31+
3132
"github.com/stretchr/testify/assert"
33+
"github.com/stretchr/testify/require"
3234

3335
"go.opentelemetry.io/otel/sdk/trace"
3436
)
@@ -54,9 +56,9 @@ func TestLogrusCtxLogger_CtxInfof_WithTrace(t *testing.T) {
5456
ctxLogger.CtxInfof(ctx, "test message")
5557

5658
// Parse log output
57-
var logEntry map[string]interface{}
59+
var logEntry map[string]any
5860
err := json.Unmarshal(buf.Bytes(), &logEntry)
59-
assert.NoError(t, err)
61+
require.NoError(t, err)
6062

6163
// Verify log contains message
6264
assert.Equal(t, "test message", logEntry["msg"])
@@ -82,9 +84,9 @@ func TestLogrusCtxLogger_CtxInfof_WithoutTrace(t *testing.T) {
8284
ctx := context.Background()
8385
ctxLogger.CtxInfof(ctx, "test message")
8486

85-
var logEntry map[string]interface{}
87+
var logEntry map[string]any
8688
err := json.Unmarshal(buf.Bytes(), &logEntry)
87-
assert.NoError(t, err)
89+
require.NoError(t, err)
8890

8991
// Verify log contains message but no trace fields
9092
assert.Equal(t, "test message", logEntry["msg"])

logger/core/zap/ctx_logger.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
dubbogoLogger "github.com/dubbogo/gost/log/logger"
2727

2828
"go.opentelemetry.io/otel/codes"
29+
2930
"go.opentelemetry.io/otel/trace"
3031

3132
"go.uber.org/zap"

logger/core/zap/ctx_logger_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
dubbogoLogger "github.com/dubbogo/gost/log/logger"
2929

3030
"github.com/stretchr/testify/assert"
31+
"github.com/stretchr/testify/require"
3132

3233
"go.opentelemetry.io/otel/sdk/trace"
3334

@@ -59,9 +60,9 @@ func TestZapCtxLogger_CtxInfof_WithTrace(t *testing.T) {
5960
ctxLogger.CtxInfof(ctx, "test message")
6061

6162
// Parse log output
62-
var logEntry map[string]interface{}
63+
var logEntry map[string]any
6364
err := json.Unmarshal(buf.Bytes(), &logEntry)
64-
assert.NoError(t, err)
65+
require.NoError(t, err)
6566

6667
// Verify log contains message
6768
assert.Equal(t, "test message", logEntry["msg"])
@@ -90,9 +91,9 @@ func TestZapCtxLogger_CtxInfof_WithoutTrace(t *testing.T) {
9091
ctx := context.Background()
9192
ctxLogger.CtxInfof(ctx, "test message")
9293

93-
var logEntry map[string]interface{}
94+
var logEntry map[string]any
9495
err := json.Unmarshal(buf.Bytes(), &logEntry)
95-
assert.NoError(t, err)
96+
require.NoError(t, err)
9697

9798
// Verify log contains message but no trace fields
9899
assert.Equal(t, "test message", logEntry["msg"])

logger/trace_extractor_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/stretchr/testify/assert"
2727

2828
"go.opentelemetry.io/otel/sdk/trace"
29+
2930
oteltrace "go.opentelemetry.io/otel/trace"
3031
"go.opentelemetry.io/otel/trace/noop"
3132
)
@@ -47,7 +48,7 @@ func TestExtractTraceFields_WithValidSpan(t *testing.T) {
4748
}
4849

4950
func TestExtractTraceFields_WithNilContext(t *testing.T) {
50-
fields := ExtractTraceFields(nil)
51+
fields := ExtractTraceFields(context.TODO())
5152

5253
assert.Empty(t, fields.TraceID)
5354
assert.Empty(t, fields.SpanID)
@@ -84,7 +85,7 @@ func TestHasTrace_WithValidSpan(t *testing.T) {
8485
}
8586

8687
func TestHasTrace_WithNilContext(t *testing.T) {
87-
assert.False(t, HasTrace(nil))
88+
assert.False(t, HasTrace(context.TODO()))
8889
}
8990

9091
func TestHasTrace_WithoutSpan(t *testing.T) {

0 commit comments

Comments
 (0)