You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/07/18 13:16:47 UTC
[1/3] camel git commit: CAMEL-11549 Fix more typos
Repository: camel
Updated Branches:
refs/heads/master 1d23ebafe -> 39299512e
CAMEL-11549 Fix more typos
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/39299512
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/39299512
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/39299512
Branch: refs/heads/master
Commit: 39299512e670d6fb7626853079d7a40c226663c3
Parents: d9b5ac0
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Tue Jul 18 15:10:13 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jul 18 15:16:32 2017 +0200
----------------------------------------------------------------------
examples/camel-example-zipkin/README.md | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/39299512/examples/camel-example-zipkin/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/README.md b/examples/camel-example-zipkin/README.md
index 5b71192..c71b1b7 100644
--- a/examples/camel-example-zipkin/README.md
+++ b/examples/camel-example-zipkin/README.md
@@ -22,13 +22,11 @@ Service1 is configured in the `src/main/resources/application.properties` proper
Service2 is configured in the `src/main/java/sample/camel/Service2Route.java` source file.
Client is configured in the `src/main/java/sample/camel/ClientApplication.java` source file.
-Here you need to configure the hostname and port number for the Zipkin Server.
-
### Build
First, start Zipkin as described below in the [Zipkin web console]("Zipkin web console") section
-Then start by compiling this example:
+Then compile this example:
```sh
$ mvn compile
[3/3] camel git commit: CAMEL-11549 Fix zipkin startup and other
instructions for example
Posted by ac...@apache.org.
CAMEL-11549 Fix zipkin startup and other instructions for example
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6d52044f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6d52044f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6d52044f
Branch: refs/heads/master
Commit: 6d52044f4cf343a3d0387e00db5b58d3a8637fb2
Parents: 1d23eba
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Tue Jul 18 15:01:51 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jul 18 15:16:32 2017 +0200
----------------------------------------------------------------------
examples/camel-example-zipkin/README.md | 13 ++++++++++---
.../src/main/java/sample/camel/ClientApplication.java | 2 +-
.../service1/src/main/resources/application.properties | 2 +-
.../src/main/java/sample/camel/Service2Route.java | 2 +-
4 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6d52044f/examples/camel-example-zipkin/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/README.md b/examples/camel-example-zipkin/README.md
index c852c56..6544213 100644
--- a/examples/camel-example-zipkin/README.md
+++ b/examples/camel-example-zipkin/README.md
@@ -16,13 +16,20 @@ Where client -> service1 -> service2 using HTTP.
### Configuration
-Service1 is configured in the `src/main/java/sample/camel/Service1Application.java` source code.
-Service2 is configured in the `src/main/resources/application.properties` properties file.
+This examples assumes you will run Zipkin on the same host using the default collector port of 9410. If you wish to change those, you can do so using these files:
+
+Service1 is configured in the `src/main/resources/application.properties` properties file.
+Service2 is configured in the `src/main/java/sample/camel/Service2Route.java` source code.
+Client is configured in the `src/main/java/sample/camel/ClientApplication.java` source file.
+
+src/main/java/sample/camel/ClientApplication.java
Here you need to configure the hostname and port number for the Zipkin Server.
### Build
+First, start Zipkin as described belos in the [Zipkin web console]("Zipkin web console") section
+
You will need to compile this example first:
```sh
@@ -77,7 +84,7 @@ wget -O zipkin.jar 'https://search.maven.org/remote_content?g=io.zipkin.java&a=z
.. and then run it
```bash
-java -jar zipkin.jar
+java -DSCRIBE_ENABLED=true -jar zipkin.jar
```
Finally, browse to http://localhost:9411 to find traces!
http://git-wip-us.apache.org/repos/asf/camel/blob/6d52044f/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java b/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
index 0f05e4b..8ed8e19 100644
--- a/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
+++ b/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
@@ -28,7 +28,7 @@ public class ClientApplication {
public void setupCamel(@Observes CamelContextStartingEvent event) {
// create zipkin
ZipkinTracer zipkin = new ZipkinTracer();
- zipkin.setHostName("192.168.99.100");
+ zipkin.setHostName("localhost");
zipkin.setPort(9410);
zipkin.addClientServiceMapping("http://localhost:9090/service1", "service1");
// capture 100% of all the events
http://git-wip-us.apache.org/repos/asf/camel/blob/6d52044f/examples/camel-example-zipkin/service1/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/resources/application.properties b/examples/camel-example-zipkin/service1/src/main/resources/application.properties
index f2edfd1..d6411fe 100644
--- a/examples/camel-example-zipkin/service1/src/main/resources/application.properties
+++ b/examples/camel-example-zipkin/service1/src/main/resources/application.properties
@@ -20,7 +20,7 @@ camel.springboot.name=Service1
camel.springboot.main-run-controller=true
# configure zipkin
-camel.zipkin.host-name=192.168.99.100
+camel.zipkin.host-name=localhost
camel.zipkin.port=9410
# the zipkin service name
http://git-wip-us.apache.org/repos/asf/camel/blob/6d52044f/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
index 7174b9e..70fe2e0 100644
--- a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
+++ b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
@@ -25,7 +25,7 @@ public class Service2Route extends RouteBuilder {
public void configure() throws Exception {
// create zipkin
ZipkinTracer zipkin = new ZipkinTracer();
- zipkin.setHostName("192.168.99.100");
+ zipkin.setHostName("localhost");
zipkin.setPort(9410);
// set the service name
zipkin.setServiceName("service2");
[2/3] camel git commit: CAMEL-11549 Fix typos
Posted by ac...@apache.org.
CAMEL-11549 Fix typos
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d9b5ac09
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d9b5ac09
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d9b5ac09
Branch: refs/heads/master
Commit: d9b5ac093de739bad94b08b07a61508c189ae18e
Parents: 6d52044
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Tue Jul 18 15:08:30 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jul 18 15:16:32 2017 +0200
----------------------------------------------------------------------
examples/camel-example-zipkin/README.md | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d9b5ac09/examples/camel-example-zipkin/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/README.md b/examples/camel-example-zipkin/README.md
index 6544213..5b71192 100644
--- a/examples/camel-example-zipkin/README.md
+++ b/examples/camel-example-zipkin/README.md
@@ -16,21 +16,19 @@ Where client -> service1 -> service2 using HTTP.
### Configuration
-This examples assumes you will run Zipkin on the same host using the default collector port of 9410. If you wish to change those, you can do so using these files:
+This example assumes you will run Zipkin on the same host using the default collector port of 9410. If you wish to change those, you can do so using these files:
Service1 is configured in the `src/main/resources/application.properties` properties file.
-Service2 is configured in the `src/main/java/sample/camel/Service2Route.java` source code.
+Service2 is configured in the `src/main/java/sample/camel/Service2Route.java` source file.
Client is configured in the `src/main/java/sample/camel/ClientApplication.java` source file.
-src/main/java/sample/camel/ClientApplication.java
-
Here you need to configure the hostname and port number for the Zipkin Server.
### Build
-First, start Zipkin as described belos in the [Zipkin web console]("Zipkin web console") section
+First, start Zipkin as described below in the [Zipkin web console]("Zipkin web console") section
-You will need to compile this example first:
+Then start by compiling this example:
```sh
$ mvn compile