HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D25

Add support for sentry.io
ClosedAll Users
Actions

Authored by • jasongilanfarr on Sep 27 2016, 2:15 AM.

Details

Reviewers
aquamatthias
jeschkies
Commits
rMARATHONe971dfefc41d: Merge 2d56dad3f1cdd6863c8fa0fc8a3c84fbd0a5713f into…
rMARATHON0ba845010624: Add support for sentry.io (#4490)
rMARATHONa4f7b7571f07: Add support for sentry.io (#4490)
rMARATHON2d56dad3f1cd: Add support for sentry.io
Summary
  • Add optional support for sentry.io as per DCOS-9953
Test Plan

Need a token

Diff Detail

Repository
rMARATHON marathon
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
• jasongilanfarr retitled this revision from to Add support for sentry.io.Sep 27 2016, 2:15 AM
• jasongilanfarr updated this object.
• jasongilanfarr edited the test plan for this revision. (Show Details)
• jasongilanfarr added reviewers: aquamatthias, jeschkies.
• jasongilanfarr added a subscriber: marathon-team.
jeschkies added a comment.Sep 27 2016, 10:56 AM

LGTM.

I just need a little clarification.

src/main/scala/mesosphere/marathon/DebugConf.scala
142–153

Just so I get this right. You describe the logger which will be used when we run, right? Does this write a logger.xml config then?

jdef added a subscriber: jdef.Sep 27 2016, 12:31 PM

This feature sounds like it would be a great use case for a plugin

aquamatthias added a comment.Sep 27 2016, 2:11 PM

LGTM.
Users have to opt-in by providing a sentry token - good.
Are there plans for using this in DC/OS?
And since this is not a core functionality of Marathon - do you think we can make this a plugin?

• jasongilanfarr marked an inline comment as done.Sep 27 2016, 5:21 PM
In D25#282, @jdef wrote:

This feature sounds like it would be a great use case for a plugin

Uhh, any plugin can do something like this.

In D25#285, @aquamatthias wrote:

LGTM.
Users have to opt-in by providing a sentry token - good.
Are there plans for using this in DC/OS?
And since this is not a core functionality of Marathon - do you think we can make this a plugin?

Thomas wants to put it into the soak cluster ASAP. The intention is to share the token with some customers and/or let them use their own.

In talking with him, I do think we're doing the right thing by not having it be a plugin (which is frankly silly as logback already has a "plugin interface" that any plugin today can get to), instead we're on a path where we are explicitly building in "please pass the sentry token in so we can get exception reporting"

src/main/scala/mesosphere/marathon/DebugConf.scala
142–153

this is the logback API that is expressed in the xml, but it's not writing any xml.

Closed by commit rMARATHONa4f7b7571f07: Add support for sentry.io (#4490) (authored by • jasongilanfarr, committed by GitHub <noreply@github.com>). · Explain WhySep 27 2016, 7:22 PM
This revision was automatically updated to reflect the committed changes.
• jasongilanfarr marked an inline comment as done.

Revision Contents

Diff 47

View Options

project/Dependencies.scala

Show First 20 Lines • Show All 47 Lines • ▼ Show 20 Line(s)
4848 marathonApiConsole % "compile",
4949 wixAccord % "compile",
5050 curator % "compile",
5151 curatorClient % "compile",
5252 curatorFramework % "compile",
5353 java8Compat % "compile",
5454 scalaLogging % "compile",
5555 logstash % "compile",
56 raven % "compile",
5657
5758 // test
5859 Test.diffson % "test",
5960 Test.scalatest % "test",
6061 Test.mockito % "test",
6162 Test.akkaTestKit % "test",
6263 Test.junit % "test"
6364 ).map(_.excludeAll(excludeSlf4jLog4j12).excludeAll(excludeLog4j).excludeAll(excludeJCL))
Show All 31 Lines
9596 val Graphite = "3.1.2"
9697 val DataDog = "1.1.6"
9798 val Logback = "1.1.3"
9899 val Logstash = "4.7"
99100 val WixAccord = "0.5"
100101 val Curator = "2.11.0"
101102 val Java8Compat = "0.8.0-RC7"
102103 val ScalaLogging = "3.5.0"
104 val Raven = "7.7.0"
103105
104106 // test deps versions
105107 val Mockito = "1.10.19"
106108 val ScalaTest = "3.0.0"
107109 val JUnit = "4.12"
108110 val JUnitBenchmarks = "0.7.2"
109111 val JMH = "1.14"
110112 }
Show All 34 Lines
145147 val logstash = "net.logstash.logback" % "logstash-logback-encoder" % V.Logstash
146148 val wixAccord = "com.wix" %% "accord-core" % V.WixAccord
147149 val curator = "org.apache.curator" % "curator-recipes" % V.Curator
148150 val curatorClient = "org.apache.curator" % "curator-client" % V.Curator
149151 val curatorFramework = "org.apache.curator" % "curator-framework" % V.Curator
150152 val java8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % V.Java8Compat
151153 val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % V.ScalaLogging
152154 val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.0.5"
155 val raven = "com.getsentry.raven" % "raven-logback" % V.Raven
153156
154157 object Test {
155158 val jmh = "org.openjdk.jmh" % "jmh-generator-annprocess" % V.JMH
156159 val scalatest = "org.scalatest" %% "scalatest" % V.ScalaTest
157160 val mockito = "org.mockito" % "mockito-all" % V.Mockito
158161 val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % V.Akka
159162 val diffson = "org.gnieh" %% "diffson" % V.Diffson
160163 val junit = "junit" % "junit" % V.JUnit
161164 }
162165}
View Options

src/main/scala/mesosphere/marathon/DebugConf.scala

11package mesosphere.marathon
22
33import java.net.URI
44import javax.inject.Provider
55
66import ch.qos.logback.classic.{ AsyncAppender, Level, LoggerContext }
77import ch.qos.logback.core.net.ssl.SSLConfiguration
8import com.getsentry.raven.logback.SentryAppender
89import com.google.inject.AbstractModule
910import com.google.inject.matcher.{ AbstractMatcher, Matchers }
1011import mesosphere.marathon.metrics.{ MetricPrefixes, Metrics }
1112import net.logstash.logback.appender._
1213import net.logstash.logback.composite.loggingevent.ArgumentsJsonProvider
1314import org.aopalliance.intercept.{ MethodInterceptor, MethodInvocation }
1415import org.rogach.scallop.ScallopConf
1516import org.slf4j.{ Logger, LoggerFactory }
Show All 40 Lines
5657 noshort = true
5758 )
5859
5960 lazy val logstash = opt[URI](
6061 "logstash",
6162 descr = "Logs destination URI in format (udp|tcp|ssl)://<host>:<port>",
6263 noshort = true
6364 )
65
66 lazy val sentryUrl = opt[URI](
67 "sentry",
68 descr = "URI for sentry, e.g. https://<public>:<private>@sentryserver/",
69 noshort = true
70 )
71
72 lazy val sentryTags = opt[String](
73 "sentry_tags",
74 descr = "Tags to post to sentry with, e.g: tag1:value1,tag2:value2"
75 )
6476}
6577
6678class DebugModule(conf: DebugConf) extends AbstractModule {
6779 /**
6880 * Measure processing time of each service method.
6981 */
7082 class MetricsBehavior(metricsProvider: Provider[Metrics]) extends MethodInterceptor {
7183 override def invoke(in: MethodInvocation): AnyRef = {
Show All 36 Lines
108120 case _ =>
109121 }
110122 }
111123
112124 conf.logstash.get.foreach {
113125 configureLogstash
114126 }
115127
128 conf.sentryUrl.get.foreach {
129 configureSentry(_, conf.sentryTags.get)
130 }
131
116132 //add behaviors
117133 val metricsProvider = getProvider(classOf[Metrics])
118134
119135 val tracingBehavior = if (conf.enableDebugTracing) Some(new TracingBehavior(metricsProvider)) else None
120136 val metricsBehavior = conf.metrics.get.filter(identity).map(_ => new MetricsBehavior(metricsProvider))
121137
122138 val behaviors = (tracingBehavior :: metricsBehavior :: Nil).flatten
123139 if (behaviors.nonEmpty) bindInterceptor(MarathonMatcher, Matchers.any(), behaviors: _*)
140 }
141
142 private def configureSentry(uri: URI, tags: Option[String]): Unit = {
143 LoggerFactory.getILoggerFactory match {
144 case context: LoggerContext =>
145 val appender = new SentryAppender()
146 appender.setDsn(uri.toString)
147 tags.foreach(appender.setTags)
148 appender.setRelease(s"${BuildInfo.version}:${BuildInfo.buildref}")
149 appender.setContext(context)
150 appender.setName("sentry")
151 val logger = context.getLogger(Logger.ROOT_LOGGER_NAME)
152 logger.addAppender(appender)
153 }
jeschkiesUnsubmitted
Done

Just so I get this right. You describe the logger which will be used when we run, right? Does this write a logger.xml config then?

jasongilanfarrAuthorUnsubmitted
Not Done

this is the logback API that is expressed in the xml, but it's not writing any xml.

124154 }
125155
126156 private def configureLogstash(destination: URI): Unit = {
127157 LoggerFactory.getILoggerFactory match {
128158 case context: LoggerContext =>
129159
130160 val encoder = new net.logstash.logback.encoder.LogstashEncoder()
131161 encoder.setContext(context)
Show All 40 Lines