Merge pull request #5 from remychantenay/update-otel

Update OTel to v1.19.0
remychantenay · Oct 16, 2023 · bffcd3a · bffcd3a
2 parents 602d80e + 8bc7943
commit bffcd3a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 43 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,29 +1,5 @@
-issues:
-  exclude-use-default: false
-
 linters:
-  disable-all: true
-  enable:
-  - bodyclose
-  - goconst
-  - godot
-  - godox
-  - gofmt
-  - goimports
-  - revive
-  - gosec
-  - gosimple
-  - govet
-  - ineffassign
-  - misspell
-  - prealloc
-  - staticcheck
-  - stylecheck
-  - typecheck
-  - unconvert
-  - unparam
-  - unused
-  - whitespace
+  disable-all: false
 
 linters-settings:
   goimports:

diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@ import (
 
     "go.opentelemetry.io/otel/baggage"
     "go.opentelemetry.io/otel/trace"
+
     sdktrace "go.opentelemetry.io/otel/sdk/trace"
     slogotel "github.com/remychantenay/slog-otel"
 )
@@ -67,7 +68,9 @@ The following initial log:
     "msg": "Hello world!",
     "locale": "en_US",
     "trace_id": "a9938fd7a6313e0f27f3fc87f574bff6",
-    "span_id": "ed58f84d8971bf60"
+    "span_id": "ed58f84d8971bf60",
+    "key_1": "value_1",
+    "key_2": "value_2"
 }
 ```
 

diff --git a/go.mod b/go.mod
@@ -3,14 +3,14 @@ module github.com/remychantenay/slog-otel
 go 1.21
 
 require (
-	go.opentelemetry.io/otel v1.17.0
-	go.opentelemetry.io/otel/sdk v1.17.0
-	go.opentelemetry.io/otel/trace v1.17.0
+	go.opentelemetry.io/otel v1.19.0
+	go.opentelemetry.io/otel/sdk v1.19.0
+	go.opentelemetry.io/otel/trace v1.19.0
 )
 
 require (
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	go.opentelemetry.io/otel/metric v1.17.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
+	go.opentelemetry.io/otel/metric v1.19.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -11,15 +11,15 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM=
-go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0=
-go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc=
-go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o=
-go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE=
-go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ=
-go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ=
-go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
+go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
+go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
+go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
+go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
+go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
+go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
+go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/slog_otel.go b/slog_otel.go
@@ -14,7 +14,7 @@ import (
 )
 
 // OtelHandler is an implementation of slog's Handler interface.
-// Its role is to ensure correlation between logs and spans
+// Its role is to ensure correlation between logs and OTel spans
 // by:
 //
 // 1. Adding otel span and trace IDs to the log record.
@@ -86,7 +86,7 @@ func (h OtelHandler) Handle(ctx context.Context, record slog.Record) error {
 	}
 
 	// Setting span status if the log is an error.
-	// Purposely leaving as Unset (default) otherwise.
+	// Purposely leaving as codes.Unset (default) otherwise.
 	if record.Level >= slog.LevelError {
 		span.SetStatus(codes.Error, record.Message)
 	}