Skip to content

Commit 5d1c53b

Browse files
prolanempuigdomenchSage
authored andcommitted
honor initial set zap loglevel (open-telemetry#1603)
1 parent 0c6f673 commit 5d1c53b

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

collector/main.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ import (
1818
"context"
1919
"flag"
2020
"fmt"
21-
"github.com/open-telemetry/opentelemetry-lambda/collector/lambdalifecycle"
2221
"os"
2322

23+
"github.com/open-telemetry/opentelemetry-lambda/collector/lambdalifecycle"
24+
2425
"go.uber.org/zap"
2526
"go.uber.org/zap/zapcore"
2627

@@ -57,11 +58,15 @@ func main() {
5758

5859
func initLogger() *zap.Logger {
5960
lvl := zap.NewAtomicLevelAt(zapcore.InfoLevel)
60-
6161
envLvl := os.Getenv("OPENTELEMETRY_EXTENSION_LOG_LEVEL")
62-
userLvl, err := zap.ParseAtomicLevel(envLvl)
63-
if err == nil {
64-
lvl = userLvl
62+
// When not set, Getenv returns empty string
63+
var err error
64+
if envLvl != "" {
65+
var userLvl zap.AtomicLevel
66+
userLvl, err = zap.ParseAtomicLevel(envLvl)
67+
if err == nil {
68+
lvl = userLvl
69+
}
6570
}
6671

6772
l := zap.New(zapcore.NewCore(zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig()), os.Stdout, lvl))

0 commit comments

Comments
 (0)