-
Notifications
You must be signed in to change notification settings - Fork 245
Add user details when DefaultPII is enabled #1018
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3ad25b3
add user details when DefaultPII is enabled
giortzisg 03cf984
check for empty user
giortzisg d53811f
check for empty user & scope
giortzisg ccfe213
Merge branch 'master' into user-info-pii
giortzisg 51c45b7
add test for pii set to false
giortzisg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -592,3 +592,122 @@ func TestSentryLogger_DebugLogging(t *testing.T) { | |
| }) | ||
| } | ||
| } | ||
|
|
||
| func Test_sentryLogger_SendDefaultPII(t *testing.T) { | ||
| ctx := context.Background() | ||
| mockTransport := &MockTransport{} | ||
| mockClient, _ := NewClient(ClientOptions{ | ||
| Dsn: testDsn, | ||
| Transport: mockTransport, | ||
| Release: "v1.2.3", | ||
| Environment: "testing", | ||
| ServerName: "test-server", | ||
| EnableLogs: true, | ||
| EnableTracing: true, | ||
| SendDefaultPII: true, | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should also have a test that does the reverse.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
| }) | ||
| mockClient.sdkIdentifier = "sentry.go" | ||
| mockClient.sdkVersion = "0.10.0" | ||
| hub := CurrentHub() | ||
| hub.BindClient(mockClient) | ||
| hub.Scope().propagationContext.TraceID = TraceIDFromHex(LogTraceID) | ||
|
|
||
| hub.Scope().SetUser(User{ | ||
| ID: "user123", | ||
| Name: "Test User", | ||
| Email: "test@example.com", | ||
| }) | ||
|
|
||
| ctx = SetHubOnContext(ctx, hub) | ||
|
|
||
| l := NewLogger(ctx) | ||
| l.Info(ctx, "test message with PII") | ||
| Flush(20 * time.Millisecond) | ||
|
|
||
| events := mockTransport.Events() | ||
| if len(events) != 1 { | ||
| t.Fatalf("expected 1 event, got %d", len(events)) | ||
| } | ||
|
|
||
| logs := events[0].Logs | ||
| if len(logs) != 1 { | ||
| t.Fatalf("expected 1 log, got %d", len(logs)) | ||
| } | ||
|
|
||
| log := logs[0] | ||
| attrs := log.Attributes | ||
|
|
||
| if val, ok := attrs["user.id"]; !ok { | ||
| t.Error("missing user.id attribute") | ||
| } else if val.Value != "user123" { | ||
| t.Errorf("unexpected user.id: got %v, want %v", val.Value, "user123") | ||
| } | ||
|
|
||
| if val, ok := attrs["user.name"]; !ok { | ||
| t.Error("missing user.name attribute") | ||
| } else if val.Value != "Test User" { | ||
| t.Errorf("unexpected user.name: got %v, want %v", val.Value, "Test User") | ||
| } | ||
|
|
||
| if val, ok := attrs["user.email"]; !ok { | ||
| t.Error("missing user.email attribute") | ||
| } else if val.Value != "test@example.com" { | ||
| t.Errorf("unexpected user.email: got %v, want %v", val.Value, "test@example.com") | ||
| } | ||
| } | ||
|
|
||
| func Test_sentryLogger_NoUserInfoWithSendDefaultPII_False(t *testing.T) { | ||
| ctx := context.Background() | ||
| mockTransport := &MockTransport{} | ||
| mockClient, _ := NewClient(ClientOptions{ | ||
| Dsn: testDsn, | ||
| Transport: mockTransport, | ||
| Release: "v1.2.3", | ||
| Environment: "testing", | ||
| ServerName: "test-server", | ||
| EnableLogs: true, | ||
| EnableTracing: true, | ||
| }) | ||
| mockClient.sdkIdentifier = "sentry.go" | ||
| mockClient.sdkVersion = "0.10.0" | ||
| hub := CurrentHub() | ||
| hub.BindClient(mockClient) | ||
| hub.Scope().propagationContext.TraceID = TraceIDFromHex(LogTraceID) | ||
|
|
||
| hub.Scope().SetUser(User{ | ||
| ID: "user123", | ||
| Name: "Test User", | ||
| Email: "test@example.com", | ||
| }) | ||
|
|
||
| ctx = SetHubOnContext(ctx, hub) | ||
|
|
||
| l := NewLogger(ctx) | ||
| l.Info(ctx, "test message with PII") | ||
| Flush(20 * time.Millisecond) | ||
|
|
||
| events := mockTransport.Events() | ||
| if len(events) != 1 { | ||
| t.Fatalf("expected 1 event, got %d", len(events)) | ||
| } | ||
|
|
||
| logs := events[0].Logs | ||
| if len(logs) != 1 { | ||
| t.Fatalf("expected 1 log, got %d", len(logs)) | ||
| } | ||
|
|
||
| log := logs[0] | ||
| attrs := log.Attributes | ||
|
|
||
| if _, ok := attrs["user.id"]; ok { | ||
| t.Error("unexpected user.id attribute") | ||
| } | ||
|
|
||
| if _, ok := attrs["user.name"]; ok { | ||
| t.Error("unexpected user.name attribute") | ||
| } | ||
|
|
||
| if _, ok := attrs["user.email"]; ok { | ||
| t.Error("unexpected user.email attribute") | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.