Skip to content

Commit 32cebc3

Browse files
committed
stop exposing LogFormat and LogLevel from lambdacontext
1 parent a4e53b2 commit 32cebc3

3 files changed

Lines changed: 9 additions & 17 deletions

File tree

lambdacontext/context.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ import (
1515
"strconv"
1616
)
1717

18-
// LogFormat is the log format, either TEXT or JSON (from AWS_LAMBDA_LOG_FORMAT)
19-
var LogFormat string
20-
21-
// LogLevel is the log level for structured logging (from AWS_LAMBDA_LOG_LEVEL). Only available when LogFormat is JSON
22-
var LogLevel string
23-
2418
// LogGroupName is the name of the log group that contains the log streams of the current Lambda Function
2519
var LogGroupName string
2620

@@ -39,8 +33,6 @@ var FunctionVersion string
3933
var maxConcurrency int
4034

4135
func init() {
42-
LogFormat = os.Getenv("AWS_LAMBDA_LOG_FORMAT")
43-
LogLevel = os.Getenv("AWS_LAMBDA_LOG_LEVEL")
4436
LogGroupName = os.Getenv("AWS_LAMBDA_LOG_GROUP_NAME")
4537
LogStreamName = os.Getenv("AWS_LAMBDA_LOG_STREAM_NAME")
4638
FunctionName = os.Getenv("AWS_LAMBDA_FUNCTION_NAME")

lambdacontext/logger.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ import (
1111
"os"
1212
)
1313

14+
// logFormat is the log format from AWS_LAMBDA_LOG_FORMAT (TEXT or JSON)
15+
var logFormat = os.Getenv("AWS_LAMBDA_LOG_FORMAT")
16+
17+
// logLevel is the log level from AWS_LAMBDA_LOG_LEVEL
18+
var logLevel = os.Getenv("AWS_LAMBDA_LOG_LEVEL")
19+
1420
// field represents a Lambda context field to include in log records.
1521
type field struct {
1622
key string
@@ -58,7 +64,7 @@ func NewLogHandler(opts ...LogOption) slog.Handler {
5864
}
5965

6066
var h slog.Handler
61-
if LogFormat == "JSON" {
67+
if logFormat == "JSON" {
6268
h = slog.NewJSONHandler(os.Stdout, handlerOpts)
6369
} else {
6470
h = slog.NewTextHandler(os.Stdout, handlerOpts)
@@ -130,7 +136,7 @@ func (h *lambdaHandler) WithGroup(name string) slog.Handler {
130136
}
131137

132138
func parseLogLevel() slog.Level {
133-
switch LogLevel {
139+
switch logLevel {
134140
case "DEBUG":
135141
return slog.LevelDebug
136142
case "INFO":

lambdacontext/logger_test.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func TestParseLogLevel(t *testing.T) {
8181

8282
for _, tt := range tests {
8383
t.Run(tt.name, func(t *testing.T) {
84-
LogLevel = tt.input
84+
logLevel = tt.input
8585
result := parseLogLevel()
8686
assert.Equal(t, tt.expected, result)
8787
})
@@ -386,17 +386,11 @@ func TestWithTenantID(t *testing.T) {
386386
}
387387

388388
func TestNewLogger(t *testing.T) {
389-
LogFormat = "JSON"
390-
LogLevel = "INFO"
391-
392389
logger := NewLogger()
393390
assert.NotNil(t, logger)
394391
}
395392

396393
func TestNewLogHandler(t *testing.T) {
397-
LogFormat = "JSON"
398-
LogLevel = "INFO"
399-
400394
handler := NewLogHandler()
401395
assert.NotNil(t, handler)
402396

0 commit comments

Comments
 (0)