Only send userid in baggage if sendDefaultPii is true#2145

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

Closed
adinauer wants to merge 11 commits into from
Closed

Only send userid in baggage if sendDefaultPii is true#2145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0163e53
Add sample rate from traces sampler to DSC
adinauer Jun 28, 2022
59d32d8
Do not replace null with true/false
adinauer Jun 28, 2022
2f95fd1
Restore sample rate in OutboxSender
adinauer Jun 29, 2022
eaf947e
Remove fallback for sampling decision from TraceContext
adinauer Jun 29, 2022
0f9bbda
Remove sample rate fallback from TracesSamplingDecision
adinauer Jun 29, 2022
755b63f
Test more envelope header trace fields for OutboxSender
adinauer Jun 29, 2022
a8a8479
Skip sending userId in baggage if send default pii is off
adinauer Jun 29, 2022
63d71ad
Add changelog
adinauer Jun 29, 2022
87f91f8
CR changes
adinauer Jun 30, 2022
a0a0720
Merge branch 'feat/traces-sampler-into-sample-rate' into feat/skip-us…
adinauer Jun 30, 2022
8df67ba
Merge branch 'feat/add-sample-rate-to-baggage' into feat/skip-userid-…
adinauer Jun 30, 2022
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@

## Unreleased

### Fixes

- Only send userid in `baggage` if `sendDefaultPii` is `true` ([#2145](https://github.com/getsentry/sentry-java/pull/2145))

### Features

- New package `sentry-android-navigation` for AndroidX Navigation support ([#2136](https://github.com/getsentry/sentry-java/pull/2136))
Expand Down
10 changes: 5 additions & 5 deletions sentry/api/sentry.api
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,10 @@ public final class io/sentry/Attachment {
}

public final class io/sentry/Baggage {
public fun <init> (Lio/sentry/ILogger;)V
public fun <init> (Ljava/util/Map;Lio/sentry/ILogger;)V
public static fun fromHeader (Ljava/lang/String;Lio/sentry/ILogger;)Lio/sentry/Baggage;
public static fun fromHeader (Ljava/util/List;Lio/sentry/ILogger;)Lio/sentry/Baggage;
public fun <init> (Lio/sentry/SentryOptions;)V
public fun <init> (Ljava/util/Map;Lio/sentry/SentryOptions;)V
public static fun fromHeader (Ljava/lang/String;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
public static fun fromHeader (Ljava/util/List;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
public fun get (Ljava/lang/String;)Ljava/lang/String;
public fun set (Ljava/lang/String;Ljava/lang/String;)V
public fun setEnvironment (Ljava/lang/String;)V
Expand DownExpand Up@@ -1634,7 +1634,7 @@ public final class io/sentry/TraceContext : io/sentry/JsonSerializable, io/sentr
public fun getUserSegment ()Ljava/lang/String;
public fun serialize (Lio/sentry/JsonObjectWriter;Lio/sentry/ILogger;)V
public fun setUnknown (Ljava/util/Map;)V
public fun toBaggage (Lio/sentry/ILogger;)Lio/sentry/Baggage;
public fun toBaggage (Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
}

public final class io/sentry/TraceContext$Deserializer : io/sentry/JsonDeserializer {
Expand Down
88 changes: 54 additions & 34 deletions sentry/src/main/java/io/sentry/Baggage.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,31 +20,31 @@ public final class Baggage {
static final @NotNull Integer MAX_BAGGAGE_LIST_MEMBER_COUNT = 64;

final @NotNull Map<String, String> keyValues;
final @NotNull ILogger logger;
final @NotNull SentryOptions options;

public static Baggage fromHeader(
final @Nullable List<String> headerValues, final @NotNull ILogger logger) {
final @Nullable List<String> headerValues, final @NotNull SentryOptions options) {
final Map<String, String> keyValues = new HashMap<>();

if (headerValues != null) {
for (final @Nullable String headerValue : headerValues) {
final Map<String, String> keyValuesToAdd =
extractKeyValuesFromBaggageString(headerValue, logger);
extractKeyValuesFromBaggageString(headerValue, options);
keyValues.putAll(keyValuesToAdd);
}
}

return new Baggage(keyValues, logger);
return new Baggage(keyValues, options);
}

public static Baggage fromHeader(
final @Nullable String headerValue, final @NotNull ILogger logger) {
final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, logger);
return new Baggage(keyValues, logger);
final @Nullable String headerValue, final @NotNull SentryOptions options) {
final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, options);
return new Baggage(keyValues, options);
}

private static Map<String, String> extractKeyValuesFromBaggageString(
final @Nullable String headerValue, final @NotNull ILogger logger) {
final @Nullable String headerValue, final @NotNull SentryOptions options) {
final @NotNull Map<String, String> keyValues = new HashMap<>();

if (headerValue != null) {
Expand All@@ -62,28 +62,40 @@ private static Map<String, String> extractKeyValuesFromBaggageString(

keyValues.put(keyDecoded, valueDecoded);
} else {
logger.log(
SentryLevel.ERROR, "Unable to decode baggage key value pair %s", keyValueString);
options
.getLogger()
.log(
SentryLevel.ERROR,
"Unable to decode baggage key value pair %s",
keyValueString);
}
} catch (Throwable e) {
logger.log(
SentryLevel.ERROR, e, "Unable to decode baggage key value pair %s", keyValueString);
options
.getLogger()
.log(
SentryLevel.ERROR,
e,
"Unable to decode baggage key value pair %s",
keyValueString);
}
}
} catch (Throwable e) {
logger.log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
options
.getLogger()
.log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
}
}
return keyValues;
}

public Baggage(final @NotNull ILogger logger) {
this(new HashMap<>(), logger);
public Baggage(final @NotNull SentryOptions options) {
this(new HashMap<>(), options);
}

public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILogger logger) {
public Baggage(
final @NotNull Map<String, String> keyValues, final @NotNull SentryOptions options) {
this.keyValues = keyValues;
this.logger = logger;
this.options = options;
}

public @NotNull String toHeaderString() {
Expand All@@ -97,11 +109,13 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog

if (value != null) {
if (listMemberCount >= MAX_BAGGAGE_LIST_MEMBER_COUNT) {
logger.log(
SentryLevel.ERROR,
"Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
key,
MAX_BAGGAGE_LIST_MEMBER_COUNT);
options
.getLogger()
.log(
SentryLevel.ERROR,
"Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
key,
MAX_BAGGAGE_LIST_MEMBER_COUNT);
} else {
try {
final String encodedKey = encode(key);
Expand All@@ -111,23 +125,27 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog
final int valueLength = encodedKeyValue.length();
final int totalLengthIfValueAdded = sb.length() + valueLength;
if (totalLengthIfValueAdded > MAX_BAGGAGE_STRING_LENGTH) {
logger.log(
SentryLevel.ERROR,
"Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
key,
MAX_BAGGAGE_STRING_LENGTH);
options
.getLogger()
.log(
SentryLevel.ERROR,
"Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
key,
MAX_BAGGAGE_STRING_LENGTH);
} else {
listMemberCount++;
sb.append(encodedKeyValue);
separator = ",";
}
} catch (Throwable e) {
logger.log(
SentryLevel.ERROR,
e,
"Unable to encode baggage key value pair (key=%s,value=%s).",
key,
value);
options
.getLogger()
.log(
SentryLevel.ERROR,
e,
"Unable to encode baggage key value pair (key=%s,value=%s).",
key,
value);
}
}
}
Expand DownExpand Up@@ -169,7 +187,9 @@ public void setRelease(final @Nullable String release) {
}

public void setUserId(final @Nullable String userId) {
set("sentry-user_id", userId);
if (options.isSendDefaultPii()) {
set("sentry-user_id", userId);
}
}

public void setUserSegment(final @Nullable String userSegment) {
Expand Down
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/SentryTracer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -382,7 +382,7 @@ public void finish(@Nullable SpanStatus status) {
public @Nullable BaggageHeader toBaggageHeader() {
final TraceContext traceContext = traceContext();
if (hub.getOptions().isTraceSampling() && traceContext != null) {
final Baggage baggage = traceContext.toBaggage(hub.getOptions().getLogger());
final Baggage baggage = traceContext.toBaggage(hub.getOptions());
return new BaggageHeader(baggage);
} else {
return null;
Expand Down
4 changes: 2 additions & 2 deletions sentry/src/main/java/io/sentry/TraceContext.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,8 @@ public final class TraceContext implements JsonUnknown, JsonSerializable {
return sampleRate;
}

public @NotNull Baggage toBaggage(@NotNull ILogger logger) {
Baggage baggage = new Baggage(logger);
public @NotNull Baggage toBaggage(@NotNull SentryOptions options) {
Baggage baggage = new Baggage(options);

baggage.setTraceId(traceId.toString());
baggage.setPublicKey(publicKey);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Only send userid in baggage if sendDefaultPii is true#2145

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

 Closed

adinauer
wants to merge
11
commits into

from

 Closed


Only send userid in baggage if sendDefaultPii is true#2145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
0163e53

Add sample rate from traces sampler to DSC


adinauer Jun 28, 2022
59d32d8

Do not replace null with true/false


adinauer Jun 28, 2022
2f95fd1

Restore sample rate in OutboxSender


adinauer Jun 29, 2022
eaf947e

Remove fallback for sampling decision from TraceContext


adinauer Jun 29, 2022
0f9bbda

Remove sample rate fallback from TracesSamplingDecision


adinauer Jun 29, 2022
755b63f

Test more envelope header trace fields for OutboxSender


adinauer Jun 29, 2022
a8a8479

Skip sending userId in baggage if send default pii is off


adinauer Jun 29, 2022
63d71ad

Add changelog


adinauer Jun 29, 2022
87f91f8

CR changes


adinauer Jun 30, 2022
a0a0720

Merge branch 'feat/traces-sampler-into-sample-rate' into feat/skip-us…


adinauer Jun 30, 2022
8df67ba

Merge branch 'feat/add-sample-rate-to-baggage' into feat/skip-userid-…


adinauer Jun 30, 2022

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


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@

## Unreleased

### Fixes

- Only send userid in `baggage` if `sendDefaultPii` is `true` ([#2145](https://github.com/getsentry/sentry-java/pull/2145))

### Features

- New package `sentry-android-navigation` for AndroidX Navigation support ([#2136](https://github.com/getsentry/sentry-java/pull/2136))
Expand Down

10 changes: 5 additions & 5 deletions
sentry/api/sentry.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,10 @@ public final class io/sentry/Attachment {
}

public final class io/sentry/Baggage {
	public fun <init> (Lio/sentry/ILogger;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/ILogger;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun <init> (Lio/sentry/SentryOptions;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/SentryOptions;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public fun get (Ljava/lang/String;)Ljava/lang/String;
	public fun set (Ljava/lang/String;Ljava/lang/String;)V
	public fun setEnvironment (Ljava/lang/String;)V
Expand DownExpand Up@@ -1634,7 +1634,7 @@ public final class io/sentry/TraceContext : io/sentry/JsonSerializable, io/sentr
	public fun getUserSegment ()Ljava/lang/String;
	public fun serialize (Lio/sentry/JsonObjectWriter;Lio/sentry/ILogger;)V
	public fun setUnknown (Ljava/util/Map;)V
	public fun toBaggage (Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun toBaggage (Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
}

public final class io/sentry/TraceContext$Deserializer : io/sentry/JsonDeserializer {
Expand Down

88 changes: 54 additions & 34 deletions
sentry/src/main/java/io/sentry/Baggage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,31 +20,31 @@ public final class Baggage {
 static final @NotNull Integer MAX_BAGGAGE_LIST_MEMBER_COUNT = 64;

 final @NotNull Map<String, String> keyValues;
 final @NotNull ILogger logger;
 final @NotNull SentryOptions options;

 public static Baggage fromHeader(
 final @Nullable List<String> headerValues, final @NotNull ILogger logger) {
 final @Nullable List<String> headerValues, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = new HashMap<>();

 if (headerValues != null) {
 for (final @Nullable String headerValue : headerValues) {
 final Map<String, String> keyValuesToAdd =
 extractKeyValuesFromBaggageString(headerValue, logger);
 extractKeyValuesFromBaggageString(headerValue, options);
 keyValues.putAll(keyValuesToAdd);
 }
 }

 return new Baggage(keyValues, logger);
 return new Baggage(keyValues, options);
 }

 public static Baggage fromHeader(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, logger);
 return new Baggage(keyValues, logger);
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, options);
 return new Baggage(keyValues, options);
 }

 private static Map<String, String> extractKeyValuesFromBaggageString(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final @NotNull Map<String, String> keyValues = new HashMap<>();

 if (headerValue != null) {
Expand All@@ -62,28 +62,40 @@ private static Map<String, String> extractKeyValuesFromBaggageString(

 keyValues.put(keyDecoded, valueDecoded);
 } else {
 logger.log(
 SentryLevel.ERROR, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR, e, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 }
 } catch (Throwable e) {
 logger.log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 options
 .getLogger()
 .log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 }
 }
 return keyValues;
 }

 public Baggage(final @NotNull ILogger logger) {
 this(new HashMap<>(), logger);
 public Baggage(final @NotNull SentryOptions options) {
 this(new HashMap<>(), options);
 }

 public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILogger logger) {
 public Baggage(
 final @NotNull Map<String, String> keyValues, final @NotNull SentryOptions options) {
 this.keyValues = keyValues;
 this.logger = logger;
 this.options = options;
 }

 public @NotNull String toHeaderString() {
Expand All@@ -97,11 +109,13 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog

 if (value != null) {
 if (listMemberCount >= MAX_BAGGAGE_LIST_MEMBER_COUNT) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 } else {
 try {
 final String encodedKey = encode(key);
Expand All@@ -111,23 +125,27 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog
 final int valueLength = encodedKeyValue.length();
 final int totalLengthIfValueAdded = sb.length() + valueLength;
 if (totalLengthIfValueAdded > MAX_BAGGAGE_STRING_LENGTH) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 } else {
 listMemberCount++;
 sb.append(encodedKeyValue);
 separator = ",";
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 }
 }
 }
Expand DownExpand Up@@ -169,7 +187,9 @@ public void setRelease(final @Nullable String release) {
 }

 public void setUserId(final @Nullable String userId) {
 set("sentry-user_id", userId);
 if (options.isSendDefaultPii()) {
 set("sentry-user_id", userId);
 }
 }

 public void setUserSegment(final @Nullable String userSegment) {
Expand Down

2 changes: 1 addition & 1 deletion
sentry/src/main/java/io/sentry/SentryTracer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,7 +382,7 @@ public void finish(@Nullable SpanStatus status) {
 public @Nullable BaggageHeader toBaggageHeader() {
 final TraceContext traceContext = traceContext();
 if (hub.getOptions().isTraceSampling() && traceContext != null) {
 final Baggage baggage = traceContext.toBaggage(hub.getOptions().getLogger());
 final Baggage baggage = traceContext.toBaggage(hub.getOptions());
 return new BaggageHeader(baggage);
 } else {
 return null;
Expand Down

4 changes: 2 additions & 2 deletions
sentry/src/main/java/io/sentry/TraceContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,8 @@ public final class TraceContext implements JsonUnknown, JsonSerializable {
 return sampleRate;
 }

 public @NotNull Baggage toBaggage(@NotNull ILogger logger) {
 Baggage baggage = new Baggage(logger);
 public @NotNull Baggage toBaggage(@NotNull SentryOptions options) {
 Baggage baggage = new Baggage(options);

 baggage.setTraceId(traceId.toString());
 baggage.setPublicKey(publicKey);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Only send userid in baggage if sendDefaultPii is true#2145

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

 Closed

adinauer
wants to merge
11
commits into

from

 Closed


Only send userid in baggage if sendDefaultPii is true#2145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
0163e53

Add sample rate from traces sampler to DSC


adinauer Jun 28, 2022
59d32d8

Do not replace null with true/false


adinauer Jun 28, 2022
2f95fd1

Restore sample rate in OutboxSender


adinauer Jun 29, 2022
eaf947e

Remove fallback for sampling decision from TraceContext


adinauer Jun 29, 2022
0f9bbda

Remove sample rate fallback from TracesSamplingDecision


adinauer Jun 29, 2022
755b63f

Test more envelope header trace fields for OutboxSender


adinauer Jun 29, 2022
a8a8479

Skip sending userId in baggage if send default pii is off


adinauer Jun 29, 2022
63d71ad

Add changelog


adinauer Jun 29, 2022
87f91f8

CR changes


adinauer Jun 30, 2022
a0a0720

Merge branch 'feat/traces-sampler-into-sample-rate' into feat/skip-us…


adinauer Jun 30, 2022
8df67ba

Merge branch 'feat/add-sample-rate-to-baggage' into feat/skip-userid-…


adinauer Jun 30, 2022

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


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@

## Unreleased

### Fixes

- Only send userid in `baggage` if `sendDefaultPii` is `true` ([#2145](https://github.com/getsentry/sentry-java/pull/2145))

### Features

- New package `sentry-android-navigation` for AndroidX Navigation support ([#2136](https://github.com/getsentry/sentry-java/pull/2136))
Expand Down

10 changes: 5 additions & 5 deletions
sentry/api/sentry.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,10 @@ public final class io/sentry/Attachment {
}

public final class io/sentry/Baggage {
	public fun <init> (Lio/sentry/ILogger;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/ILogger;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun <init> (Lio/sentry/SentryOptions;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/SentryOptions;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public fun get (Ljava/lang/String;)Ljava/lang/String;
	public fun set (Ljava/lang/String;Ljava/lang/String;)V
	public fun setEnvironment (Ljava/lang/String;)V
Expand DownExpand Up@@ -1634,7 +1634,7 @@ public final class io/sentry/TraceContext : io/sentry/JsonSerializable, io/sentr
	public fun getUserSegment ()Ljava/lang/String;
	public fun serialize (Lio/sentry/JsonObjectWriter;Lio/sentry/ILogger;)V
	public fun setUnknown (Ljava/util/Map;)V
	public fun toBaggage (Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun toBaggage (Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
}

public final class io/sentry/TraceContext$Deserializer : io/sentry/JsonDeserializer {
Expand Down

88 changes: 54 additions & 34 deletions
sentry/src/main/java/io/sentry/Baggage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,31 +20,31 @@ public final class Baggage {
 static final @NotNull Integer MAX_BAGGAGE_LIST_MEMBER_COUNT = 64;

 final @NotNull Map<String, String> keyValues;
 final @NotNull ILogger logger;
 final @NotNull SentryOptions options;

 public static Baggage fromHeader(
 final @Nullable List<String> headerValues, final @NotNull ILogger logger) {
 final @Nullable List<String> headerValues, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = new HashMap<>();

 if (headerValues != null) {
 for (final @Nullable String headerValue : headerValues) {
 final Map<String, String> keyValuesToAdd =
 extractKeyValuesFromBaggageString(headerValue, logger);
 extractKeyValuesFromBaggageString(headerValue, options);
 keyValues.putAll(keyValuesToAdd);
 }
 }

 return new Baggage(keyValues, logger);
 return new Baggage(keyValues, options);
 }

 public static Baggage fromHeader(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, logger);
 return new Baggage(keyValues, logger);
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, options);
 return new Baggage(keyValues, options);
 }

 private static Map<String, String> extractKeyValuesFromBaggageString(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final @NotNull Map<String, String> keyValues = new HashMap<>();

 if (headerValue != null) {
Expand All@@ -62,28 +62,40 @@ private static Map<String, String> extractKeyValuesFromBaggageString(

 keyValues.put(keyDecoded, valueDecoded);
 } else {
 logger.log(
 SentryLevel.ERROR, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR, e, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 }
 } catch (Throwable e) {
 logger.log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 options
 .getLogger()
 .log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 }
 }
 return keyValues;
 }

 public Baggage(final @NotNull ILogger logger) {
 this(new HashMap<>(), logger);
 public Baggage(final @NotNull SentryOptions options) {
 this(new HashMap<>(), options);
 }

 public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILogger logger) {
 public Baggage(
 final @NotNull Map<String, String> keyValues, final @NotNull SentryOptions options) {
 this.keyValues = keyValues;
 this.logger = logger;
 this.options = options;
 }

 public @NotNull String toHeaderString() {
Expand All@@ -97,11 +109,13 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog

 if (value != null) {
 if (listMemberCount >= MAX_BAGGAGE_LIST_MEMBER_COUNT) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 } else {
 try {
 final String encodedKey = encode(key);
Expand All@@ -111,23 +125,27 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog
 final int valueLength = encodedKeyValue.length();
 final int totalLengthIfValueAdded = sb.length() + valueLength;
 if (totalLengthIfValueAdded > MAX_BAGGAGE_STRING_LENGTH) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 } else {
 listMemberCount++;
 sb.append(encodedKeyValue);
 separator = ",";
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 }
 }
 }
Expand DownExpand Up@@ -169,7 +187,9 @@ public void setRelease(final @Nullable String release) {
 }

 public void setUserId(final @Nullable String userId) {
 set("sentry-user_id", userId);
 if (options.isSendDefaultPii()) {
 set("sentry-user_id", userId);
 }
 }

 public void setUserSegment(final @Nullable String userSegment) {
Expand Down

2 changes: 1 addition & 1 deletion
sentry/src/main/java/io/sentry/SentryTracer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,7 +382,7 @@ public void finish(@Nullable SpanStatus status) {
 public @Nullable BaggageHeader toBaggageHeader() {
 final TraceContext traceContext = traceContext();
 if (hub.getOptions().isTraceSampling() && traceContext != null) {
 final Baggage baggage = traceContext.toBaggage(hub.getOptions().getLogger());
 final Baggage baggage = traceContext.toBaggage(hub.getOptions());
 return new BaggageHeader(baggage);
 } else {
 return null;
Expand Down

4 changes: 2 additions & 2 deletions
sentry/src/main/java/io/sentry/TraceContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,8 @@ public final class TraceContext implements JsonUnknown, JsonSerializable {
 return sampleRate;
 }

 public @NotNull Baggage toBaggage(@NotNull ILogger logger) {
 Baggage baggage = new Baggage(logger);
 public @NotNull Baggage toBaggage(@NotNull SentryOptions options) {
 Baggage baggage = new Baggage(options);

 baggage.setTraceId(traceId.toString());
 baggage.setPublicKey(publicKey);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Only send userid in baggage if sendDefaultPii is true#2145

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

 Closed

adinauer
wants to merge
11
commits into

from

 Closed


Only send userid in baggage if sendDefaultPii is true#2145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
0163e53

Add sample rate from traces sampler to DSC


adinauer Jun 28, 2022
59d32d8

Do not replace null with true/false


adinauer Jun 28, 2022
2f95fd1

Restore sample rate in OutboxSender


adinauer Jun 29, 2022
eaf947e

Remove fallback for sampling decision from TraceContext


adinauer Jun 29, 2022
0f9bbda

Remove sample rate fallback from TracesSamplingDecision


adinauer Jun 29, 2022
755b63f

Test more envelope header trace fields for OutboxSender


adinauer Jun 29, 2022
a8a8479

Skip sending userId in baggage if send default pii is off


adinauer Jun 29, 2022
63d71ad

Add changelog


adinauer Jun 29, 2022
87f91f8

CR changes


adinauer Jun 30, 2022
a0a0720

Merge branch 'feat/traces-sampler-into-sample-rate' into feat/skip-us…


adinauer Jun 30, 2022
8df67ba

Merge branch 'feat/add-sample-rate-to-baggage' into feat/skip-userid-…


adinauer Jun 30, 2022

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


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@

## Unreleased

### Fixes

- Only send userid in `baggage` if `sendDefaultPii` is `true` ([#2145](https://github.com/getsentry/sentry-java/pull/2145))

### Features

- New package `sentry-android-navigation` for AndroidX Navigation support ([#2136](https://github.com/getsentry/sentry-java/pull/2136))
Expand Down

10 changes: 5 additions & 5 deletions
sentry/api/sentry.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,10 @@ public final class io/sentry/Attachment {
}

public final class io/sentry/Baggage {
	public fun <init> (Lio/sentry/ILogger;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/ILogger;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun <init> (Lio/sentry/SentryOptions;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/SentryOptions;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public fun get (Ljava/lang/String;)Ljava/lang/String;
	public fun set (Ljava/lang/String;Ljava/lang/String;)V
	public fun setEnvironment (Ljava/lang/String;)V
Expand DownExpand Up@@ -1634,7 +1634,7 @@ public final class io/sentry/TraceContext : io/sentry/JsonSerializable, io/sentr
	public fun getUserSegment ()Ljava/lang/String;
	public fun serialize (Lio/sentry/JsonObjectWriter;Lio/sentry/ILogger;)V
	public fun setUnknown (Ljava/util/Map;)V
	public fun toBaggage (Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun toBaggage (Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
}

public final class io/sentry/TraceContext$Deserializer : io/sentry/JsonDeserializer {
Expand Down

88 changes: 54 additions & 34 deletions
sentry/src/main/java/io/sentry/Baggage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,31 +20,31 @@ public final class Baggage {
 static final @NotNull Integer MAX_BAGGAGE_LIST_MEMBER_COUNT = 64;

 final @NotNull Map<String, String> keyValues;
 final @NotNull ILogger logger;
 final @NotNull SentryOptions options;

 public static Baggage fromHeader(
 final @Nullable List<String> headerValues, final @NotNull ILogger logger) {
 final @Nullable List<String> headerValues, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = new HashMap<>();

 if (headerValues != null) {
 for (final @Nullable String headerValue : headerValues) {
 final Map<String, String> keyValuesToAdd =
 extractKeyValuesFromBaggageString(headerValue, logger);
 extractKeyValuesFromBaggageString(headerValue, options);
 keyValues.putAll(keyValuesToAdd);
 }
 }

 return new Baggage(keyValues, logger);
 return new Baggage(keyValues, options);
 }

 public static Baggage fromHeader(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, logger);
 return new Baggage(keyValues, logger);
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, options);
 return new Baggage(keyValues, options);
 }

 private static Map<String, String> extractKeyValuesFromBaggageString(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final @NotNull Map<String, String> keyValues = new HashMap<>();

 if (headerValue != null) {
Expand All@@ -62,28 +62,40 @@ private static Map<String, String> extractKeyValuesFromBaggageString(

 keyValues.put(keyDecoded, valueDecoded);
 } else {
 logger.log(
 SentryLevel.ERROR, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR, e, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 }
 } catch (Throwable e) {
 logger.log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 options
 .getLogger()
 .log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 }
 }
 return keyValues;
 }

 public Baggage(final @NotNull ILogger logger) {
 this(new HashMap<>(), logger);
 public Baggage(final @NotNull SentryOptions options) {
 this(new HashMap<>(), options);
 }

 public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILogger logger) {
 public Baggage(
 final @NotNull Map<String, String> keyValues, final @NotNull SentryOptions options) {
 this.keyValues = keyValues;
 this.logger = logger;
 this.options = options;
 }

 public @NotNull String toHeaderString() {
Expand All@@ -97,11 +109,13 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog

 if (value != null) {
 if (listMemberCount >= MAX_BAGGAGE_LIST_MEMBER_COUNT) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 } else {
 try {
 final String encodedKey = encode(key);
Expand All@@ -111,23 +125,27 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog
 final int valueLength = encodedKeyValue.length();
 final int totalLengthIfValueAdded = sb.length() + valueLength;
 if (totalLengthIfValueAdded > MAX_BAGGAGE_STRING_LENGTH) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 } else {
 listMemberCount++;
 sb.append(encodedKeyValue);
 separator = ",";
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 }
 }
 }
Expand DownExpand Up@@ -169,7 +187,9 @@ public void setRelease(final @Nullable String release) {
 }

 public void setUserId(final @Nullable String userId) {
 set("sentry-user_id", userId);
 if (options.isSendDefaultPii()) {
 set("sentry-user_id", userId);
 }
 }

 public void setUserSegment(final @Nullable String userSegment) {
Expand Down

2 changes: 1 addition & 1 deletion
sentry/src/main/java/io/sentry/SentryTracer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,7 +382,7 @@ public void finish(@Nullable SpanStatus status) {
 public @Nullable BaggageHeader toBaggageHeader() {
 final TraceContext traceContext = traceContext();
 if (hub.getOptions().isTraceSampling() && traceContext != null) {
 final Baggage baggage = traceContext.toBaggage(hub.getOptions().getLogger());
 final Baggage baggage = traceContext.toBaggage(hub.getOptions());
 return new BaggageHeader(baggage);
 } else {
 return null;
Expand Down

4 changes: 2 additions & 2 deletions
sentry/src/main/java/io/sentry/TraceContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,8 @@ public final class TraceContext implements JsonUnknown, JsonSerializable {
 return sampleRate;
 }

 public @NotNull Baggage toBaggage(@NotNull ILogger logger) {
 Baggage baggage = new Baggage(logger);
 public @NotNull Baggage toBaggage(@NotNull SentryOptions options) {
 Baggage baggage = new Baggage(options);

 baggage.setTraceId(traceId.toString());
 baggage.setPublicKey(publicKey);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Only send userid in baggage if sendDefaultPii is true#2145

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

 Closed

adinauer
wants to merge
11
commits into

from

 Closed


Only send userid in baggage if sendDefaultPii is true#2145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
0163e53

Add sample rate from traces sampler to DSC


adinauer Jun 28, 2022
59d32d8

Do not replace null with true/false


adinauer Jun 28, 2022
2f95fd1

Restore sample rate in OutboxSender


adinauer Jun 29, 2022
eaf947e

Remove fallback for sampling decision from TraceContext


adinauer Jun 29, 2022
0f9bbda

Remove sample rate fallback from TracesSamplingDecision


adinauer Jun 29, 2022
755b63f

Test more envelope header trace fields for OutboxSender


adinauer Jun 29, 2022
a8a8479

Skip sending userId in baggage if send default pii is off


adinauer Jun 29, 2022
63d71ad

Add changelog


adinauer Jun 29, 2022
87f91f8

CR changes


adinauer Jun 30, 2022
a0a0720

Merge branch 'feat/traces-sampler-into-sample-rate' into feat/skip-us…


adinauer Jun 30, 2022
8df67ba

Merge branch 'feat/add-sample-rate-to-baggage' into feat/skip-userid-…


adinauer Jun 30, 2022

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


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@

## Unreleased

### Fixes

- Only send userid in `baggage` if `sendDefaultPii` is `true` ([#2145](https://github.com/getsentry/sentry-java/pull/2145))

### Features

- New package `sentry-android-navigation` for AndroidX Navigation support ([#2136](https://github.com/getsentry/sentry-java/pull/2136))
Expand Down

10 changes: 5 additions & 5 deletions
sentry/api/sentry.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,10 @@ public final class io/sentry/Attachment {
}

public final class io/sentry/Baggage {
	public fun <init> (Lio/sentry/ILogger;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/ILogger;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun <init> (Lio/sentry/SentryOptions;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/SentryOptions;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public fun get (Ljava/lang/String;)Ljava/lang/String;
	public fun set (Ljava/lang/String;Ljava/lang/String;)V
	public fun setEnvironment (Ljava/lang/String;)V
Expand DownExpand Up@@ -1634,7 +1634,7 @@ public final class io/sentry/TraceContext : io/sentry/JsonSerializable, io/sentr
	public fun getUserSegment ()Ljava/lang/String;
	public fun serialize (Lio/sentry/JsonObjectWriter;Lio/sentry/ILogger;)V
	public fun setUnknown (Ljava/util/Map;)V
	public fun toBaggage (Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun toBaggage (Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
}

public final class io/sentry/TraceContext$Deserializer : io/sentry/JsonDeserializer {
Expand Down

88 changes: 54 additions & 34 deletions
sentry/src/main/java/io/sentry/Baggage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,31 +20,31 @@ public final class Baggage {
 static final @NotNull Integer MAX_BAGGAGE_LIST_MEMBER_COUNT = 64;

 final @NotNull Map<String, String> keyValues;
 final @NotNull ILogger logger;
 final @NotNull SentryOptions options;

 public static Baggage fromHeader(
 final @Nullable List<String> headerValues, final @NotNull ILogger logger) {
 final @Nullable List<String> headerValues, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = new HashMap<>();

 if (headerValues != null) {
 for (final @Nullable String headerValue : headerValues) {
 final Map<String, String> keyValuesToAdd =
 extractKeyValuesFromBaggageString(headerValue, logger);
 extractKeyValuesFromBaggageString(headerValue, options);
 keyValues.putAll(keyValuesToAdd);
 }
 }

 return new Baggage(keyValues, logger);
 return new Baggage(keyValues, options);
 }

 public static Baggage fromHeader(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, logger);
 return new Baggage(keyValues, logger);
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, options);
 return new Baggage(keyValues, options);
 }

 private static Map<String, String> extractKeyValuesFromBaggageString(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final @NotNull Map<String, String> keyValues = new HashMap<>();

 if (headerValue != null) {
Expand All@@ -62,28 +62,40 @@ private static Map<String, String> extractKeyValuesFromBaggageString(

 keyValues.put(keyDecoded, valueDecoded);
 } else {
 logger.log(
 SentryLevel.ERROR, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR, e, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 }
 } catch (Throwable e) {
 logger.log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 options
 .getLogger()
 .log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 }
 }
 return keyValues;
 }

 public Baggage(final @NotNull ILogger logger) {
 this(new HashMap<>(), logger);
 public Baggage(final @NotNull SentryOptions options) {
 this(new HashMap<>(), options);
 }

 public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILogger logger) {
 public Baggage(
 final @NotNull Map<String, String> keyValues, final @NotNull SentryOptions options) {
 this.keyValues = keyValues;
 this.logger = logger;
 this.options = options;
 }

 public @NotNull String toHeaderString() {
Expand All@@ -97,11 +109,13 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog

 if (value != null) {
 if (listMemberCount >= MAX_BAGGAGE_LIST_MEMBER_COUNT) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 } else {
 try {
 final String encodedKey = encode(key);
Expand All@@ -111,23 +125,27 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog
 final int valueLength = encodedKeyValue.length();
 final int totalLengthIfValueAdded = sb.length() + valueLength;
 if (totalLengthIfValueAdded > MAX_BAGGAGE_STRING_LENGTH) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 } else {
 listMemberCount++;
 sb.append(encodedKeyValue);
 separator = ",";
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 }
 }
 }
Expand DownExpand Up@@ -169,7 +187,9 @@ public void setRelease(final @Nullable String release) {
 }

 public void setUserId(final @Nullable String userId) {
 set("sentry-user_id", userId);
 if (options.isSendDefaultPii()) {
 set("sentry-user_id", userId);
 }
 }

 public void setUserSegment(final @Nullable String userSegment) {
Expand Down

2 changes: 1 addition & 1 deletion
sentry/src/main/java/io/sentry/SentryTracer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,7 +382,7 @@ public void finish(@Nullable SpanStatus status) {
 public @Nullable BaggageHeader toBaggageHeader() {
 final TraceContext traceContext = traceContext();
 if (hub.getOptions().isTraceSampling() && traceContext != null) {
 final Baggage baggage = traceContext.toBaggage(hub.getOptions().getLogger());
 final Baggage baggage = traceContext.toBaggage(hub.getOptions());
 return new BaggageHeader(baggage);
 } else {
 return null;
Expand Down

4 changes: 2 additions & 2 deletions
sentry/src/main/java/io/sentry/TraceContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,8 @@ public final class TraceContext implements JsonUnknown, JsonSerializable {
 return sampleRate;
 }

 public @NotNull Baggage toBaggage(@NotNull ILogger logger) {
 Baggage baggage = new Baggage(logger);
 public @NotNull Baggage toBaggage(@NotNull SentryOptions options) {
 Baggage baggage = new Baggage(options);

 baggage.setTraceId(traceId.toString());
 baggage.setPublicKey(publicKey);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Only send userid in baggage if sendDefaultPii is true#2145

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

 Closed

adinauer
wants to merge
11
commits into

from

 Closed


Only send userid in baggage if sendDefaultPii is true#2145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
0163e53

Add sample rate from traces sampler to DSC


adinauer Jun 28, 2022
59d32d8

Do not replace null with true/false


adinauer Jun 28, 2022
2f95fd1

Restore sample rate in OutboxSender


adinauer Jun 29, 2022
eaf947e

Remove fallback for sampling decision from TraceContext


adinauer Jun 29, 2022
0f9bbda

Remove sample rate fallback from TracesSamplingDecision


adinauer Jun 29, 2022
755b63f

Test more envelope header trace fields for OutboxSender


adinauer Jun 29, 2022
a8a8479

Skip sending userId in baggage if send default pii is off


adinauer Jun 29, 2022
63d71ad

Add changelog


adinauer Jun 29, 2022
87f91f8

CR changes


adinauer Jun 30, 2022
a0a0720

Merge branch 'feat/traces-sampler-into-sample-rate' into feat/skip-us…


adinauer Jun 30, 2022
8df67ba

Merge branch 'feat/add-sample-rate-to-baggage' into feat/skip-userid-…


adinauer Jun 30, 2022

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


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@

## Unreleased

### Fixes

- Only send userid in `baggage` if `sendDefaultPii` is `true` ([#2145](https://github.com/getsentry/sentry-java/pull/2145))

### Features

- New package `sentry-android-navigation` for AndroidX Navigation support ([#2136](https://github.com/getsentry/sentry-java/pull/2136))
Expand Down

10 changes: 5 additions & 5 deletions
sentry/api/sentry.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,10 @@ public final class io/sentry/Attachment {
}

public final class io/sentry/Baggage {
	public fun <init> (Lio/sentry/ILogger;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/ILogger;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun <init> (Lio/sentry/SentryOptions;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/SentryOptions;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public fun get (Ljava/lang/String;)Ljava/lang/String;
	public fun set (Ljava/lang/String;Ljava/lang/String;)V
	public fun setEnvironment (Ljava/lang/String;)V
Expand DownExpand Up@@ -1634,7 +1634,7 @@ public final class io/sentry/TraceContext : io/sentry/JsonSerializable, io/sentr
	public fun getUserSegment ()Ljava/lang/String;
	public fun serialize (Lio/sentry/JsonObjectWriter;Lio/sentry/ILogger;)V
	public fun setUnknown (Ljava/util/Map;)V
	public fun toBaggage (Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun toBaggage (Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
}

public final class io/sentry/TraceContext$Deserializer : io/sentry/JsonDeserializer {
Expand Down

88 changes: 54 additions & 34 deletions
sentry/src/main/java/io/sentry/Baggage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,31 +20,31 @@ public final class Baggage {
 static final @NotNull Integer MAX_BAGGAGE_LIST_MEMBER_COUNT = 64;

 final @NotNull Map<String, String> keyValues;
 final @NotNull ILogger logger;
 final @NotNull SentryOptions options;

 public static Baggage fromHeader(
 final @Nullable List<String> headerValues, final @NotNull ILogger logger) {
 final @Nullable List<String> headerValues, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = new HashMap<>();

 if (headerValues != null) {
 for (final @Nullable String headerValue : headerValues) {
 final Map<String, String> keyValuesToAdd =
 extractKeyValuesFromBaggageString(headerValue, logger);
 extractKeyValuesFromBaggageString(headerValue, options);
 keyValues.putAll(keyValuesToAdd);
 }
 }

 return new Baggage(keyValues, logger);
 return new Baggage(keyValues, options);
 }

 public static Baggage fromHeader(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, logger);
 return new Baggage(keyValues, logger);
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, options);
 return new Baggage(keyValues, options);
 }

 private static Map<String, String> extractKeyValuesFromBaggageString(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final @NotNull Map<String, String> keyValues = new HashMap<>();

 if (headerValue != null) {
Expand All@@ -62,28 +62,40 @@ private static Map<String, String> extractKeyValuesFromBaggageString(

 keyValues.put(keyDecoded, valueDecoded);
 } else {
 logger.log(
 SentryLevel.ERROR, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR, e, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 }
 } catch (Throwable e) {
 logger.log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 options
 .getLogger()
 .log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 }
 }
 return keyValues;
 }

 public Baggage(final @NotNull ILogger logger) {
 this(new HashMap<>(), logger);
 public Baggage(final @NotNull SentryOptions options) {
 this(new HashMap<>(), options);
 }

 public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILogger logger) {
 public Baggage(
 final @NotNull Map<String, String> keyValues, final @NotNull SentryOptions options) {
 this.keyValues = keyValues;
 this.logger = logger;
 this.options = options;
 }

 public @NotNull String toHeaderString() {
Expand All@@ -97,11 +109,13 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog

 if (value != null) {
 if (listMemberCount >= MAX_BAGGAGE_LIST_MEMBER_COUNT) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 } else {
 try {
 final String encodedKey = encode(key);
Expand All@@ -111,23 +125,27 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog
 final int valueLength = encodedKeyValue.length();
 final int totalLengthIfValueAdded = sb.length() + valueLength;
 if (totalLengthIfValueAdded > MAX_BAGGAGE_STRING_LENGTH) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 } else {
 listMemberCount++;
 sb.append(encodedKeyValue);
 separator = ",";
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 }
 }
 }
Expand DownExpand Up@@ -169,7 +187,9 @@ public void setRelease(final @Nullable String release) {
 }

 public void setUserId(final @Nullable String userId) {
 set("sentry-user_id", userId);
 if (options.isSendDefaultPii()) {
 set("sentry-user_id", userId);
 }
 }

 public void setUserSegment(final @Nullable String userSegment) {
Expand Down

2 changes: 1 addition & 1 deletion
sentry/src/main/java/io/sentry/SentryTracer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,7 +382,7 @@ public void finish(@Nullable SpanStatus status) {
 public @Nullable BaggageHeader toBaggageHeader() {
 final TraceContext traceContext = traceContext();
 if (hub.getOptions().isTraceSampling() && traceContext != null) {
 final Baggage baggage = traceContext.toBaggage(hub.getOptions().getLogger());
 final Baggage baggage = traceContext.toBaggage(hub.getOptions());
 return new BaggageHeader(baggage);
 } else {
 return null;
Expand Down

4 changes: 2 additions & 2 deletions
sentry/src/main/java/io/sentry/TraceContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,8 @@ public final class TraceContext implements JsonUnknown, JsonSerializable {
 return sampleRate;
 }

 public @NotNull Baggage toBaggage(@NotNull ILogger logger) {
 Baggage baggage = new Baggage(logger);
 public @NotNull Baggage toBaggage(@NotNull SentryOptions options) {
 Baggage baggage = new Baggage(options);

 baggage.setTraceId(traceId.toString());
 baggage.setPublicKey(publicKey);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Only send userid in baggage if sendDefaultPii is true#2145

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

 Closed

adinauer
wants to merge
11
commits into

from

 Closed


Only send userid in baggage if sendDefaultPii is true#2145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
0163e53

Add sample rate from traces sampler to DSC


adinauer Jun 28, 2022
59d32d8

Do not replace null with true/false


adinauer Jun 28, 2022
2f95fd1

Restore sample rate in OutboxSender


adinauer Jun 29, 2022
eaf947e

Remove fallback for sampling decision from TraceContext


adinauer Jun 29, 2022
0f9bbda

Remove sample rate fallback from TracesSamplingDecision


adinauer Jun 29, 2022
755b63f

Test more envelope header trace fields for OutboxSender


adinauer Jun 29, 2022
a8a8479

Skip sending userId in baggage if send default pii is off


adinauer Jun 29, 2022
63d71ad

Add changelog


adinauer Jun 29, 2022
87f91f8

CR changes


adinauer Jun 30, 2022
a0a0720

Merge branch 'feat/traces-sampler-into-sample-rate' into feat/skip-us…


adinauer Jun 30, 2022
8df67ba

Merge branch 'feat/add-sample-rate-to-baggage' into feat/skip-userid-…


adinauer Jun 30, 2022

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


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@

## Unreleased

### Fixes

- Only send userid in `baggage` if `sendDefaultPii` is `true` ([#2145](https://github.com/getsentry/sentry-java/pull/2145))

### Features

- New package `sentry-android-navigation` for AndroidX Navigation support ([#2136](https://github.com/getsentry/sentry-java/pull/2136))
Expand Down

10 changes: 5 additions & 5 deletions
sentry/api/sentry.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,10 @@ public final class io/sentry/Attachment {
}

public final class io/sentry/Baggage {
	public fun <init> (Lio/sentry/ILogger;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/ILogger;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun <init> (Lio/sentry/SentryOptions;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/SentryOptions;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public fun get (Ljava/lang/String;)Ljava/lang/String;
	public fun set (Ljava/lang/String;Ljava/lang/String;)V
	public fun setEnvironment (Ljava/lang/String;)V
Expand DownExpand Up@@ -1634,7 +1634,7 @@ public final class io/sentry/TraceContext : io/sentry/JsonSerializable, io/sentr
	public fun getUserSegment ()Ljava/lang/String;
	public fun serialize (Lio/sentry/JsonObjectWriter;Lio/sentry/ILogger;)V
	public fun setUnknown (Ljava/util/Map;)V
	public fun toBaggage (Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun toBaggage (Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
}

public final class io/sentry/TraceContext$Deserializer : io/sentry/JsonDeserializer {
Expand Down

88 changes: 54 additions & 34 deletions
sentry/src/main/java/io/sentry/Baggage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,31 +20,31 @@ public final class Baggage {
 static final @NotNull Integer MAX_BAGGAGE_LIST_MEMBER_COUNT = 64;

 final @NotNull Map<String, String> keyValues;
 final @NotNull ILogger logger;
 final @NotNull SentryOptions options;

 public static Baggage fromHeader(
 final @Nullable List<String> headerValues, final @NotNull ILogger logger) {
 final @Nullable List<String> headerValues, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = new HashMap<>();

 if (headerValues != null) {
 for (final @Nullable String headerValue : headerValues) {
 final Map<String, String> keyValuesToAdd =
 extractKeyValuesFromBaggageString(headerValue, logger);
 extractKeyValuesFromBaggageString(headerValue, options);
 keyValues.putAll(keyValuesToAdd);
 }
 }

 return new Baggage(keyValues, logger);
 return new Baggage(keyValues, options);
 }

 public static Baggage fromHeader(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, logger);
 return new Baggage(keyValues, logger);
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, options);
 return new Baggage(keyValues, options);
 }

 private static Map<String, String> extractKeyValuesFromBaggageString(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final @NotNull Map<String, String> keyValues = new HashMap<>();

 if (headerValue != null) {
Expand All@@ -62,28 +62,40 @@ private static Map<String, String> extractKeyValuesFromBaggageString(

 keyValues.put(keyDecoded, valueDecoded);
 } else {
 logger.log(
 SentryLevel.ERROR, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR, e, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 }
 } catch (Throwable e) {
 logger.log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 options
 .getLogger()
 .log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 }
 }
 return keyValues;
 }

 public Baggage(final @NotNull ILogger logger) {
 this(new HashMap<>(), logger);
 public Baggage(final @NotNull SentryOptions options) {
 this(new HashMap<>(), options);
 }

 public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILogger logger) {
 public Baggage(
 final @NotNull Map<String, String> keyValues, final @NotNull SentryOptions options) {
 this.keyValues = keyValues;
 this.logger = logger;
 this.options = options;
 }

 public @NotNull String toHeaderString() {
Expand All@@ -97,11 +109,13 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog

 if (value != null) {
 if (listMemberCount >= MAX_BAGGAGE_LIST_MEMBER_COUNT) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 } else {
 try {
 final String encodedKey = encode(key);
Expand All@@ -111,23 +125,27 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog
 final int valueLength = encodedKeyValue.length();
 final int totalLengthIfValueAdded = sb.length() + valueLength;
 if (totalLengthIfValueAdded > MAX_BAGGAGE_STRING_LENGTH) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 } else {
 listMemberCount++;
 sb.append(encodedKeyValue);
 separator = ",";
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 }
 }
 }
Expand DownExpand Up@@ -169,7 +187,9 @@ public void setRelease(final @Nullable String release) {
 }

 public void setUserId(final @Nullable String userId) {
 set("sentry-user_id", userId);
 if (options.isSendDefaultPii()) {
 set("sentry-user_id", userId);
 }
 }

 public void setUserSegment(final @Nullable String userSegment) {
Expand Down

2 changes: 1 addition & 1 deletion
sentry/src/main/java/io/sentry/SentryTracer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,7 +382,7 @@ public void finish(@Nullable SpanStatus status) {
 public @Nullable BaggageHeader toBaggageHeader() {
 final TraceContext traceContext = traceContext();
 if (hub.getOptions().isTraceSampling() && traceContext != null) {
 final Baggage baggage = traceContext.toBaggage(hub.getOptions().getLogger());
 final Baggage baggage = traceContext.toBaggage(hub.getOptions());
 return new BaggageHeader(baggage);
 } else {
 return null;
Expand Down

4 changes: 2 additions & 2 deletions
sentry/src/main/java/io/sentry/TraceContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,8 @@ public final class TraceContext implements JsonUnknown, JsonSerializable {
 return sampleRate;
 }

 public @NotNull Baggage toBaggage(@NotNull ILogger logger) {
 Baggage baggage = new Baggage(logger);
 public @NotNull Baggage toBaggage(@NotNull SentryOptions options) {
 Baggage baggage = new Baggage(options);

 baggage.setTraceId(traceId.toString());
 baggage.setPublicKey(publicKey);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Only send userid in baggage if sendDefaultPii is true#2145

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

 Closed

adinauer
wants to merge
11
commits into

from

 Closed


Only send userid in baggage if sendDefaultPii is true#2145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
0163e53

Add sample rate from traces sampler to DSC


adinauer Jun 28, 2022
59d32d8

Do not replace null with true/false


adinauer Jun 28, 2022
2f95fd1

Restore sample rate in OutboxSender


adinauer Jun 29, 2022
eaf947e

Remove fallback for sampling decision from TraceContext


adinauer Jun 29, 2022
0f9bbda

Remove sample rate fallback from TracesSamplingDecision


adinauer Jun 29, 2022
755b63f

Test more envelope header trace fields for OutboxSender


adinauer Jun 29, 2022
a8a8479

Skip sending userId in baggage if send default pii is off


adinauer Jun 29, 2022
63d71ad

Add changelog


adinauer Jun 29, 2022
87f91f8

CR changes


adinauer Jun 30, 2022
a0a0720

Merge branch 'feat/traces-sampler-into-sample-rate' into feat/skip-us…


adinauer Jun 30, 2022
8df67ba

Merge branch 'feat/add-sample-rate-to-baggage' into feat/skip-userid-…


adinauer Jun 30, 2022

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


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@

## Unreleased

### Fixes

- Only send userid in `baggage` if `sendDefaultPii` is `true` ([#2145](https://github.com/getsentry/sentry-java/pull/2145))

### Features

- New package `sentry-android-navigation` for AndroidX Navigation support ([#2136](https://github.com/getsentry/sentry-java/pull/2136))
Expand Down

10 changes: 5 additions & 5 deletions
sentry/api/sentry.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,10 @@ public final class io/sentry/Attachment {
}

public final class io/sentry/Baggage {
	public fun <init> (Lio/sentry/ILogger;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/ILogger;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun <init> (Lio/sentry/SentryOptions;)V
	public fun <init> (Ljava/util/Map;Lio/sentry/SentryOptions;)V
	public static fun fromHeader (Ljava/lang/String;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public static fun fromHeader (Ljava/util/List;Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
	public fun get (Ljava/lang/String;)Ljava/lang/String;
	public fun set (Ljava/lang/String;Ljava/lang/String;)V
	public fun setEnvironment (Ljava/lang/String;)V
Expand DownExpand Up@@ -1634,7 +1634,7 @@ public final class io/sentry/TraceContext : io/sentry/JsonSerializable, io/sentr
	public fun getUserSegment ()Ljava/lang/String;
	public fun serialize (Lio/sentry/JsonObjectWriter;Lio/sentry/ILogger;)V
	public fun setUnknown (Ljava/util/Map;)V
	public fun toBaggage (Lio/sentry/ILogger;)Lio/sentry/Baggage;
	public fun toBaggage (Lio/sentry/SentryOptions;)Lio/sentry/Baggage;
}

public final class io/sentry/TraceContext$Deserializer : io/sentry/JsonDeserializer {
Expand Down

88 changes: 54 additions & 34 deletions
sentry/src/main/java/io/sentry/Baggage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,31 +20,31 @@ public final class Baggage {
 static final @NotNull Integer MAX_BAGGAGE_LIST_MEMBER_COUNT = 64;

 final @NotNull Map<String, String> keyValues;
 final @NotNull ILogger logger;
 final @NotNull SentryOptions options;

 public static Baggage fromHeader(
 final @Nullable List<String> headerValues, final @NotNull ILogger logger) {
 final @Nullable List<String> headerValues, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = new HashMap<>();

 if (headerValues != null) {
 for (final @Nullable String headerValue : headerValues) {
 final Map<String, String> keyValuesToAdd =
 extractKeyValuesFromBaggageString(headerValue, logger);
 extractKeyValuesFromBaggageString(headerValue, options);
 keyValues.putAll(keyValuesToAdd);
 }
 }

 return new Baggage(keyValues, logger);
 return new Baggage(keyValues, options);
 }

 public static Baggage fromHeader(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, logger);
 return new Baggage(keyValues, logger);
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final Map<String, String> keyValues = extractKeyValuesFromBaggageString(headerValue, options);
 return new Baggage(keyValues, options);
 }

 private static Map<String, String> extractKeyValuesFromBaggageString(
 final @Nullable String headerValue, final @NotNull ILogger logger) {
 final @Nullable String headerValue, final @NotNull SentryOptions options) {
 final @NotNull Map<String, String> keyValues = new HashMap<>();

 if (headerValue != null) {
Expand All@@ -62,28 +62,40 @@ private static Map<String, String> extractKeyValuesFromBaggageString(

 keyValues.put(keyDecoded, valueDecoded);
 } else {
 logger.log(
 SentryLevel.ERROR, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR, e, "Unable to decode baggage key value pair %s", keyValueString);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to decode baggage key value pair %s",
 keyValueString);
 }
 }
 } catch (Throwable e) {
 logger.log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 options
 .getLogger()
 .log(SentryLevel.ERROR, e, "Unable to decode baggage header %s", headerValue);
 }
 }
 return keyValues;
 }

 public Baggage(final @NotNull ILogger logger) {
 this(new HashMap<>(), logger);
 public Baggage(final @NotNull SentryOptions options) {
 this(new HashMap<>(), options);
 }

 public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILogger logger) {
 public Baggage(
 final @NotNull Map<String, String> keyValues, final @NotNull SentryOptions options) {
 this.keyValues = keyValues;
 this.logger = logger;
 this.options = options;
 }

 public @NotNull String toHeaderString() {
Expand All@@ -97,11 +109,13 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog

 if (value != null) {
 if (listMemberCount >= MAX_BAGGAGE_LIST_MEMBER_COUNT) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total number of list members would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_LIST_MEMBER_COUNT);
 } else {
 try {
 final String encodedKey = encode(key);
Expand All@@ -111,23 +125,27 @@ public Baggage(final @NotNull Map<String, String> keyValues, final @NotNull ILog
 final int valueLength = encodedKeyValue.length();
 final int totalLengthIfValueAdded = sb.length() + valueLength;
 if (totalLengthIfValueAdded > MAX_BAGGAGE_STRING_LENGTH) {
 logger.log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 "Not adding baggage value %s as the total header value length would exceed the maximum of %s.",
 key,
 MAX_BAGGAGE_STRING_LENGTH);
 } else {
 listMemberCount++;
 sb.append(encodedKeyValue);
 separator = ",";
 }
 } catch (Throwable e) {
 logger.log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 options
 .getLogger()
 .log(
 SentryLevel.ERROR,
 e,
 "Unable to encode baggage key value pair (key=%s,value=%s).",
 key,
 value);
 }
 }
 }
Expand DownExpand Up@@ -169,7 +187,9 @@ public void setRelease(final @Nullable String release) {
 }

 public void setUserId(final @Nullable String userId) {
 set("sentry-user_id", userId);
 if (options.isSendDefaultPii()) {
 set("sentry-user_id", userId);
 }
 }

 public void setUserSegment(final @Nullable String userSegment) {
Expand Down

2 changes: 1 addition & 1 deletion
sentry/src/main/java/io/sentry/SentryTracer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,7 +382,7 @@ public void finish(@Nullable SpanStatus status) {
 public @Nullable BaggageHeader toBaggageHeader() {
 final TraceContext traceContext = traceContext();
 if (hub.getOptions().isTraceSampling() && traceContext != null) {
 final Baggage baggage = traceContext.toBaggage(hub.getOptions().getLogger());
 final Baggage baggage = traceContext.toBaggage(hub.getOptions());
 return new BaggageHeader(baggage);
 } else {
 return null;
Expand Down

4 changes: 2 additions & 2 deletions
sentry/src/main/java/io/sentry/TraceContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,8 @@ public final class TraceContext implements JsonUnknown, JsonSerializable {
 return sampleRate;
 }

 public @NotNull Baggage toBaggage(@NotNull ILogger logger) {
 Baggage baggage = new Baggage(logger);
 public @NotNull Baggage toBaggage(@NotNull SentryOptions options) {
 Baggage baggage = new Baggage(options);

 baggage.setTraceId(traceId.toString());
 baggage.setPublicKey(publicKey);
Expand Down
Loading