diff --git a/pom.xml b/pom.xml index c1227c1..1b11e29 100644 --- a/pom.xml +++ b/pom.xml @@ -31,13 +31,13 @@ org.jenkins-ci.plugins plugin - 2.2 + 4.74 io.jenkins.plugins sentry - 1.5.0 + 6.30.0 hpi Integrates Jenkins with the Sentry error reporting service http://wiki.jenkins-ci.org/display/JENKINS/Sentry+Plugin @@ -64,7 +64,12 @@ io.sentry sentry - 1.5.0 + 6.30.0 + + + io.sentry + sentry-jul + 6.30.0 @@ -83,30 +88,6 @@ - 2.60.3 - 7 + 2.401.3 - - - - - org.codehaus.gmaven - gmaven-plugin - - 1.8 - - - - - generateStubs - compile - generateTestStubs - testCompile - - - - - - - diff --git a/src/main/groovy/io/jenkins/plugins/sentry/CustomClientFactory.groovy b/src/main/groovy/io/jenkins/plugins/sentry/CustomClientFactory.groovy deleted file mode 100644 index 667fcff..0000000 --- a/src/main/groovy/io/jenkins/plugins/sentry/CustomClientFactory.groovy +++ /dev/null @@ -1,12 +0,0 @@ -package io.jenkins.plugins.sentry - -import io.sentry.DefaultSentryClientFactory -import io.sentry.dsn.Dsn -import io.sentry.context.ContextManager -import io.sentry.context.SingletonContextManager - -class CustomClientFactory extends DefaultSentryClientFactory { - protected ContextManager getContextManager(Dsn dsn) { - return new SingletonContextManager(); - } -} diff --git a/src/main/groovy/io/jenkins/plugins/sentry/SentryPageDecorator.groovy b/src/main/groovy/io/jenkins/plugins/sentry/SentryPageDecorator.groovy deleted file mode 100644 index b6e91c3..0000000 --- a/src/main/groovy/io/jenkins/plugins/sentry/SentryPageDecorator.groovy +++ /dev/null @@ -1,15 +0,0 @@ -package io.jenkins.plugins.sentry - -import java.util.logging.* - -import hudson.Extension -import hudson.model.PageDecorator -import net.sf.json.JSONObject -import org.kohsuke.stapler.StaplerRequest - -@Extension -class SentryPageDecorator extends PageDecorator { - String getSentryDsn() { - return System.env.get('SENTRY_PUBLIC_DSN') - } -} diff --git a/src/main/groovy/io/jenkins/plugins/sentry/SentryPlugin.groovy b/src/main/groovy/io/jenkins/plugins/sentry/SentryPlugin.groovy index df9da5f..4de29b6 100644 --- a/src/main/groovy/io/jenkins/plugins/sentry/SentryPlugin.groovy +++ b/src/main/groovy/io/jenkins/plugins/sentry/SentryPlugin.groovy @@ -17,13 +17,6 @@ class SentryPlugin extends Plugin { Sentry.init() - System.env.each { key, value -> - key.eachMatch('SENTRY_TAG_(\\w+)') { match -> - LOG.info("Adding a tag for `${match[1]}` with `${value}`") - Sentry.context.addTag(match[1], value) - } - } - if (!System.env.get('SENTRY_NO_LOGWATCHER')) { addLogWatcher() } @@ -45,7 +38,7 @@ class SentryPlugin extends Plugin { Logger manager = LogManager.logManager.getLogger(loggerName) boolean found = false - manager?.handlers?.toList().each { handler -> + manager?.handlers?.toList()?.each { handler -> if (handler.class == SentryHandler) { found = true } @@ -53,7 +46,7 @@ class SentryPlugin extends Plugin { if (!found) { LOG.info("Adding Sentry to ${loggerName}") - manager?.addHandler(sentry) + manager?.addHandler(sentry as Handler) } } } diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly new file mode 100644 index 0000000..83a4aed --- /dev/null +++ b/src/main/resources/index.jelly @@ -0,0 +1,4 @@ + +
+ Integrates Jenkins with the Sentry error reporting service +