feat!: remove cloudzap

README.md

@@ -9,7 +9,7 @@ opinionated, batteries-included service SDK.
 Run your application with [`cloudrunner.Run`](./run.go), and you get:
 
 - Logging integrated with [Cloud Logging](https://cloud.google.com/logging)
-  using [Zap](https://go.uber.org/zap).
+  using [slog](https://pkg.go.dev/log/slog).
 - Tracing integrated with [Cloud Trace](https://cloud.google.com/trace)
   using[OpenTelemetry Go](https://go.opentelemetry.io/otel).
 - Metrics integrated with
@@ -41,6 +41,7 @@ package main
 import (
 	"context"
 	"log"
+	"log/slog"
 
 	"go.einride.tech/cloudrunner"
 	"google.golang.org/grpc/health"
@@ -49,7 +50,7 @@ import (
 
 func main() {
 	if err := cloudrunner.Run(func(ctx context.Context) error {
-		cloudrunner.Logger(ctx).Info("hello world")
+		slog.InfoContext(ctx, "hello world")
 		grpcServer := cloudrunner.NewGRPCServer(ctx)
 		healthServer := health.NewServer()
 		grpc_health_v1.RegisterHealthServer(grpcServer, healthServer)
@@ -100,8 +101,10 @@ cloudrunner    GOOGLE_CLOUD_PROJECT                     string
 cloudrunner    RUNTIME_SERVICEACCOUNT                   string                                              
 cloudrunner    SERVICE_VERSION                          string                                              
 cloudrunner    ENABLE_PUBSUB_TRACING                    bool                                                
+cloudrunner    LOGGER_PROJECTID                         string                                              
 cloudrunner    LOGGER_DEVELOPMENT                       bool                         true                   false
-cloudrunner    LOGGER_LEVEL                             zapcore.Level                debug                  info
+cloudrunner    LOGGER_LEVEL                             slog.Level                   debug                  info
+cloudrunner    LOGGER_PROTOMESSAGESIZELIMIT             int                                                 1024
 cloudrunner    LOGGER_REPORTERRORS                      bool                                                true
 cloudrunner    PROFILER_ENABLED                         bool                                                true
 cloudrunner    PROFILER_MUTEXPROFILING                  bool                                                

cloudotel/errorhandler.go

@@ -5,17 +5,8 @@ import (
 	"log/slog"
 
 	"go.opentelemetry.io/otel"
-	"go.uber.org/zap"         //nolint:gomodguard // legacy zap dependency for backwards compatibility
-	"go.uber.org/zap/zapcore" //nolint:gomodguard // legacy zap dependency for backwards compatibility
 )
 
-// NewErrorLogger returns a new otel.ErrorHandler that logs errors using the provided logger, level and message.
-//
-// Deprecated: This is a no-op as part of the migration from zap to slog.
-func NewErrorLogger(*zap.Logger, zapcore.Level, string) otel.ErrorHandler {
-	return otel.ErrorHandlerFunc(func(error) {})
-}
-
 // RegisterErrorHandler registers a global OpenTelemetry error handler.
 func RegisterErrorHandler(ctx context.Context) {
 	otel.SetErrorHandler(otel.ErrorHandlerFunc(func(err error) {

cloudotel/tracemiddleware.go

@@ -13,10 +13,8 @@ import (
 	gcppropagator "github.com/GoogleCloudPlatform/opentelemetry-operations-go/propagator"
 	"go.einride.tech/cloudrunner/cloudpubsub"
 	"go.einride.tech/cloudrunner/cloudstream"
-	"go.einride.tech/cloudrunner/cloudzap" //nolint:staticcheck // SA1019: internal use of deprecated package pending removal
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/zap" //nolint:gomodguard // legacy zap dependency for trace middleware
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
@@ -131,19 +129,8 @@ func (i *TraceMiddleware) withLogTracing(ctx context.Context, spanCtx trace.Span
 	if i.TraceHook != nil {
 		ctx = i.TraceHook(ctx, spanCtx)
 	}
-	fields := make([]zap.Field, 0, 3)
-	//nolint:staticcheck // SA1019: deprecated, pending removal
-	fields = append(fields, cloudzap.Trace(spanCtx.TraceID().String()))
-	if spanCtx.SpanID().String() != "" {
-		//nolint:staticcheck // SA1019: deprecated, pending removal
-		fields = append(fields, cloudzap.SpanID(spanCtx.SpanID().String()))
-	}
-	if spanCtx.IsSampled() {
-		//nolint:staticcheck // SA1019: deprecated, pending removal
-		fields = append(fields, cloudzap.TraceSampled(spanCtx.IsSampled()))
-	}
-	//nolint:staticcheck // SA1019: deprecated, pending removal
-	return cloudzap.WithLoggerFields(ctx, fields...)
+	// Trace fields are automatically added by the slog handler from the span context
+	return ctx
 }
 
 func propagatePubsubTracing(ctx context.Context, r *http.Request) context.Context {

cloudrequestlog/additionalfields.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"log/slog"
 	"sync"
-
-	"go.uber.org/zap/zapcore" //nolint:gomodguard // cloudrequestlog uses zap for legacy request logging
 )
 
 type additionalFieldsKey struct{}
@@ -88,8 +86,6 @@ func argsToAttr(args []any) (slog.Attr, []any) {
 			return slog.String(badKey, x), nil
 		}
 		return slog.Any(x, args[1]), args[2:]
-	case zapcore.Field:
-		return fieldToAttr(x), args[1:]
 	case slog.Attr:
 		return x, args[1:]
 	default:

cloudrequestlog/details.go

@@ -2,46 +2,31 @@ package cloudrequestlog
 
 import (
 	"encoding/json"
+	"log/slog"
 
-	"go.uber.org/zap"         //nolint:gomodguard // cloudrequestlog uses zap for legacy request logging
-	"go.uber.org/zap/zapcore" //nolint:gomodguard // cloudrequestlog uses zap for legacy request logging
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
 )
 
-// ErrorDetails creates a zap.Field that logs the gRPC error details of the provided error.
-//
-// Deprecated: Returns a zap.Field which ties consumers to the deprecated zap dependency.
-// There is no drop-in slog replacement yet. This function will be removed in a future version.
-func ErrorDetails(err error) zap.Field {
+// ErrorDetails creates a slog.Attr that logs the gRPC error details of the provided error.
+func ErrorDetails(err error) slog.Attr {
 	if err == nil {
-		return zap.Skip()
+		return slog.Attr{}
 	}
 	s, ok := status.FromError(err)
 	if !ok {
-		return zap.Skip()
+		return slog.Attr{}
 	}
 	protoDetails := s.Proto().GetDetails()
 	if len(protoDetails) == 0 {
-		return zap.Skip()
+		return slog.Attr{}
 	}
-	return zap.Array("errorDetails", errorDetailsMarshaler(protoDetails))
-}
-
-type errorDetailsMarshaler []*anypb.Any
-
-var _ zapcore.ArrayMarshaler = errorDetailsMarshaler{}
-
-// MarshalLogArray implements zapcore.ArrayMarshaler.
-func (d errorDetailsMarshaler) MarshalLogArray(encoder zapcore.ArrayEncoder) error {
-	for _, detail := range d {
-		if err := encoder.AppendReflected(reflectProtoMessage{message: detail}); err != nil {
-			return err
-		}
+	details := make([]reflectProtoMessage, len(protoDetails))
+	for i, detail := range protoDetails {
+		details[i] = reflectProtoMessage{message: detail}
 	}
-	return nil
+	return slog.Any("errorDetails", details)
 }
 
 type reflectProtoMessage struct {

cloudtrace/middleware.go

@@ -5,8 +5,6 @@ import (
 	"net/http"
 
 	"go.einride.tech/cloudrunner/cloudstream"
-	"go.einride.tech/cloudrunner/cloudzap" //nolint:staticcheck // SA1019: internal use of deprecated package pending removal
-	"go.uber.org/zap"                      //nolint:gomodguard // legacy zap dependency for trace middleware
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
@@ -106,17 +104,6 @@ func (i *Middleware) withLogTracing(ctx context.Context, header string) context.
 	if i.TraceHook != nil {
 		ctx = i.TraceHook(ctx, traceContext)
 	}
-	fields := make([]zap.Field, 0, 3)
-	//nolint:staticcheck // SA1019: deprecated, pending removal
-	fields = append(fields, cloudzap.Trace(traceContext.TraceID))
-	if traceContext.SpanID != "" {
-		//nolint:staticcheck // SA1019: deprecated, pending removal
-		fields = append(fields, cloudzap.SpanID(traceContext.SpanID))
-	}
-	if traceContext.Sampled {
-		//nolint:staticcheck // SA1019: deprecated, pending removal
-		fields = append(fields, cloudzap.TraceSampled(traceContext.Sampled))
-	}
-	//nolint:staticcheck // SA1019: deprecated, pending removal
-	return cloudzap.WithLoggerFields(ctx, fields...)
+	// Trace fields are automatically added by the slog handler from the span context
+	return ctx
 }