refactor(telemetry): rename slogadapter module to slog

Signed-off-by: Joshua Temple <joshua.temple@stablekernel.com>

Author: joshua-temple

go.work

@@ -6,5 +6,5 @@ use (
 	./telemetry
 	./telemetry/datadog
 	./telemetry/otel
-	./telemetry/slogadapter
+	./telemetry/slog
 )

magefiles/magefile.go

@@ -28,7 +28,7 @@ import (
 // modules is the list of Go modules in the suite, by directory. As new modules
 // land (broker, store, sink), add them here and every target picks them
 // up automatically.
-var modules = []string{"state", "telemetry", "telemetry/slogadapter", "telemetry/otel", "telemetry/datadog"}
+var modules = []string{"state", "telemetry", "telemetry/slog", "telemetry/otel", "telemetry/datadog"}
 
 // Pinned tool versions — keep in sync with .github/workflows/ci.yml.
 const (

telemetry/CHANGELOG.md

@@ -17,7 +17,7 @@ and this module adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.
   SDK.
 - Attributes backed by the standard library's `slog.Value`, giving type-safe,
   zero-allocation scalar attributes (`Any` is the opt-in boxing escape hatch).
-- A `slog` adapter (`telemetry/slogadapter`) that emits spans and metrics as
+- A `slog` adapter (`telemetry/slog`) that emits spans and metrics as
   structured logs with no conversion.
 
 [Unreleased]: https://github.com/stablekernel/crucible/compare/telemetry/v0.1.0...HEAD

telemetry/README.md

@@ -108,17 +108,17 @@ optional sub-modules so the core never imports a vendor SDK.
 
 | Adapter                | Status   | Deps |
 | ---------------------- | -------- | ---- |
-| [`telemetry/slogadapter`](slogadapter/README.md) | shipped  | stdlib `log/slog` only — emits spans/metrics as structured logs |
+| [`telemetry/slog`](slog/README.md) | shipped  | stdlib `log/slog` only — emits spans/metrics as structured logs |
 | [`telemetry/otel`](otel/README.md) | shipped  | OpenTelemetry SDK (in its own `go.mod`) |
 | [`telemetry/datadog`](datadog/README.md) | shipped  | `dd-trace-go` / `datadog-go` (in their own `go.mod`) |
 
 Each adapter implements the same interfaces and is wired by a consumer via
-`WithTracer`/`WithMeter` exactly like `slogadapter`. `Span.SetStatus` maps to the
+`WithTracer`/`WithMeter` exactly like the `slog` adapter. `Span.SetStatus` maps to the
 otel status code / Datadog error flag; `ResolveInstrument` exposes the
 unit/description an adapter needs to construct its backend instrument. Attributes
 are converted with a `switch` over `attr.Value.Kind()` (the `slog.Value` kind),
 reading the typed accessor for each scalar kind and `Value.Any()` only for the
-`KindAny` escape hatch. The `slogadapter` is conversion-free because `Attr` is
+`KindAny` escape hatch. The `slog` adapter is conversion-free because `Attr` is
 already `slog.Attr`.
 
 ## Stability

telemetry/doc.go

@@ -88,15 +88,15 @@
 // Adapters translate this interface to a concrete backend and ship as separate,
 // optional sub-modules so the core never imports a vendor SDK:
 //
-//   - telemetry/slogadapter — a standard-library log/slog adapter (zero external
+//   - telemetry/slog — a standard-library log/slog adapter (zero external
 //     deps) that emits spans and metrics as structured logs. Shipped here; it
 //     proves the seam end to end. Because Attr is slog.Attr, this adapter is
 //     conversion-free: attributes pass straight to the slog handler.
 //   - telemetry/otel, telemetry/datadog — deferred. Each would live in its own
 //     sub-module with its own go.mod that requires the vendor SDK, implement the
 //     same interfaces (Span.SetStatus -> otel status / dd error flag,
 //     ResolveInstrument -> instrument unit/description), and be wired by a
-//     consumer via WithTracer/WithMeter exactly like slogadapter. They convert
+//     consumer via WithTracer/WithMeter exactly like the slog adapter. They convert
 //     each attribute with a switch over Attr.Value.Kind (the slog.Value kind),
 //     reading the typed accessor for each scalar kind and Value.Any only for the
 //     KindAny escape hatch.

telemetry/slogadapter/README.md telemetry/slog/README.mdtelemetry/slogadapter/README.md renamed to telemetry/slog/README.md

@@ -1,14 +1,14 @@
-# crucible/telemetry/slogadapter
+# crucible/telemetry/slog
 
 A standard-library `log/slog` adapter for
 [`crucible/telemetry`](../README.md). Emits spans and metric instruments as
 structured log records, with **zero external dependencies**.
 
-Import path: `github.com/stablekernel/crucible/telemetry/slogadapter`
+Import path: `github.com/stablekernel/crucible/telemetry/slog`
 
 ## What it is
 
-`slogadapter` implements the `telemetry.Tracer` and `telemetry.Meter` interfaces
+This adapter implements the `telemetry.Tracer` and `telemetry.Meter` interfaces
 on top of Go's `log/slog`. It is the reference adapter — it proves the telemetry
 seam end to end without pulling in any vendor SDK — and is useful for
 development, tests, and environments where structured logs are the only
@@ -24,14 +24,25 @@ adapter against the same interfaces.
 
 ## Usage
 
+The package name is `slog`, which collides with the standard library's
+`log/slog`. Import it under an alias (e.g. `crucibleslog`) in any file that also
+imports `log/slog`:
+
 ```go
+import (
+    "log/slog"
+
+    "github.com/stablekernel/crucible/telemetry"
+    crucibleslog "github.com/stablekernel/crucible/telemetry/slog"
+)
+
 logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
     Level: slog.LevelDebug, // span/metric records are emitted at DEBUG
 }))
 
 tel := telemetry.Nop().Apply(
-    telemetry.WithTracer(slogadapter.NewTracer(slogadapter.WithLogger(logger))),
-    telemetry.WithMeter(slogadapter.NewMeter(slogadapter.WithLogger(logger))),
+    telemetry.WithTracer(crucibleslog.NewTracer(crucibleslog.WithLogger(logger))),
+    telemetry.WithMeter(crucibleslog.NewMeter(crucibleslog.WithLogger(logger))),
 )
 ```
 

telemetry/slogadapter/example_test.go telemetry/slog/example_test.gotelemetry/slogadapter/example_test.go renamed to telemetry/slog/example_test.go

@@ -1,12 +1,12 @@
-package slogadapter_test
+package slog_test
 
 import (
 	"context"
 	"log/slog"
 	"os"
 
 	"github.com/stablekernel/crucible/telemetry"
-	"github.com/stablekernel/crucible/telemetry/slogadapter"
+	crucibleslog "github.com/stablekernel/crucible/telemetry/slog"
 )
 
 // Example wires the slog adapter into a consuming module's telemetry Provider,
@@ -28,8 +28,8 @@ func Example() {
 	}))
 
 	tel := telemetry.Nop().Apply(
-		telemetry.WithTracer(slogadapter.NewTracer(slogadapter.WithLogger(logger))),
-		telemetry.WithMeter(slogadapter.NewMeter(slogadapter.WithLogger(logger))),
+		telemetry.WithTracer(crucibleslog.NewTracer(crucibleslog.WithLogger(logger))),
+		telemetry.WithMeter(crucibleslog.NewMeter(crucibleslog.WithLogger(logger))),
 	)
 
 	ctx, span := tel.Tracer.Start(context.Background(), "sink.Sink")

telemetry/slogadapter/go.mod telemetry/slog/go.modtelemetry/slogadapter/go.mod renamed to telemetry/slog/go.mod

@@ -1,4 +1,4 @@
-module github.com/stablekernel/crucible/telemetry/slogadapter
+module github.com/stablekernel/crucible/telemetry/slog
 
 go 1.25
 

telemetry/slogadapter/slogadapter.go telemetry/slog/slog.gotelemetry/slogadapter/slogadapter.go renamed to telemetry/slog/slog.go

@@ -1,9 +1,9 @@
-// Package slogadapter implements the Crucible telemetry interfaces on top of the
+// Package slog implements the Crucible telemetry interfaces on top of the
 // standard library's log/slog. It proves the telemetry seam end to end using
 // zero external dependencies: spans and metric instruments are emitted as
 // structured log records.
 //
-// Import path: github.com/stablekernel/crucible/telemetry/slogadapter
+// Import path: github.com/stablekernel/crucible/telemetry/slog
 //
 // It is intended for development, tests, and environments where structured logs
 // are the only observability sink. For production tracing/metrics backends, use
@@ -22,11 +22,11 @@
 //
 // All durations are sourced from an injectable clock so emission is
 // deterministic in tests.
-package slogadapter
+package slog
 
 import (
 	"context"
-	"log/slog"
+	sl "log/slog"
 	"sync/atomic"
 	"time"
 
@@ -35,7 +35,7 @@ import (
 
 // config holds resolved Option state.
 type config struct {
-	logger *slog.Logger
+	logger *sl.Logger
 	now    func() time.Time
 	nextID func() uint64
 }
@@ -46,7 +46,7 @@ type Option func(*config)
 // WithLogger sets the slog.Logger the adapter emits to. The default discards all
 // records (slog.New(slog.DiscardHandler)), keeping the adapter silent until a
 // real logger is supplied.
-func WithLogger(l *slog.Logger) Option {
+func WithLogger(l *sl.Logger) Option {
 	return func(c *config) {
 		if l != nil {
 			c.logger = l
@@ -78,7 +78,7 @@ func WithIDFn(next func() uint64) Option {
 func resolve(opts ...Option) config {
 	ctr := new(atomic.Uint64)
 	c := config{
-		logger: slog.New(slog.DiscardHandler),
+		logger: sl.New(sl.DiscardHandler),
 		now:    time.Now,
 		nextID: func() uint64 { return ctr.Add(1) },
 	}
@@ -105,12 +105,12 @@ func (t *Tracer) Start(ctx context.Context, name string, attrs ...telemetry.Attr
 	id := t.cfg.nextID()
 	parent, hasParent := ctx.Value(spanIDKey{}).(uint64)
 
-	logAttrs := []any{slog.String("name", name), slog.Uint64("id", id)}
+	logAttrs := []any{sl.String("name", name), sl.Uint64("id", id)}
 	if hasParent {
-		logAttrs = append(logAttrs, slog.Uint64("parent", parent))
+		logAttrs = append(logAttrs, sl.Uint64("parent", parent))
 	}
 	logAttrs = append(logAttrs, attrArgs(attrs)...)
-	t.cfg.logger.LogAttrs(ctx, slog.LevelDebug, "span.start", slog.Group("span", logAttrs...))
+	t.cfg.logger.LogAttrs(ctx, sl.LevelDebug, "span.start", sl.Group("span", logAttrs...))
 
 	s := &span{
 		cfg:   t.cfg,
@@ -136,19 +136,19 @@ func (s *span) SetAttributes(attrs ...telemetry.Attr) {
 	if s.ended {
 		return
 	}
-	args := append([]any{slog.String("name", s.name), slog.Uint64("id", s.id)}, attrArgs(attrs)...)
-	s.cfg.logger.LogAttrs(context.Background(), slog.LevelDebug, "span.attributes", slog.Group("span", args...))
+	args := append([]any{sl.String("name", s.name), sl.Uint64("id", s.id)}, attrArgs(attrs)...)
+	s.cfg.logger.LogAttrs(context.Background(), sl.LevelDebug, "span.attributes", sl.Group("span", args...))
 }
 
 func (s *span) RecordError(err error) {
 	if s.ended || err == nil {
 		return
 	}
-	s.cfg.logger.LogAttrs(context.Background(), slog.LevelError, "span.error",
-		slog.Group("span",
-			slog.String("name", s.name),
-			slog.Uint64("id", s.id),
-			slog.String("error", err.Error()),
+	s.cfg.logger.LogAttrs(context.Background(), sl.LevelError, "span.error",
+		sl.Group("span",
+			sl.String("name", s.name),
+			sl.Uint64("id", s.id),
+			sl.String("error", err.Error()),
 		),
 	)
 }
@@ -167,20 +167,20 @@ func (s *span) End() {
 	}
 	s.ended = true
 	args := []any{
-		slog.String("name", s.name),
-		slog.Uint64("id", s.id),
-		slog.String("status", statusString(s.status)),
-		slog.Duration("elapsed", s.cfg.now().Sub(s.start)),
+		sl.String("name", s.name),
+		sl.Uint64("id", s.id),
+		sl.String("status", statusString(s.status)),
+		sl.Duration("elapsed", s.cfg.now().Sub(s.start)),
 	}
 	if s.statusMsg != "" {
-		args = append(args, slog.String("status_msg", s.statusMsg))
+		args = append(args, sl.String("status_msg", s.statusMsg))
 	}
-	s.cfg.logger.LogAttrs(context.Background(), slog.LevelDebug, "span.end", slog.Group("span", args...))
+	s.cfg.logger.LogAttrs(context.Background(), sl.LevelDebug, "span.end", sl.Group("span", args...))
 }
 
 // Meter is a telemetry.Meter backed by slog.
 type Meter struct {
-	logger *slog.Logger
+	logger *sl.Logger
 }
 
 // NewMeter returns a slog-backed Meter.
@@ -203,30 +203,30 @@ func (m *Meter) Gauge(name string, opts ...telemetry.InstrumentOption) telemetry
 
 // instrument backs Counter, Histogram, and Gauge: each logs a "metric" record.
 type instrument struct {
-	logger *slog.Logger
+	logger *sl.Logger
 	name   string
 	kind   string
 	cfg    telemetry.InstrumentConfig
 }
 
 func (i *instrument) Add(ctx context.Context, n int64, attrs ...telemetry.Attr) {
-	i.emit(ctx, slog.Int64("value", n), attrs)
+	i.emit(ctx, sl.Int64("value", n), attrs)
 }
 
 func (i *instrument) Record(ctx context.Context, v float64, attrs ...telemetry.Attr) {
-	i.emit(ctx, slog.Float64("value", v), attrs)
+	i.emit(ctx, sl.Float64("value", v), attrs)
 }
 
-func (i *instrument) emit(ctx context.Context, value slog.Attr, attrs []telemetry.Attr) {
-	args := []any{slog.String("name", i.name), slog.String("kind", i.kind), value}
+func (i *instrument) emit(ctx context.Context, value sl.Attr, attrs []telemetry.Attr) {
+	args := []any{sl.String("name", i.name), sl.String("kind", i.kind), value}
 	if i.cfg.Unit != "" {
-		args = append(args, slog.String("unit", i.cfg.Unit))
+		args = append(args, sl.String("unit", i.cfg.Unit))
 	}
 	if i.cfg.Description != "" {
-		args = append(args, slog.String("description", i.cfg.Description))
+		args = append(args, sl.String("description", i.cfg.Description))
 	}
 	args = append(args, attrArgs(attrs)...)
-	i.logger.LogAttrs(ctx, slog.LevelDebug, "metric", slog.Group("metric", args...))
+	i.logger.LogAttrs(ctx, sl.LevelDebug, "metric", sl.Group("metric", args...))
 }
 
 // attrArgs nests the telemetry attributes under a single "attrs" group so their
@@ -241,7 +241,7 @@ func attrArgs(attrs []telemetry.Attr) []any {
 	for i, a := range attrs {
 		inner[i] = a
 	}
-	return []any{slog.Group("attrs", inner...)}
+	return []any{sl.Group("attrs", inner...)}
 }
 
 func statusString(c telemetry.StatusCode) string {