aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2016-08-23 14:49:56 -0300
committerDiego <diegolparra@gmail.com>2016-08-23 14:49:56 -0300
commit9560f238c8125cc1f786401139769070101d05c8 (patch)
tree697e84f8741bc3dd5252841e2160d7ae69fca7df
parent2d458411e63193f1295af277a241c6b65d5d6b72 (diff)
downloadKamon-9560f238c8125cc1f786401139769070101d05c8.tar.gz
Kamon-9560f238c8125cc1f786401139769070101d05c8.tar.bz2
Kamon-9560f238c8125cc1f786401139769070101d05c8.zip
= examples: update spring-boot example
-rw-r--r--kamon-examples/kamon-annotation-example/java/pom.xml33
-rw-r--r--kamon-examples/kamon-annotation-example/java/src/main/java/kamon/KamonSpringApplication.java (renamed from kamon-examples/kamon-annotation-example/java/src/main/java/kamon/annotation/KamonSpringApplication.java)7
-rw-r--r--kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/PingPong.java22
-rw-r--r--kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/Pinger.java12
-rw-r--r--kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/Ponger.java12
-rw-r--r--kamon-examples/kamon-annotation-example/java/src/main/resources/application.conf13
6 files changed, 81 insertions, 18 deletions
diff --git a/kamon-examples/kamon-annotation-example/java/pom.xml b/kamon-examples/kamon-annotation-example/java/pom.xml
index d1fa4690..3edd16d6 100644
--- a/kamon-examples/kamon-annotation-example/java/pom.xml
+++ b/kamon-examples/kamon-annotation-example/java/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>kamon.annotation</groupId>
@@ -11,22 +11,27 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>1.2.3.RELEASE</version>
+ <version>1.2.3.RELEASE</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>io.kamon</groupId>
<artifactId>kamon-core_2.11</artifactId>
- <version>0.5.2</version>
+ <version>0.6.2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>io.kamon</groupId>
<artifactId>kamon-annotation_2.11</artifactId>
- <version>0.5.2</version>
+ <version>0.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>io.kamon</groupId>
+ <artifactId>kamon-akka_2.11</artifactId>
+ <version>0.6.2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>io.kamon</groupId>
<artifactId>kamon-log-reporter_2.11</artifactId>
- <version>0.5.2</version>
+ <version>0.6.2</version>
</dependency>
</dependencies>
@@ -44,10 +49,10 @@
</plugins>
</build>
- <repositories>
- <repository>
- <id>io.kamon</id>
- <url>http://snapshots.kamon.io</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>io.kamon</id>
+ <url>http://snapshots.kamon.io</url>
+ </repository>
+ </repositories>
</project>
diff --git a/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/annotation/KamonSpringApplication.java b/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/KamonSpringApplication.java
index fec55df6..ef62c6cc 100644
--- a/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/annotation/KamonSpringApplication.java
+++ b/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/KamonSpringApplication.java
@@ -1,11 +1,12 @@
-package kamon.annotation;
+package kamon;
-import kamon.Kamon;
+import kamon.akka.pingpong.PingPong;
+import kamon.annotation.KamonController;
import org.springframework.boot.SpringApplication;
public class KamonSpringApplication {
public static void main(String... args) {
Kamon.start();
- SpringApplication.run(KamonController.class,args);
+ SpringApplication.run(KamonController.class, args);
}
}
diff --git a/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/PingPong.java b/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/PingPong.java
new file mode 100644
index 00000000..8ef2f621
--- /dev/null
+++ b/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/PingPong.java
@@ -0,0 +1,22 @@
+package kamon.akka.pingpong;
+
+import akka.actor.ActorRef;
+import akka.actor.ActorSystem;
+import akka.actor.Props;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+public class PingPong {
+
+ @PostConstruct
+ public void initialize() {
+ final ActorSystem system = ActorSystem.create("kamon-spring-boot-actor-system");
+
+ final ActorRef pinger = system.actorOf(Props.create(Pinger.class), "pinger");
+ final ActorRef ponger = system.actorOf(Props.create(Ponger.class), "ponger");
+
+ pinger.tell(new Ponger.PongMessage(), ponger);
+ }
+}
diff --git a/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/Pinger.java b/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/Pinger.java
new file mode 100644
index 00000000..dcab35b6
--- /dev/null
+++ b/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/Pinger.java
@@ -0,0 +1,12 @@
+package kamon.akka.pingpong;
+
+import akka.actor.UntypedActor;
+
+class Pinger extends UntypedActor {
+ static final class PingMessage {}
+
+ public void onReceive(Object message) throws Exception {
+ if (message instanceof Ponger.PongMessage) getSender().tell(new PingMessage(), getSelf());
+ else unhandled(message);
+ }
+}
diff --git a/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/Ponger.java b/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/Ponger.java
new file mode 100644
index 00000000..b4e8ecfa
--- /dev/null
+++ b/kamon-examples/kamon-annotation-example/java/src/main/java/kamon/akka/pingpong/Ponger.java
@@ -0,0 +1,12 @@
+package kamon.akka.pingpong;
+
+import akka.actor.UntypedActor;
+
+class Ponger extends UntypedActor {
+ static final class PongMessage {}
+
+ public void onReceive(Object message) throws Exception {
+ if (message instanceof Pinger.PingMessage) getSender().tell(new PongMessage(), getSelf());
+ else unhandled(message);
+ }
+}
diff --git a/kamon-examples/kamon-annotation-example/java/src/main/resources/application.conf b/kamon-examples/kamon-annotation-example/java/src/main/resources/application.conf
index 595f9b89..32bf0fd6 100644
--- a/kamon-examples/kamon-annotation-example/java/src/main/resources/application.conf
+++ b/kamon-examples/kamon-annotation-example/java/src/main/resources/application.conf
@@ -3,7 +3,18 @@
###############################
kamon {
- modules {
+
+ metric {
+ filters {
+ trace.includes = [ "**" ]
+ akka-actor.includes = [ "**" ]
+ akka-actor.excludes = [ "*/system/**", "*/user/IO-**" ]
+ akka-dispatcher.includes = [ "**" ]
+ akka-dispatcher.excludes = [ ]
+ }
+ }
+
+ modules {
kamon-annotation.auto-start = yes
kamon-log-reporter.auto-start = yes
}