stop exposing LogFormat and LogLevel from lambdacontext

Author: anzheyazzz

lambdacontext/context.go

@@ -1,112 +0,0 @@
-// Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-// Package lambdacontext provides access to Lambda execution context information.
-//
-// This package allows Lambda functions to access metadata about the current invocation,
-// including request ID, function ARN, Cognito identity, and client context. Context
-// information is retrieved from the standard Go context.Context using FromContext().
-//
-// See https://docs.aws.amazon.com/lambda/latest/dg/golang-context.html
-package lambdacontext
-
-import (
-	"context"
-	"os"
-	"strconv"
-)
-
-// LogFormat is the log format, either TEXT or JSON (from AWS_LAMBDA_LOG_FORMAT)
-var LogFormat string
-
-// LogLevel is the log level for structured logging (from AWS_LAMBDA_LOG_LEVEL). Only available when LogFormat is JSON
-var LogLevel string
-
-// LogGroupName is the name of the log group that contains the log streams of the current Lambda Function
-var LogGroupName string
-
-// LogStreamName name of the log stream that the current Lambda Function's logs will be sent to
-var LogStreamName string
-
-// FunctionName the name of the current Lambda Function
-var FunctionName string
-
-// MemoryLimitInMB is the configured memory limit for the current instance of the Lambda Function
-var MemoryLimitInMB int
-
-// FunctionVersion is the published version of the current instance of the Lambda Function
-var FunctionVersion string
-
-var maxConcurrency int
-
-func init() {
-	LogFormat = os.Getenv("AWS_LAMBDA_LOG_FORMAT")
-	LogLevel = os.Getenv("AWS_LAMBDA_LOG_LEVEL")
-	LogGroupName = os.Getenv("AWS_LAMBDA_LOG_GROUP_NAME")
-	LogStreamName = os.Getenv("AWS_LAMBDA_LOG_STREAM_NAME")
-	FunctionName = os.Getenv("AWS_LAMBDA_FUNCTION_NAME")
-	if limit, err := strconv.Atoi(os.Getenv("AWS_LAMBDA_FUNCTION_MEMORY_SIZE")); err != nil {
-		MemoryLimitInMB = 0
-	} else {
-		MemoryLimitInMB = limit
-	}
-	FunctionVersion = os.Getenv("AWS_LAMBDA_FUNCTION_VERSION")
-	if v, err := strconv.Atoi(os.Getenv("AWS_LAMBDA_MAX_CONCURRENCY")); err != nil || v < 1 {
-		maxConcurrency = 1
-	} else {
-		maxConcurrency = v
-	}
-}
-
-func MaxConcurrency() int {
-	return maxConcurrency
-}
-
-// ClientApplication is metadata about the calling application.
-type ClientApplication struct {
-	InstallationID string `json:"installation_id"`
-	AppTitle       string `json:"app_title"`
-	AppVersionCode string `json:"app_version_code"`
-	AppPackageName string `json:"app_package_name"`
-}
-
-// ClientContext is information about the client application passed by the calling application.
-type ClientContext struct {
-	Client ClientApplication
-	Env    map[string]string `json:"env"`
-	Custom map[string]string `json:"custom"`
-}
-
-// CognitoIdentity is the cognito identity used by the calling application.
-type CognitoIdentity struct {
-	CognitoIdentityID     string
-	CognitoIdentityPoolID string
-}
-
-// LambdaContext is the set of metadata that is passed for every Invoke.
-type LambdaContext struct {
-	AwsRequestID       string //nolint: staticcheck
-	InvokedFunctionArn string //nolint: staticcheck
-	Identity           CognitoIdentity
-	ClientContext      ClientContext
-	TenantID           string `json:",omitempty"`
-}
-
-// An unexported type to be used as the key for types in this package.
-// This prevents collisions with keys defined in other packages.
-type key struct{}
-
-// The key for a LambdaContext in Contexts.
-// Users of this package must use lambdacontext.NewContext and lambdacontext.FromContext
-// instead of using this key directly.
-var contextKey = &key{}
-
-// NewContext returns a new Context that carries value lc.
-func NewContext(parent context.Context, lc *LambdaContext) context.Context {
-	return context.WithValue(parent, contextKey, lc)
-}
-
-// FromContext returns the LambdaContext value stored in ctx, if any.
-func FromContext(ctx context.Context) (*LambdaContext, bool) {
-	lc, ok := ctx.Value(contextKey).(*LambdaContext)
-	return lc, ok
-}

lambdacontext/logger.go

@@ -11,6 +11,12 @@ import (
 	"os"
 )
 
+// logFormat is the log format from AWS_LAMBDA_LOG_FORMAT (TEXT or JSON)
+var logFormat = os.Getenv("AWS_LAMBDA_LOG_FORMAT")
+
+// logLevel is the log level from AWS_LAMBDA_LOG_LEVEL
+var logLevel = os.Getenv("AWS_LAMBDA_LOG_LEVEL")
+
 // field represents a Lambda context field to include in log records.
 type field struct {
 	key   string
@@ -58,7 +64,7 @@ func NewLogHandler(opts ...LogOption) slog.Handler {
 	}
 
 	var h slog.Handler
-	if LogFormat == "JSON" {
+	if logFormat == "JSON" {
 		h = slog.NewJSONHandler(os.Stdout, handlerOpts)
 	} else {
 		h = slog.NewTextHandler(os.Stdout, handlerOpts)
@@ -130,7 +136,7 @@ func (h *lambdaHandler) WithGroup(name string) slog.Handler {
 }
 
 func parseLogLevel() slog.Level {
-	switch LogLevel {
+	switch logLevel {
 	case "DEBUG":
 		return slog.LevelDebug
 	case "INFO":

lambdacontext/logger_test.go

@@ -81,7 +81,7 @@ func TestParseLogLevel(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			LogLevel = tt.input
+			logLevel = tt.input
 			result := parseLogLevel()
 			assert.Equal(t, tt.expected, result)
 		})
@@ -386,17 +386,11 @@ func TestWithTenantID(t *testing.T) {
 }
 
 func TestNewLogger(t *testing.T) {
-	LogFormat = "JSON"
-	LogLevel = "INFO"
-
 	logger := NewLogger()
 	assert.NotNil(t, logger)
 }
 
 func TestNewLogHandler(t *testing.T) {
-	LogFormat = "JSON"
-	LogLevel = "INFO"
-
 	handler := NewLogHandler()
 	assert.NotNil(t, handler)