Skip to content

feat(core): Don't gate user on logs with sendDefaultPii #16527

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.

Sign up for GitHub

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 5 commits into from
Jun 16, 2025
Merged

feat(core): Don't gate user on logs with sendDefaultPii #16527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bacaf69
feat(core): Don't gate user on logs with `sendDefaultPii`
AbhiPrasad Jun 9, 2025
432f7e8
Merge branch 'develop' into abhi-send-default-pii-user
AbhiPrasad Jun 10, 2025
14cfba4
Merge branch 'develop' into abhi-send-default-pii-user
AbhiPrasad Jun 10, 2025
e47b750
Merge branch 'develop' into abhi-send-default-pii-user
AbhiPrasad Jun 11, 2025
9d564a0
fix tests
AbhiPrasad Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions packages/core/src/logs/exports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,12 @@ export function _INTERNAL_captureLog(
...beforeLog.attributes,
};

const { user } = getMergedScopeData(currentScope);
// Only attach user to log attributes if sendDefaultPii is enabled
if (client.getOptions().sendDefaultPii) {
const { id, email, username } = user;
setLogAttribute(processedLogAttributes, 'user.id', id, false);
setLogAttribute(processedLogAttributes, 'user.email', email, false);
setLogAttribute(processedLogAttributes, 'user.name', username, false);
}
const {
user: { id, email, username },
} = getMergedScopeData(currentScope);
setLogAttribute(processedLogAttributes, 'user.id', id, false);
setLogAttribute(processedLogAttributes, 'user.email', email, false);
setLogAttribute(processedLogAttributes, 'user.name', username, false);

setLogAttribute(processedLogAttributes, 'sentry.release', release);
setLogAttribute(processedLogAttributes, 'sentry.environment', environment);
Expand Down
23 changes: 1 addition & 22 deletions packages/core/test/lib/logs/exports.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,11 +377,10 @@ describe('_INTERNAL_captureLog', () => {
});

describe('user functionality', () => {
it('includes user data in log attributes when sendDefaultPii is enabled', () => {
it('includes user data in log attributes', () => {
const options = getDefaultTestClientOptions({
dsn: PUBLIC_DSN,
_experiments: { enableLogs: true },
sendDefaultPii: true,
});
const client = new TestClient(options);
const scope = new Scope();
Expand Down Expand Up @@ -410,26 +409,6 @@ describe('_INTERNAL_captureLog', () => {
});
});

it('does not include user data in log attributes when sendDefaultPii is disabled', () => {
const options = getDefaultTestClientOptions({
dsn: PUBLIC_DSN,
_experiments: { enableLogs: true },
sendDefaultPii: false,
});
const client = new TestClient(options);
const scope = new Scope();
scope.setUser({
id: '123',
email: 'user@example.com',
username: 'testuser',
});

_INTERNAL_captureLog({ level: 'info', message: 'test log without user' }, client, scope);

const logAttributes = _INTERNAL_getLogBuffer(client)?.[0]?.attributes;
expect(logAttributes).toEqual({});
});

it('includes partial user data when only some fields are available', () => {
const options = getDefaultTestClientOptions({
dsn: PUBLIC_DSN,
Expand Down
Loading