=build #15103 Add Build start/finish events
These are visible on the grafana dashboard, in order to be able to see on which commit stats have been recorded. It's enabled via: `-Dakka.sbt.graphite=true` Resolves #15103
This commit is contained in:
parent
14e8249deb
commit
293ecb09f9
3 changed files with 122 additions and 25 deletions
|
|
@ -26,8 +26,8 @@ import java.util.Properties
|
|||
import annotation.tailrec
|
||||
import sbtunidoc.Plugin.{ ScalaUnidoc, JavaUnidoc, scalaJavaUnidocSettings, genjavadocSettings, scalaUnidocSettings }
|
||||
import sbtunidoc.Plugin.UnidocKeys.{ unidoc, unidocProjectFilter }
|
||||
import TestExtras.{ JUnitFileReporting, StatsDMetrics }
|
||||
import com.typesafe.sbt.S3Plugin.{ S3, s3Settings }
|
||||
import akka.TestExtras.{ JUnitFileReporting, StatsDMetrics, GraphiteBuildEvents }
|
||||
|
||||
object AkkaBuild extends Build {
|
||||
System.setProperty("akka.mode", "test") // Is there better place for this?
|
||||
|
|
@ -50,9 +50,11 @@ object AkkaBuild extends Build {
|
|||
lazy val akka = Project(
|
||||
id = "akka",
|
||||
base = file("."),
|
||||
settings = parentSettings ++ Release.settings ++ unidocSettings ++ Publish.versionSettings ++
|
||||
settings = parentSettings ++
|
||||
Release.settings ++ unidocSettings ++ Publish.versionSettings ++
|
||||
GraphiteBuildEvents.settings ++
|
||||
SphinxSupport.settings ++ Dist.settings ++ s3Settings ++ mimaSettings ++ scaladocSettings ++
|
||||
StatsDMetrics.settings ++ Protobuf.settings ++ inTask(unidoc)(Seq(
|
||||
Protobuf.settings ++ inTask(unidoc)(Seq(
|
||||
unidocProjectFilter in ScalaUnidoc := docProjectFilter,
|
||||
unidocProjectFilter in JavaUnidoc := docProjectFilter,
|
||||
apiMappings in ScalaUnidoc := (apiMappings in (Compile, doc)).value
|
||||
|
|
@ -722,7 +724,9 @@ object AkkaBuild extends Build {
|
|||
// add reportBinaryIssues to validatePullRequest on minor version maintenance branch
|
||||
validatePullRequest <<= validatePullRequest.dependsOn(reportBinaryIssues)
|
||||
|
||||
) ++ mavenLocalResolverSettings ++ JUnitFileReporting.settings ++ StatsDMetrics.settings
|
||||
) ++
|
||||
mavenLocalResolverSettings ++
|
||||
JUnitFileReporting.settings ++ StatsDMetrics.settings
|
||||
|
||||
val validatePullRequest = TaskKey[Unit]("validate-pull-request", "Additional tasks for pull request validation")
|
||||
// the tasks that to run for validation is defined in defaultSettings
|
||||
|
|
@ -733,7 +737,7 @@ object AkkaBuild extends Build {
|
|||
"http://github.com/akka/akka/tree/" + branch
|
||||
}
|
||||
|
||||
// preprocessing settings for sphinx
|
||||
// pre-processing settings for sphinx
|
||||
lazy val sphinxPreprocessing = inConfig(Sphinx)(Seq(
|
||||
target in preprocess <<= baseDirectory / "rst_preprocessed",
|
||||
preprocessExts := Set("rst", "py"),
|
||||
|
|
|
|||
|
|
@ -3,16 +3,13 @@ package akka
|
|||
import sbt._
|
||||
import Keys._
|
||||
|
||||
import com.timgroup.statsd.{StatsDClientErrorHandler, NonBlockingStatsDClient, StatsDClient}
|
||||
import java.util.concurrent.{ConcurrentHashMap, ConcurrentLinkedQueue}
|
||||
import com.timgroup.statsd.{StatsDClientErrorHandler, NonBlockingStatsDClient}
|
||||
import sbt.testing.{TestSelector, Status, Event}
|
||||
import java.io.File
|
||||
import com.typesafe.tools.mima.plugin.MimaKeys._
|
||||
import scala.Some
|
||||
import scala.Some
|
||||
import java.io.File
|
||||
import sbt.File
|
||||
import scala.util.Try
|
||||
import java.io.{InputStreamReader, BufferedReader, DataOutputStream, OutputStreamWriter}
|
||||
import java.net.{InetAddress, URLEncoder, HttpURLConnection, Socket}
|
||||
import com.typesafe.sbt.SbtGit
|
||||
import com.typesafe.sbt.SbtGit.GitKeys._
|
||||
|
||||
object TestExtras {
|
||||
|
||||
|
|
@ -24,6 +21,100 @@ object TestExtras {
|
|||
)
|
||||
}
|
||||
|
||||
object GraphiteBuildEvents {
|
||||
val graphite = config("graphite")
|
||||
|
||||
val enabled = settingKey[Boolean]("Set to true when you want to send build events to graphite; Enable with `-Dakka.sbt.graphite=true`")
|
||||
|
||||
val host = settingKey[String]("Host where graphite is located (ip, or hostname)")
|
||||
|
||||
val port = settingKey[Int]("Port on which graphite is listening, defaults to 80")
|
||||
|
||||
private val notifier = settingKey[Option[GraphiteBuildNotifier]]("Notifies graphite about this build")
|
||||
|
||||
val settings = SbtGit.settings ++ SbtGit.projectSettings ++ Seq(
|
||||
enabled in graphite := sys.props("akka.sbt.graphite") == "true",
|
||||
host in graphite := sys.props.get("akka.sbt.graphite.host").getOrElse("54.72.154.120"),
|
||||
port in graphite := sys.props.get("akka.sbt.graphite.port").flatMap(p => Try(p.toInt).toOption).getOrElse(80),
|
||||
|
||||
notifier := (enabled.in(graphite).value match {
|
||||
case true => Some(new GraphiteBuildNotifier(gitCurrentBranch.value, gitHeadCommit.value, host.in(graphite).value, port.in(graphite).value))
|
||||
case _ => None
|
||||
}),
|
||||
|
||||
// this wraps the test task in order to send events before and after it
|
||||
test in Test := Def.settingDyn {
|
||||
val g = notifier.value
|
||||
g.foreach(_.start())
|
||||
|
||||
// todo support complete(failed / successful)
|
||||
val task = (test in Test).taskValue andFinally { g.foreach(_.complete()) }
|
||||
|
||||
Def.setting(task)
|
||||
}.value
|
||||
)
|
||||
|
||||
/**
|
||||
* Notifies graphite by sending an *event*, when a build starts.
|
||||
* It will be tagged as "akka-build" and "branch:...", for filtering in UIs.
|
||||
*
|
||||
* Event includes branch and commit id of the build that is running.
|
||||
*/
|
||||
class GraphiteBuildNotifier(branch: String, commitId: Option[String], host: String, port: Int) {
|
||||
|
||||
private val url = new URL(s"http://$host:$port/events/")
|
||||
|
||||
private val hostname = InetAddress.getLocalHost.getHostName
|
||||
|
||||
private val marker = branch + commitId.fold("")(id => s" @ $id")
|
||||
|
||||
private def json(what: String, tag: String, data: String = "") =
|
||||
s"""{ "what": "$what", "tags": "akka-build,branch:${sanitize(branch)},$tag", "data": "$data"}""".stripMargin
|
||||
|
||||
def start(): Unit = send(s"Build started: $marker", data = "host = " + hostname, tag = "started")
|
||||
|
||||
def complete(): Unit = send(s"Build completed: $marker", data = "host = " + hostname, tag = "completed")
|
||||
|
||||
def send(msg: String, data: String, tag: String) = try {
|
||||
// specifically not using Akka-IO (even though I'd love to), in order to not make the akka build depend on akka itself
|
||||
val con = url.openConnection().asInstanceOf[HttpURLConnection]
|
||||
try {
|
||||
val bytes = json(msg, data, tag).getBytes("UTF-8")
|
||||
con.setDoOutput(true) // triggers POST
|
||||
con.connect()
|
||||
|
||||
val out = new DataOutputStream(con.getOutputStream)
|
||||
try {
|
||||
out.write(bytes)
|
||||
out.flush()
|
||||
|
||||
// sigh, if left un-consumed graphite wouldn't take the write (*really*)!
|
||||
consume(con)
|
||||
|
||||
} finally {
|
||||
out.close()
|
||||
}
|
||||
} finally {
|
||||
con.disconnect()
|
||||
}
|
||||
}
|
||||
|
||||
private def sanitize(s: String): String = s.replaceAll("""[^\w]+""", "-")
|
||||
|
||||
private def consume(con: HttpURLConnection) {
|
||||
val in = new BufferedReader(new InputStreamReader(con.getInputStream))
|
||||
var inputLine = ""
|
||||
try {
|
||||
while (inputLine != null) {
|
||||
inputLine = in.readLine()
|
||||
}
|
||||
} finally {
|
||||
in.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
object StatsDMetrics {
|
||||
|
||||
val statsd = config("statsd") extend Test
|
||||
|
|
@ -46,14 +137,14 @@ object TestExtras {
|
|||
port in statsd := Option(sys.props("akka.sbt.statsd.port")).flatMap(p => Try(p.toInt).toOption).getOrElse(8125),
|
||||
|
||||
testListeners in(Test, test) ++= {
|
||||
// for test
|
||||
// for `test`
|
||||
enabled.in(statsd).value match {
|
||||
case true => Seq(StatsDTestListener(streams.value.log, prefix.in(statsd).value, host.in(statsd).value, port.in(statsd).value))
|
||||
case _ => Nil
|
||||
}
|
||||
},
|
||||
testListeners ++= {
|
||||
// for testOnly
|
||||
// for `testOnly`
|
||||
enabled.in(statsd).value match {
|
||||
case true => Seq(StatsDTestListener(streams.value.log, prefix.in(statsd).value, host.in(statsd).value, port.in(statsd).value))
|
||||
case _ => Nil
|
||||
|
|
@ -73,16 +164,15 @@ object TestExtras {
|
|||
}
|
||||
|
||||
override def testEvent(event: TestEvent) {
|
||||
event.detail foreach {
|
||||
det =>
|
||||
det.status match {
|
||||
case Status.Success =>
|
||||
client.incrementCounter(testCounterKey(det, det.status))
|
||||
client.recordExecutionTime(testTimerKey(det), det.duration.toInt + 1000 + (Math.random() * 1000).toInt)
|
||||
event.detail foreach { det =>
|
||||
det.status match {
|
||||
case Status.Success =>
|
||||
client.incrementCounter(testCounterKey(det, det.status))
|
||||
client.recordExecutionTime(testTimerKey(det), det.duration.toInt)
|
||||
|
||||
case status =>
|
||||
client.incrementCounter(testCounterKey(det, status))
|
||||
}
|
||||
case status =>
|
||||
client.incrementCounter(testCounterKey(det, status))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
resolvers += Classpaths.typesafeResolver
|
||||
|
||||
resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
|
||||
|
||||
// these comment markers are for including code into the docs
|
||||
//#sbt-multi-jvm
|
||||
addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.3.8")
|
||||
|
|
@ -20,4 +21,6 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-s3" % "0.5")
|
|||
|
||||
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.1")
|
||||
|
||||
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.6.2")
|
||||
|
||||
libraryDependencies += "com.timgroup" % "java-statsd-client" % "2.0.0"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue