Merge pull request #54 from khasanovbi/drop_extra

Drop extra

Author: TheZeroSlave

.github/workflows/go.yml

@@ -14,12 +14,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v6
       with:
-        go-version: '1.20'
+        go-version: '1.25'
 
     - name: Test
       run: go test -v ./...

core.go

@@ -125,7 +125,7 @@ func (c *core) Write(ent zapcore.Entry, fs []zapcore.Field) error {
 		event.Message = ent.Message
 		event.Timestamp = ent.Time
 		event.Level = sentrySeverity(ent.Level)
-		event.Extra = clone.fields
+		event.Contexts["Extra"] = clone.fields
 		event.Tags = make(map[string]string, tagsCount)
 		for k, v := range c.cfg.Tags {
 			event.Tags[k] = v

example_logger_test.go

@@ -1,6 +1,7 @@
 package zapsentry_test
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"time"
@@ -54,7 +55,7 @@ func ExampleAttachCoreToLogger() {
 	// Check output
 	fmt.Println(recordedLogs.All()[0].Message)
 	fmt.Println(recordedSentryEvent.Message)
-	fmt.Println(recordedSentryEvent.Extra)
+	fmt.Println(recordedSentryEvent.Contexts["Extra"])
 	fmt.Println(recordedSentryEvent.Tags)
 	// Output: [error] something went wrong!
 	// [error] something went wrong!
@@ -78,6 +79,10 @@ type transport struct {
 // for at most the given timeout. It returns false if the timeout was reached.
 func (f *transport) Flush(_ time.Duration) bool { return true }
 
+// FlushWithContext waits until any buffered events are sent to the Sentry server,
+// blocking for at most the given context's deadline.
+func (f *transport) FlushWithContext(_ context.Context) bool { return true }
+
 // Configure is called by the Client itself, providing it it's own ClientOptions.
 func (f *transport) Configure(_ sentry.ClientOptions) {}
 
@@ -86,3 +91,6 @@ func (f *transport) Configure(_ sentry.ClientOptions) {}
 func (f *transport) SendEvent(event *sentry.Event) {
 	f.MockSendEvent(event)
 }
+
+// Close releases any resources held by the transport.
+func (f *transport) Close() {}

go.mod

@@ -1,15 +1,14 @@
 module github.com/TheZeroSlave/zapsentry
 
-go 1.17
+go 1.25.0
 
 require (
-	github.com/getsentry/sentry-go v0.27.0
-	go.uber.org/zap v1.24.0
+	github.com/getsentry/sentry-go v0.46.0
+	go.uber.org/zap v1.27.1
 )
 
 require (
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/sys v0.43.0 // indirect
+	golang.org/x/text v0.36.0 // indirect
 )