Skip to content

Commit d138dc8

Browse files
committed
Applied request changes/ initialized slog in main and removed initLogger()
1 parent 7c016d3 commit d138dc8

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/accountingservice/main.go

+7-12
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ import (
2929
var resource *sdkresource.Resource
3030
var initResourcesOnce sync.Once
3131

32-
func initLogger() *slog.Logger {
33-
logger := slog.New(slog.NewJSONHandler(os.Stderr, nil)).With("service", "accounting")
34-
slog.SetDefault(logger)
35-
return logger
36-
}
3732
func initResource() *sdkresource.Resource {
3833
initResourcesOnce.Do(func() {
3934
extraResources, _ := sdkresource.New(
@@ -68,23 +63,23 @@ func initTracerProvider() (*sdktrace.TracerProvider, error) {
6863
}
6964

7065
func main() {
71-
logger := initLogger()
66+
logger := slog.New(slog.NewJSONHandler(os.Stderr, nil)).With("service", "accounting")
7267
ctx := context.Background()
7368
tp, err := initTracerProvider()
7469
if err != nil {
75-
logger.LogAttrs(ctx, slog.LevelError, "failed to initialize trace provider", slog.String("error", err.Error()))
70+
logger.LogAttrs(ctx, slog.LevelError, "Failed to initialize trace provider", slog.String("error", err.Error()))
7671
}
7772
defer func() {
7873
if err := tp.Shutdown(ctx); err != nil {
79-
logger.LogAttrs(ctx, slog.LevelError, "failed to shotdown properly", slog.String("error", err.Error()))
74+
logger.LogAttrs(ctx, slog.LevelError, "Failed to shutdown properly", slog.String("error", err.Error()))
8075
}
81-
logger.LogAttrs(ctx, slog.LevelInfo, "", slog.String("message", "Shotdown trace provider"))
76+
logger.LogAttrs(ctx, slog.LevelInfo, "", slog.String("message", "Shutdown trace provider"))
8277
}()
8378

8479
var brokers string
8580
mustMapEnv(&brokers, "KAFKA_SERVICE_ADDR")
8681

87-
brokerList := strings.Split(brokers, ",")
82+
brokerList := strings.Split(brokers, ", ")
8883
logger.LogAttrs(ctx, slog.LevelInfo, "Kafka brokers", slog.String("Kafka brokers", strings.Join(brokerList, ",")))
8984

9085
ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM, syscall.SIGKILL)
@@ -97,12 +92,12 @@ func main() {
9792
if err := consumerGroup.Close(); err != nil {
9893
logger.LogAttrs(ctx, slog.LevelError, "Error closing consumer group", slog.String("error", err.Error()))
9994
}
100-
logger.Log(ctx, slog.LevelInfo, "Closed consumer group")
95+
logger.LogAttrs(ctx, slog.LevelInfo, "Closed consumer group")
10196
}()
10297

10398
<-ctx.Done()
10499

105-
logger.Log(ctx, slog.LevelInfo, "message", "Accounting service exited")
100+
logger.LogAttrs(ctx, slog.LevelInfo, "Accounting service exited")
106101
}
107102

108103
func mustMapEnv(target *string, envKey string) {

0 commit comments

Comments
 (0)