From f11542419b2309c8b58888d52e7cdc7809e9f3fb Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 17 May 2022 11:15:23 +0200 Subject: [PATCH 1/5] Retrieve contextTags from HubAdapter options --- sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java index 9d04b401ce..3a7da21152 100644 --- a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java +++ b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java @@ -187,6 +187,7 @@ public void append(final @NotNull LogEvent eventObject) { CollectionUtils.filterMapEntries( loggingEvent.getContextData().toMap(), entry -> entry.getValue() != null); if (!contextData.isEmpty()) { + List contextTags = HubAdapter.getInstance().getOptions().getContextTags(); if (contextTags != null && !contextTags.isEmpty()) { for (final String contextTag : contextTags) { // if mdc tag is listed in SentryOptions, apply as event tag From e27c3257e28bf35e153d86d8a0c8138ab21c099e Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 18 May 2022 08:31:05 +0200 Subject: [PATCH 2/5] Update sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java Co-authored-by: Roman Zavarnitsyn --- .../src/main/java/io/sentry/log4j2/SentryAppender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java index 3a7da21152..9df1a9c9f0 100644 --- a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java +++ b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java @@ -187,7 +187,7 @@ public void append(final @NotNull LogEvent eventObject) { CollectionUtils.filterMapEntries( loggingEvent.getContextData().toMap(), entry -> entry.getValue() != null); if (!contextData.isEmpty()) { - List contextTags = HubAdapter.getInstance().getOptions().getContextTags(); + List 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 From ccc8c5ba1f9037d962ec061a89b01a65a3db9b05 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 18 May 2022 09:15:44 +0200 Subject: [PATCH 3/5] Update sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java Co-authored-by: Manoel Aranda Neto <5731772+marandaneto@users.noreply.github.com> --- .../src/main/java/io/sentry/log4j2/SentryAppender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java index 9df1a9c9f0..7f7d1ccb4f 100644 --- a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java +++ b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java @@ -187,7 +187,7 @@ public void append(final @NotNull LogEvent eventObject) { CollectionUtils.filterMapEntries( loggingEvent.getContextData().toMap(), entry -> entry.getValue() != null); if (!contextData.isEmpty()) { - List contextTags = hub.getOptions().getContextTags(); + final List 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 From f19d38bd57314d5026ef2fa9c63e5d03038bc02f Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 18 May 2022 12:11:52 +0200 Subject: [PATCH 4/5] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cda8b0120..103de4b86b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ ### Fixes - SentryThread.current flag will not be overridden by DefaultAndroidEventProcessor if already set ([#2050](https://github.com/getsentry/sentry-java/pull/2050)) +- 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.3 From 8f6750b22c3979559b733a50800d8b2dd43aa2df Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 24 May 2022 15:48:23 +0200 Subject: [PATCH 5/5] Add comment explaining why we get contextTags from HubAdapter --- .../src/main/java/io/sentry/log4j2/SentryAppender.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java index 7f7d1ccb4f..cbf997894d 100644 --- a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java +++ b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java @@ -187,6 +187,8 @@ 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 contextTags = hub.getOptions().getContextTags(); if (contextTags != null && !contextTags.isEmpty()) { for (final String contextTag : contextTags) {