diff --git a/interfaces.go b/interfaces.go index 806c7785d..5d5332ab7 100644 --- a/interfaces.go +++ b/interfaces.go @@ -107,17 +107,12 @@ type Attachment struct { // User describes the user associated with an Event. If this is used, at least // an ID or an IP address should be provided. type User struct { - ID string `json:"id,omitempty"` - Email string `json:"email,omitempty"` - IPAddress string `json:"ip_address,omitempty"` - Username string `json:"username,omitempty"` - Name string `json:"name,omitempty"` - // Segment is a string representing the user segment that the user belongs to. - // - // Deprecated: Segment is deprecated and will be removed in the next major - // of the Sentry Go SDK. - Segment string `json:"segment,omitempty"` - Data map[string]string `json:"data,omitempty"` + ID string `json:"id,omitempty"` + Email string `json:"email,omitempty"` + IPAddress string `json:"ip_address,omitempty"` + Username string `json:"username,omitempty"` + Name string `json:"name,omitempty"` + Data map[string]string `json:"data,omitempty"` } func (u User) IsEmpty() bool { diff --git a/interfaces_test.go b/interfaces_test.go index 8d4c8b6e1..84e30d9da 100644 --- a/interfaces_test.go +++ b/interfaces_test.go @@ -52,7 +52,6 @@ func TestUserMarshalJson(t *testing.T) { {input: User{IPAddress: "127.0.0.1"}, want: `{"ip_address":"127.0.0.1"}`}, {input: User{Username: "My Username"}, want: `{"username":"My Username"}`}, {input: User{Name: "My Name"}, want: `{"name":"My Name"}`}, - {input: User{Segment: "My Segment"}, want: `{"segment":"My Segment"}`}, {input: User{Data: map[string]string{"foo": "bar"}}, want: `{"data":{"foo":"bar"}}`}, } diff --git a/slog/converter.go b/slog/converter.go index 0e2fcd3e3..10eb90006 100644 --- a/slog/converter.go +++ b/slog/converter.go @@ -102,10 +102,6 @@ func handleUserAttributes(v slog.Value, event *sentry.Event) { event.User.Name = name delete(data, "name") } - if segment, ok := data["segment"]; ok { - event.User.Segment = segment - delete(data, "segment") - } event.User.Data = data } diff --git a/slog/converter_test.go b/slog/converter_test.go index 746ac714c..e664f26b1 100644 --- a/slog/converter_test.go +++ b/slog/converter_test.go @@ -99,7 +99,6 @@ func TestAttrToSentryEvent(t *testing.T) { slog.Attr{Key: "email", Value: slog.StringValue("user_email")}, slog.Attr{Key: "ip_address", Value: slog.StringValue("user_ip_address")}, slog.Attr{Key: "username", Value: slog.StringValue("user_username")}, - slog.Attr{Key: "segment", Value: slog.StringValue("user_segment")}, slog.Attr{Key: "name", Value: slog.StringValue("user_name")}, )}, expected: &sentry.Event{