Skip to content
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

Jump to bottom

Calling Sentry.init and specifying contextTags now has an effect on the Log4j SentryAppender #2054

Merged
merged 7 commits into from
May 25, 2022
Merged

Calling Sentry.init and specifying contextTags now has an effect on the Log4j SentryAppender #2054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f115424
Retrieve contextTags from HubAdapter options
adinauer May 17, 2022
e27c325
Update sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java
adinauer May 18, 2022
ccc8c5b
Update sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java
adinauer May 18, 2022
f19d38b
Add changelog
adinauer May 18, 2022
8f6750b
Add comment explaining why we get contextTags from HubAdapter
adinauer May 24, 2022
e23ce2f
Merge branch '6.x.x' into fix/init-not-affecting-log4j
adinauer May 24, 2022
c3e71d6
Merge branch '6.x.x' into fix/init-not-affecting-log4j
adinauer May 25, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Fixes

- Calling Sentry.init and specifying contextTags now has an effect on the Logback SentryAppender ([#2052](https://github.com/getsentry/sentry-java/pull/2052))
- Calling Sentry.init and specifying contextTags now has an effect on the Log4j SentryAppender ([#2054](https://github.com/getsentry/sentry-java/pull/2054))

## 6.0.0-beta.4

Expand Down
3 changes: 3 additions & 0 deletions sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ public void append(final @NotNull LogEvent eventObject) {
CollectionUtils.filterMapEntries(
loggingEvent.getContextData().toMap(), entry -> entry.getValue() != null);
if (!contextData.isEmpty()) {
// get tags from HubAdapter options to allow getting the correct tags if Sentry has been
// initialized somewhere else
final List<String> contextTags = hub.getOptions().getContextTags();
if (contextTags != null && !contextTags.isEmpty()) {
for (final String contextTag : contextTags) {
// if mdc tag is listed in SentryOptions, apply as event tag
Expand Down