Merge pull request #23 from agorapulse/fix/sc-70828-support-legacy-se…

…ntry-sdn [sc70828] support Sentry DSN in env var format
agorapulse · Apr 6, 2022 · 9662e49 · 9662e49
2 parents 3e8912c + 11a953d
commit 9662e49
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/...ects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/Log4AwsFactory.java b/...ects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/Log4AwsFactory.java
@@ -21,6 +21,7 @@
 import io.micronaut.context.annotation.Context;
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Value;
+import io.micronaut.core.util.StringUtils;
 import io.sentry.EventProcessor;
 import io.sentry.IHub;
 import io.sentry.Sentry;
@@ -51,15 +52,19 @@ public class Log4AwsFactory {
      */
     @Bean
     @Context
-    public SentryAppender sentryAppender(IHub hub, @Value("${sentry.dsn:}") String sentryDsn) {
+    public SentryAppender sentryAppender(
+        IHub hub,
+        @Value("${sentry.dsn:}") String sentryDsn,
+        @Value("${SENTRY_DSN:}") String sentryDsnLegacy
+    ) {
         return initializeAppenderIfMissing(
             SentryAppender.class,
             Level.WARN,
             APPENDER_NAME,
             () -> new SentryAppender(
                 APPENDER_NAME,
                 null,
-                sentryDsn,
+                StringUtils.isNotEmpty(sentryDsn) ? sentryDsn : sentryDsnLegacy,
                 null,
                 null,
                 null,
@@ -78,9 +83,15 @@ public SentryAppender sentryAppender(IHub hub, @Value("${sentry.dsn:}") String s
      */
     @Bean
     @Context
-    public IHub sentryClient(List<Sentry.OptionsConfiguration<SentryOptions>> configurations, @Value("${sentry.dsn:}") String sentryDsn) {
+    public IHub sentryClient(
+        List<Sentry.OptionsConfiguration<SentryOptions>> configurations,
+        @Value("${sentry.dsn:}") String sentryDsn,
+        @Value("${SENTRY_DSN:}") String sentryDsnLegacy
+    ) {
         Sentry.init(options -> {
-            options.setDsn(sentryDsn);
+            options.setDsn(
+                StringUtils.isNotEmpty(sentryDsn) ? sentryDsn : sentryDsnLegacy
+            );
             configurations.forEach(c -> c.configure(options));
         });
         return Sentry.getCurrentHub();