WIP: newrelic integration html

7 files changed, 16 insertions, 10 deletions

diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/Apdex.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/Apdex.scala
index 53240c89..34bb4f46 100644
--- a/kamon-newrelic/src/main/scala/kamon/newrelic/Apdex.scala
+++ b/kamon-newrelic/src/main/scala/kamon/newrelic/Apdex.scala
@@ -61,7 +61,6 @@ class Apdex extends Actor {
     uowTrace.segments.collect { case we: WebExternal ⇒ we }.foreach { webExternalTrace ⇒
       val external = ((webExternalTrace.finish - webExternalTrace.start) / 1E9).toFloat
 
-      println("Web External: " + webExternalTrace)
       NRAgent.recordMetric(s"External/${webExternalTrace.host}/http", external)
       NRAgent.recordMetric(s"External/${webExternalTrace.host}/all", external)
       NRAgent.recordMetric(s"External/${webExternalTrace.host}/http/WebTransaction/Custom" + uowTrace.name, external)
diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala
index e76c9bde..f933bee4 100644
--- a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala
+++ b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala
@@ -108,8 +108,5 @@ class WebTransactionMetrics extends Actor with ActorLogging {
     recordValue(NewRelicMetric.ID("WebTransaction", None), elapsedSeconds)
     recordValue(NewRelicMetric.ID("HttpDispatcher", None), elapsedSeconds)
     recordValue(NewRelicMetric.ID("WebTransaction/Custom/" + trace.name, None), elapsedSeconds)
-
-    /*println("Recorded Apdex: " + apdex)
-    println("Current Metrics: \n" + metrics.mkString("\n"))*/
   }
 }
diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicReporting.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicReporting.scala
index 260fc71e..000e6286 100644
--- a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicReporting.scala
+++ b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicReporting.scala
@@ -35,7 +35,6 @@ class NewRelicReporting extends Actor {
     uowTrace.segments.collect { case we: WebExternal ⇒ we }.foreach { webExternalTrace ⇒
       val external = ((webExternalTrace.finish - webExternalTrace.start) / 1E9).toFloat
 
-      println("Web External: " + webExternalTrace)
       NewRelic.recordMetric(s"External/${webExternalTrace.host}/http", external)
       NewRelic.recordMetric(s"External/${webExternalTrace.host}/all", external)
       NewRelic.recordMetric(s"External/${webExternalTrace.host}/http/WebTransaction/Custom" + uowTrace.name, external)
diff --git a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala
index 7858e31f..3d1a7778 100644
--- a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala
+++ b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala
@@ -55,7 +55,7 @@ class UowTraceAggregator(reporting: ActorRef, aggregationTimeout: Duration) exte
   def receive = {
     case start: Start ⇒
       this.start = start.timestamp
-      segments = segments :+ start;
+      segments = segments :+ start
       name = start.name
     case finish: Finish ⇒
       end = finish.timestamp
diff --git a/site/src/jekyll/_includes/newrelic.md b/site/src/jekyll/_includes/newrelic.md
new file mode 100644
index 00000000..47c56678
--- /dev/null
+++ b/site/src/jekyll/_includes/newrelic.md
@@ -0,0 +1 @@
+Some `markdown`.
diff --git a/site/src/jekyll/index.html b/site/src/jekyll/index.html
index 3631800b..71eb0303 100644
--- a/site/src/jekyll/index.html
+++ b/site/src/jekyll/index.html
@@ -38,11 +38,9 @@ title: Kamon - Tools for Reactive Applications Monitoring
     <div class="col-md-4">
       <h2>NewRelic <small>Reporting</small></h2>
 
-      <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta
-        felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum
-        massa justo sit amet risus.</p>
+      <p>Through New Relic integration, developers can easily monitor their applications metrics like External Services, Errors and Apdex.</p>
 
-      <p><a class="btn btn-info" href="#" role="button">View details &raquo;</a></p>
+      <p><a class="btn btn-info" href="/newrelic" role="button">View details &raquo;</a></p>
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/site/src/jekyll/newrelic/index.html b/site/src/jekyll/newrelic/index.html
new file mode 100644
index 00000000..df791f66
--- /dev/null
+++ b/site/src/jekyll/newrelic/index.html
@@ -0,0 +1,12 @@
+---
+layout: default
+title: Kamon - NewRelic Integration
+---
+
+{% include newrelic.md %}
+
+<div class="newrelic">
+  {{ content }}
+</div>
+
+