From a039b14cfa19ae6cbfbf03dbc725af7a5d0ac10a Mon Sep 17 00:00:00 2001
From: Chris Duncan <veqryn@hotmail.com>
Date: Sun, 26 Nov 2023 04:08:27 -0700
Subject: [PATCH 1/6] Move context key to internal package

---
 ctx.go          | 11 +++++------
 internal/ctx.go | 13 +++++++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 internal/ctx.go

diff --git a/ctx.go b/ctx.go
index 6a00845..7fea9bb 100644
--- a/ctx.go
+++ b/ctx.go
@@ -3,10 +3,9 @@ package slogcontext
 import (
 	"context"
 	"log/slog"
-)
 
-// Logger key for context.valueCtx
-type ctxKey struct{}
+	"github.com/veqryn/slog-context/internal"
+)
 
 // ToCtx returns a copy of ctx with the logger attached.
 // The parent context will be unaffected.
@@ -16,7 +15,7 @@ func ToCtx(parent context.Context, logger *slog.Logger) context.Context {
 	if parent == nil {
 		parent = context.Background()
 	}
-	return context.WithValue(parent, ctxKey{}, logger)
+	return context.WithValue(parent, internal.CtxKey{}, internal.LoggerCtxVal{Logger: logger})
 }
 
 // Logger returns the slog.Logger associated with the ctx.
@@ -26,8 +25,8 @@ func Logger(ctx context.Context) *slog.Logger {
 	if ctx == nil {
 		return slog.Default()
 	}
-	if l, ok := ctx.Value(ctxKey{}).(*slog.Logger); ok && l != nil {
-		return l
+	if l, ok := ctx.Value(internal.CtxKey{}).(internal.LoggerCtxVal); ok && l.Logger != nil {
+		return l.Logger
 	}
 	return slog.Default()
 }
diff --git a/internal/ctx.go b/internal/ctx.go
new file mode 100644
index 0000000..05bb4ed
--- /dev/null
+++ b/internal/ctx.go
@@ -0,0 +1,13 @@
+package internal
+
+import "log/slog"
+
+// CtxKey Logger key for context.valueCtx
+type CtxKey struct{}
+
+// LoggerCtxVal is just a bucket containing a *slog.Logger
+// and potentially other logger interfaces for interoperability.
+type LoggerCtxVal struct {
+	Logger *slog.Logger
+	IterOp any
+}

From e70d6a8d0ef85e61b087d2a7d55d45db4dbb8c31 Mon Sep 17 00:00:00 2001
From: Chris Duncan <veqryn@hotmail.com>
Date: Sun, 26 Nov 2023 04:11:57 -0700
Subject: [PATCH 2/6] Add draft logr interoperability methods

---
 logr-context/go.mod  |  8 ++++++++
 logr-context/go.sum  |  4 ++++
 logr-context/logr.go | 48 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 logr-context/go.mod
 create mode 100644 logr-context/go.sum
 create mode 100644 logr-context/logr.go

diff --git a/logr-context/go.mod b/logr-context/go.mod
new file mode 100644
index 0000000..5e35bf6
--- /dev/null
+++ b/logr-context/go.mod
@@ -0,0 +1,8 @@
+module github.com/veqryn/slog-context/logr-context
+
+go 1.21
+
+require (
+	github.com/go-logr/logr v1.3.0
+	github.com/veqryn/slog-context v0.3.1-0.20231126110827-74878698ea2b
+)
diff --git a/logr-context/go.sum b/logr-context/go.sum
new file mode 100644
index 0000000..1547784
--- /dev/null
+++ b/logr-context/go.sum
@@ -0,0 +1,4 @@
+github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/veqryn/slog-context v0.3.1-0.20231126110827-74878698ea2b h1:BG6I67Hp571eSmcc3s8O0XAxSAUg3WHSiWPoMzeV91E=
+github.com/veqryn/slog-context v0.3.1-0.20231126110827-74878698ea2b/go.mod h1:2IEM+uLEBRZyq+CRMdpETc13tUj9aA7zFZnm6/YnvPQ=
diff --git a/logr-context/logr.go b/logr-context/logr.go
new file mode 100644
index 0000000..4c5efb1
--- /dev/null
+++ b/logr-context/logr.go
@@ -0,0 +1,48 @@
+package logrcontext
+
+import (
+	"context"
+	"log/slog"
+
+	"github.com/go-logr/logr"
+	"github.com/go-logr/logr/slogr"
+	"github.com/veqryn/slog-context/internal"
+)
+
+func LogrToCtx(parent context.Context, logger logr.Logger) context.Context {
+	if parent == nil {
+		parent = context.Background()
+	}
+	return context.WithValue(parent, internal.CtxKey{}, internal.LoggerCtxVal{
+		Logger: slog.New(slogr.NewSlogHandler(logger)),
+		IterOp: logger,
+	})
+}
+
+func SlogToCtx(parent context.Context, logger *slog.Logger) context.Context {
+	if parent == nil {
+		parent = context.Background()
+	}
+	if logger == nil {
+		return context.WithValue(parent, internal.CtxKey{}, internal.LoggerCtxVal{Logger: logger})
+	}
+	return context.WithValue(parent, internal.CtxKey{}, internal.LoggerCtxVal{
+		Logger: logger,
+		IterOp: slogr.NewLogr(logger.Handler()),
+	})
+}
+
+func LogrFromCtx(ctx context.Context) logr.Logger {
+	if ctx == nil {
+		return slogr.NewLogr(slog.Default().Handler())
+	}
+	if l, ok := ctx.Value(internal.CtxKey{}).(internal.LoggerCtxVal); ok {
+		if lgr, hasLogr := l.IterOp.(logr.Logger); hasLogr {
+			return lgr
+		}
+		if l.Logger != nil {
+			return slogr.NewLogr(l.Logger.Handler())
+		}
+	}
+	return slogr.NewLogr(slog.Default().Handler())
+}

From a8b339698a6f94ad3609c0be77ab8c98f538fcfa Mon Sep 17 00:00:00 2001
From: Chris Duncan <veqryn@hotmail.com>
Date: Fri, 1 Dec 2023 17:14:38 -0700
Subject: [PATCH 3/6] Use the new logr methods to preserve interoperability

---
 ctx.go               | 16 ++++++++-------
 go.mod               |  2 ++
 go.sum               |  2 ++
 internal/ctx.go      | 13 ------------
 logr-context/go.mod  |  8 --------
 logr-context/go.sum  |  4 ----
 logr-context/logr.go | 48 --------------------------------------------
 7 files changed, 13 insertions(+), 80 deletions(-)
 create mode 100644 go.sum
 delete mode 100644 internal/ctx.go
 delete mode 100644 logr-context/go.mod
 delete mode 100644 logr-context/go.sum
 delete mode 100644 logr-context/logr.go

diff --git a/ctx.go b/ctx.go
index 7fea9bb..71a7fe2 100644
--- a/ctx.go
+++ b/ctx.go
@@ -4,18 +4,17 @@ import (
 	"context"
 	"log/slog"
 
-	"github.com/veqryn/slog-context/internal"
+	"github.com/go-logr/logr"
 )
 
 // ToCtx returns a copy of ctx with the logger attached.
 // The parent context will be unaffected.
-// Passing in a nil logger will force future calls of Logger(ctx) on the
-// returned context to return the slog.Default() logger.
 func ToCtx(parent context.Context, logger *slog.Logger) context.Context {
 	if parent == nil {
 		parent = context.Background()
 	}
-	return context.WithValue(parent, internal.CtxKey{}, internal.LoggerCtxVal{Logger: logger})
+
+	return logr.NewContextWithSlogLogger(parent, logger)
 }
 
 // Logger returns the slog.Logger associated with the ctx.
@@ -25,8 +24,11 @@ func Logger(ctx context.Context) *slog.Logger {
 	if ctx == nil {
 		return slog.Default()
 	}
-	if l, ok := ctx.Value(internal.CtxKey{}).(internal.LoggerCtxVal); ok && l.Logger != nil {
-		return l.Logger
+
+	l := logr.FromContextAsSlogLogger(ctx)
+	if l == nil {
+		return slog.Default()
 	}
-	return slog.Default()
+
+	return l
 }
diff --git a/go.mod b/go.mod
index 1117c32..57fbf30 100644
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,5 @@
 module github.com/veqryn/slog-context
 
 go 1.21
+
+require github.com/go-logr/logr v1.3.1-0.20231201162808-6151b2fb393d
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..cd38fdc
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,2 @@
+github.com/go-logr/logr v1.3.1-0.20231201162808-6151b2fb393d h1:T7GLmPib4CwVBWBqKhEh+HB9vpnFbGKMgcXBclVkE7Y=
+github.com/go-logr/logr v1.3.1-0.20231201162808-6151b2fb393d/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
diff --git a/internal/ctx.go b/internal/ctx.go
deleted file mode 100644
index 05bb4ed..0000000
--- a/internal/ctx.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package internal
-
-import "log/slog"
-
-// CtxKey Logger key for context.valueCtx
-type CtxKey struct{}
-
-// LoggerCtxVal is just a bucket containing a *slog.Logger
-// and potentially other logger interfaces for interoperability.
-type LoggerCtxVal struct {
-	Logger *slog.Logger
-	IterOp any
-}
diff --git a/logr-context/go.mod b/logr-context/go.mod
deleted file mode 100644
index 5e35bf6..0000000
--- a/logr-context/go.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-module github.com/veqryn/slog-context/logr-context
-
-go 1.21
-
-require (
-	github.com/go-logr/logr v1.3.0
-	github.com/veqryn/slog-context v0.3.1-0.20231126110827-74878698ea2b
-)
diff --git a/logr-context/go.sum b/logr-context/go.sum
deleted file mode 100644
index 1547784..0000000
--- a/logr-context/go.sum
+++ /dev/null
@@ -1,4 +0,0 @@
-github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
-github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/veqryn/slog-context v0.3.1-0.20231126110827-74878698ea2b h1:BG6I67Hp571eSmcc3s8O0XAxSAUg3WHSiWPoMzeV91E=
-github.com/veqryn/slog-context v0.3.1-0.20231126110827-74878698ea2b/go.mod h1:2IEM+uLEBRZyq+CRMdpETc13tUj9aA7zFZnm6/YnvPQ=
diff --git a/logr-context/logr.go b/logr-context/logr.go
deleted file mode 100644
index 4c5efb1..0000000
--- a/logr-context/logr.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package logrcontext
-
-import (
-	"context"
-	"log/slog"
-
-	"github.com/go-logr/logr"
-	"github.com/go-logr/logr/slogr"
-	"github.com/veqryn/slog-context/internal"
-)
-
-func LogrToCtx(parent context.Context, logger logr.Logger) context.Context {
-	if parent == nil {
-		parent = context.Background()
-	}
-	return context.WithValue(parent, internal.CtxKey{}, internal.LoggerCtxVal{
-		Logger: slog.New(slogr.NewSlogHandler(logger)),
-		IterOp: logger,
-	})
-}
-
-func SlogToCtx(parent context.Context, logger *slog.Logger) context.Context {
-	if parent == nil {
-		parent = context.Background()
-	}
-	if logger == nil {
-		return context.WithValue(parent, internal.CtxKey{}, internal.LoggerCtxVal{Logger: logger})
-	}
-	return context.WithValue(parent, internal.CtxKey{}, internal.LoggerCtxVal{
-		Logger: logger,
-		IterOp: slogr.NewLogr(logger.Handler()),
-	})
-}
-
-func LogrFromCtx(ctx context.Context) logr.Logger {
-	if ctx == nil {
-		return slogr.NewLogr(slog.Default().Handler())
-	}
-	if l, ok := ctx.Value(internal.CtxKey{}).(internal.LoggerCtxVal); ok {
-		if lgr, hasLogr := l.IterOp.(logr.Logger); hasLogr {
-			return lgr
-		}
-		if l.Logger != nil {
-			return slogr.NewLogr(l.Logger.Handler())
-		}
-	}
-	return slogr.NewLogr(slog.Default().Handler())
-}

From 663131547bbd55fbf7c35cfc8f551a37c1132705 Mon Sep 17 00:00:00 2001
From: Chris Duncan <veqryn@hotmail.com>
Date: Fri, 1 Dec 2023 18:13:53 -0700
Subject: [PATCH 4/6] Update documentation with notes on compatibility with
 logr

---
 .github/workflows/golangci-lint.yml | 16 ++++++++++++++--
 README.md                           | 14 ++++++++++++--
 handler_test.go                     | 29 +++++++++++++++++++++++++++++
 helpers_test.go                     |  5 +++--
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 51d6bbc..799aed4 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -20,7 +20,7 @@ jobs:
         with:
           go-version: 'stable'
           cache: false
-      - name: golangci-lint
+      - name: golangci-lint root
         uses: golangci/golangci-lint-action@v3
         with:
           # Require: The version of golangci-lint to use.
@@ -35,7 +35,7 @@ jobs:
           #
           # Note: By default, the `.golangci.yml` file should be at the root of the repository.
           # The location of the configuration file can be changed by using `--config=`
-          # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0 
+          # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           only-new-issues: true
@@ -52,3 +52,15 @@ jobs:
 
           # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
           # install-mode: "goinstall"
+      - name: golangci-lint otel
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+          working-directory: ./otel
+          only-new-issues: true
+      - name: golangci-lint examples
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+          working-directory: ./examples
+          only-new-issues: true
diff --git a/README.md b/README.md
index a18365c..837bbce 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Automatically read any custom context values, such as OpenTelemetry TraceID.
 This library supports two different workflows for using slog and context.
 These workflows can be used individually or together at the same time.
 
-##### Attributes Extracted from Context Workflow:
+#### Attributes Extracted from Context Workflow:
 
 Using the `slogcontext.Handler` lets us `Prepend` and `Append` attributes to
 log lines, even when a logger is not passed into a function or in code we don't
@@ -31,13 +31,23 @@ prepended or appended to all log lines using that context. For example, the
 (OpenTelemetry) TraceID and SpanID, and add them to the log record, while also
 annotating the Span with an error code if the log is at error level.
 
-##### Logger in Context Workflow:
+#### Logger in Context Workflow:
 
 Using `ToCtx` and `Logger` lets us store the logger itself within a context,
 and get it back out again. Wrapper methods `With`/`WithGroup`/`Debug`/`Info`/
 `Warn`/`Error`/`Log`/`LogAttrs` let us work directly with a logger residing
 with the context (or the default logger if no logger is stored in the context).
 
+#### Compatibility with both Slog and Logr
+slog-context is compatible with both standard library [slog](https://pkg.go.dev/log/slog)
+and with [logr](https://github.com/go-logr/logr), which is an alternative
+logging api/interface/frontend.
+
+If only slog is used, only `*slog.Logger`'s will be stored in the context.
+If both slog and logr are used, `*slog.Logger` will be automatically converted
+to a `logr.Logger` as needed, and vice versa. This allows full interoperability
+down the stack and with any libraries that use either slog-context or logr.
+
 ## Install
 `go get github.com/veqryn/slog-context`
 
diff --git a/handler_test.go b/handler_test.go
index 3c6019d..a4607db 100644
--- a/handler_test.go
+++ b/handler_test.go
@@ -2,12 +2,22 @@ package slogcontext
 
 import (
 	"context"
+	"encoding/json"
 	"log/slog"
 	"slices"
+	"strings"
 	"testing"
 	"time"
 )
 
+type logLine struct {
+	Source struct {
+		Function string `json:"function"`
+		File     string `json:"file"`
+		Line     int    `json:"line"`
+	} `json:"source"`
+}
+
 func TestHandler(t *testing.T) {
 	t.Parallel()
 
@@ -47,6 +57,25 @@ func TestHandler(t *testing.T) {
 	if string(b) != expectedJSON {
 		t.Errorf("Expected:\n%s\nGot:\n%s\n", expectedText, string(b))
 	}
+
+	// Check the source location fields
+	tester.source = true
+	b, err = tester.MarshalJSON()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var unmarshalled logLine
+	err = json.Unmarshal(b, &unmarshalled)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if unmarshalled.Source.Function != "github.com/veqryn/slog-context.TestHandler" ||
+		!strings.HasSuffix(unmarshalled.Source.File, "github.com/veqryn/slog-context/handler_test.go") ||
+		unmarshalled.Source.Line != 42 {
+		t.Errorf("Expected source fields are incorrect: %#+v\n", unmarshalled)
+	}
 }
 
 func TestHandlerMultipleAttrExtractor(t *testing.T) {
diff --git a/helpers_test.go b/helpers_test.go
index 28b6a05..84408e5 100644
--- a/helpers_test.go
+++ b/helpers_test.go
@@ -12,6 +12,7 @@ var defaultTime = time.Date(2023, 9, 29, 13, 0, 59, 0, time.UTC)
 type testHandler struct {
 	Ctx    context.Context
 	Record slog.Record
+	source bool
 }
 
 func (h *testHandler) Enabled(context.Context, slog.Level) bool {
@@ -35,7 +36,7 @@ func (h *testHandler) WithAttrs([]slog.Attr) slog.Handler {
 
 func (h *testHandler) String() string {
 	buf := &bytes.Buffer{}
-	err := slog.NewTextHandler(buf, &slog.HandlerOptions{Level: slog.LevelDebug}).Handle(context.Background(), h.Record)
+	err := slog.NewTextHandler(buf, &slog.HandlerOptions{Level: slog.LevelDebug, AddSource: h.source}).Handle(context.Background(), h.Record)
 	if err != nil {
 		panic(err)
 	}
@@ -44,7 +45,7 @@ func (h *testHandler) String() string {
 
 func (h *testHandler) MarshalJSON() ([]byte, error) {
 	buf := &bytes.Buffer{}
-	err := slog.NewJSONHandler(buf, &slog.HandlerOptions{Level: slog.LevelDebug}).Handle(context.Background(), h.Record)
+	err := slog.NewJSONHandler(buf, &slog.HandlerOptions{Level: slog.LevelDebug, AddSource: h.source}).Handle(context.Background(), h.Record)
 	if err != nil {
 		return nil, err
 	}

From c398e37b63658089ae8b9905be058d0a69ff0455 Mon Sep 17 00:00:00 2001
From: Chris Duncan <veqryn@hotmail.com>
Date: Sat, 2 Dec 2023 01:20:36 -0700
Subject: [PATCH 5/6] Fix github actions

---
 .github/workflows/build_and_test.yml | 53 ++++++++++++++--------------
 .github/workflows/golangci-lint.yml  | 25 +++++++------
 examples/.golangci.yml               |  6 ++++
 handler_test.go                      |  2 +-
 otel/.golangci.yml                   |  2 ++
 5 files changed, 48 insertions(+), 40 deletions(-)
 create mode 100644 examples/.golangci.yml
 create mode 100644 otel/.golangci.yml

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index c7f7fe6..f9d70e3 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -7,6 +7,7 @@ on:
   push:
     tags:
     branches:
+      - main
   pull_request:
     branches:
 
@@ -27,25 +28,25 @@ jobs:
         working-directory: ${{ matrix.go-module }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Set up Go ${{ matrix.go-version }}
+      - name: Set up Go ${{ matrix.go-version }} ${{ matrix.go-module }}
         uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
 
-      - name: Display Go version
+      - name: Display Go version ${{ matrix.go-version }} ${{ matrix.go-module }}
         run: go version
 
-      - name: Install dependencies
+      - name: Install dependencies ${{ matrix.go-version }} ${{ matrix.go-module }}
         run: |
           go get -t -u golang.org/x/tools/cmd/cover
           go mod download
 
-      - name: Build
+      - name: Build ${{ matrix.go-version }} ${{ matrix.go-module }}
         run: go build -v ./...
 
-      - name: Test
+      - name: Test ${{ matrix.go-version }} ${{ matrix.go-module }}
         run: go test -v ./...
 
   # Build and Test as a workspace, create unified test coverage file
@@ -56,29 +57,29 @@ jobs:
         go-version: [ '1.21' ]
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-    - name: Set up Go ${{ matrix.go-version }}
-      uses: actions/setup-go@v4
-      with:
-        go-version: ${{ matrix.go-version }}
+      - name: Set up Go ${{ matrix.go-version }}
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
 
-    - name: Display Go version
-      run: go version
+      - name: Display Go version
+        run: go version
 
-    - name: Create workspace
-      run: |
-        go work init .
-        go work use ./examples
-        go work use ./otel
+      - name: Create workspace
+        run: |
+          go work init .
+          go work use ./examples
+          go work use ./otel
 
-    - name: Build
-      run: go build -v ./... ./otel/... ./examples/...
+      - name: Build
+        run: go build -v ./... ./otel/... ./examples/...
 
-    - name: Test
-      run: go test -v -race -coverprofile=coverage.out -covermode=atomic ./... ./otel/... ./examples/...
+      - name: Test
+        run: go test -v -race -coverprofile=coverage.out -covermode=atomic ./... ./otel/... ./examples/...
 
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v3
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 799aed4..d75d858 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -14,13 +14,21 @@ jobs:
   golangci:
     name: lint
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-module: [ '.', './otel', './examples']
+
+    defaults:
+      run:
+        working-directory: ${{ matrix.go-module }}
+
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version: 'stable'
           cache: false
-      - name: golangci-lint root
+      - name: Github-action golangci-lint ${{ matrix.go-module }}
         uses: golangci/golangci-lint-action@v3
         with:
           # Require: The version of golangci-lint to use.
@@ -52,15 +60,6 @@ jobs:
 
           # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
           # install-mode: "goinstall"
-      - name: golangci-lint otel
-        uses: golangci/golangci-lint-action@v3
-        with:
-          version: latest
-          working-directory: ./otel
-          only-new-issues: true
-      - name: golangci-lint examples
-        uses: golangci/golangci-lint-action@v3
-        with:
-          version: latest
-          working-directory: ./examples
-          only-new-issues: true
+
+      - name: Manual golangci-lint ${{ matrix.go-module }}
+        run: golangci-lint run ./...
diff --git a/examples/.golangci.yml b/examples/.golangci.yml
new file mode 100644
index 0000000..c5cf1a9
--- /dev/null
+++ b/examples/.golangci.yml
@@ -0,0 +1,6 @@
+run:
+  tests: false
+
+linters:
+  disable:
+    - errcheck
diff --git a/handler_test.go b/handler_test.go
index a4607db..f15676c 100644
--- a/handler_test.go
+++ b/handler_test.go
@@ -72,7 +72,7 @@ func TestHandler(t *testing.T) {
 	}
 
 	if unmarshalled.Source.Function != "github.com/veqryn/slog-context.TestHandler" ||
-		!strings.HasSuffix(unmarshalled.Source.File, "github.com/veqryn/slog-context/handler_test.go") ||
+		!strings.HasSuffix(unmarshalled.Source.File, "slog-context/handler_test.go") ||
 		unmarshalled.Source.Line != 42 {
 		t.Errorf("Expected source fields are incorrect: %#+v\n", unmarshalled)
 	}
diff --git a/otel/.golangci.yml b/otel/.golangci.yml
new file mode 100644
index 0000000..29cd34d
--- /dev/null
+++ b/otel/.golangci.yml
@@ -0,0 +1,2 @@
+run:
+  tests: false

From 9c304ff2cc5c66655383b10e3dbece9f800680de Mon Sep 17 00:00:00 2001
From: Chris Duncan <veqryn@hotmail.com>
Date: Thu, 21 Dec 2023 01:38:00 -0700
Subject: [PATCH 6/6] Bump logr to 1.4.0, fixup github workflow action

---
 .github/workflows/build_and_test.yml | 15 ++++++++++-----
 examples/go.mod                      |  2 +-
 examples/go.sum                      |  4 ++--
 go.mod                               |  2 +-
 go.sum                               |  4 ++--
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index f9d70e3..deef14d 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -64,22 +64,27 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
 
-      - name: Display Go version
+      - name: Display Go version ${{ matrix.go-version }}
         run: go version
 
-      - name: Create workspace
+      - name: Create workspace ${{ matrix.go-version }}
         run: |
           go work init .
           go work use ./examples
           go work use ./otel
 
-      - name: Build
+      - name: Install dependencies ${{ matrix.go-version }}
+        run: |
+          go get -t -u golang.org/x/tools/cmd/cover
+          go mod download
+
+      - name: Build ${{ matrix.go-version }}
         run: go build -v ./... ./otel/... ./examples/...
 
-      - name: Test
+      - name: Test ${{ matrix.go-version }}
         run: go test -v -race -coverprofile=coverage.out -covermode=atomic ./... ./otel/... ./examples/...
 
-      - name: Upload coverage reports to Codecov
+      - name: Upload coverage reports to Codecov ${{ matrix.go-version }}
         uses: codecov/codecov-action@v3
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/examples/go.mod b/examples/go.mod
index bfa4cc4..dcda17e 100644
--- a/examples/go.mod
+++ b/examples/go.mod
@@ -12,7 +12,7 @@ require (
 )
 
 require (
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.4.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	go.opentelemetry.io/otel/metric v1.21.0 // indirect
 	golang.org/x/sys v0.14.0 // indirect
diff --git a/examples/go.sum b/examples/go.sum
index 3764caa..b1ebf63 100644
--- a/examples/go.sum
+++ b/examples/go.sum
@@ -1,8 +1,8 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
-github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.0 h1:wx+BduGRXjIL6VPeeb7DRX+ii7sR/ch8DlRifHR589o=
+github.com/go-logr/logr v1.4.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
diff --git a/go.mod b/go.mod
index 57fbf30..e7e6a52 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,4 @@ module github.com/veqryn/slog-context
 
 go 1.21
 
-require github.com/go-logr/logr v1.3.1-0.20231201162808-6151b2fb393d
+require github.com/go-logr/logr v1.4.0
diff --git a/go.sum b/go.sum
index cd38fdc..ddf2420 100644
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,2 @@
-github.com/go-logr/logr v1.3.1-0.20231201162808-6151b2fb393d h1:T7GLmPib4CwVBWBqKhEh+HB9vpnFbGKMgcXBclVkE7Y=
-github.com/go-logr/logr v1.3.1-0.20231201162808-6151b2fb393d/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.0 h1:wx+BduGRXjIL6VPeeb7DRX+ii7sR/ch8DlRifHR589o=
+github.com/go-logr/logr v1.4.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=