Fix falback logger

Author: AchoArnold

.gitignore

@@ -14,3 +14,4 @@ SECURITY_AUDIT_REPORT.md
 *.exe
 
 docs/
+.output

api/pkg/di/container.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"log"
 	"net/http"
 	"os"
 	"strconv"
@@ -1922,8 +1923,8 @@ func (container *Container) initializeUptraceProvider(version string, namespace
 
 func logger(skipFrameCount int) telemetry.Logger {
 	fields := map[string]string{
-		"pid":      strconv.Itoa(os.Getpid()),
-		"hostname": hostName(),
+		"hostname":                               hostName(),
+		string(semconv.DeploymentEnvironmentKey): os.Getenv("ENV"),
 	}
 
 	return telemetry.NewZerologLogger(
@@ -1968,18 +1969,12 @@ func jsonLogger(skipFrameCount int) *zerodriver.Logger {
 }
 
 func axiomLogger(skipFrameCount int) *zerodriver.Logger {
-	logLevel := zerolog.DebugLevel
-	zerolog.SetGlobalLevel(logLevel)
-	zerolog.TimestampFieldName = "time"
-	zerolog.TimeFieldFormat = time.RFC3339Nano
-
 	axiomWriter, err := axiomzerolog.New(
+		axiomzerolog.SetLevels([]zerolog.Level{zerolog.TraceLevel, zerolog.DebugLevel, zerolog.InfoLevel, zerolog.WarnLevel, zerolog.ErrorLevel, zerolog.PanicLevel, zerolog.FatalLevel, zerolog.NoLevel}),
 		axiomzerolog.SetDataset(os.Getenv("AXIOM_DATASET_EVENTS")),
 	)
 	if err != nil {
-		// Fall back to stderr JSON if Axiom is not configured
-		zl := zerolog.New(os.Stderr).With().Timestamp().CallerWithSkipFrameCount(skipFrameCount).Logger()
-		return &zerodriver.Logger{Logger: &zl}
+		log.Fatal(stacktrace.Propagate(err, "cannot create axiom zerolog writer"))
 	}
 
 	zl := zerolog.New(axiomWriter).With().Timestamp().CallerWithSkipFrameCount(skipFrameCount).Logger()

api/pkg/telemetry/gorm_logger.go

@@ -27,15 +27,15 @@ func (gorm *gormLogger) LogMode(_ logger.LogLevel) logger.Interface {
 	return gorm
 }
 
-func (gorm *gormLogger) Info(ctx context.Context, s string, i ...interface{}) {
+func (gorm *gormLogger) Info(ctx context.Context, s string, i ...any) {
 	gorm.logger.WithSpan(gorm.tracer.Span(ctx).SpanContext()).Info(fmt.Sprintf(s, i...))
 }
 
-func (gorm *gormLogger) Warn(ctx context.Context, s string, i ...interface{}) {
+func (gorm *gormLogger) Warn(ctx context.Context, s string, i ...any) {
 	gorm.logger.WithSpan(gorm.tracer.Span(ctx).SpanContext()).Warn(fmt.Errorf(s, i...))
 }
 
-func (gorm *gormLogger) Error(ctx context.Context, s string, i ...interface{}) {
+func (gorm *gormLogger) Error(ctx context.Context, s string, i ...any) {
 	gorm.logger.WithSpan(gorm.tracer.Span(ctx).SpanContext()).Error(fmt.Errorf(s, i...))
 }
 

api/pkg/telemetry/zerolog_logger.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/hirosassa/zerodriver"
 	"github.com/rs/zerolog"
-	semconv "go.opentelemetry.io/otel/semconv/v1.10.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.41.0"
 	"go.opentelemetry.io/otel/trace"
 )
 
@@ -34,7 +34,7 @@ func NewZerologLogger(projectID string, fields map[string]string, driver *zerodr
 func (logger *zerologLogger) WithService(service string) Logger {
 	return NewZerologLogger(
 		logger.projectID,
-		logger.addField(string(semconv.ServiceNameKey), service),
+		logger.addField(string(semconv.ServiceNamespaceKey), service),
 		logger.zerolog,
 		logger.spanContext,
 	)