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 2016/06/13 12:01:22 UTC

[1/2] camel git commit: Upgrade Zipkin and related bundle to version 3.7.0

Repository: camel
Updated Branches:
  refs/heads/master ceaa05637 -> 92268c1fa


Upgrade Zipkin and related bundle to version 3.7.0


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/520afcee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/520afcee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/520afcee

Branch: refs/heads/master
Commit: 520afcee59f21889e80c0024aed0ec9c58702fc9
Parents: ceaa056
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Jun 13 13:43:45 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Jun 13 13:43:45 2016 +0200

----------------------------------------------------------------------
 .../org/apache/camel/zipkin/ZipkinClientRequestAdapter.java     | 5 +++++
 parent/pom.xml                                                  | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/520afcee/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
index b6998cc..a5aa944 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
@@ -101,4 +101,9 @@ public final class ZipkinClientRequestAdapter implements ClientRequestAdapter {
         }
         return list;
     }
+
+    @Override
+    public com.twitter.zipkin.gen.Endpoint serverAddress() {
+        return null;
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/520afcee/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0e4127b..5fa12c9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,8 +78,8 @@
     <bouncycastle-version>1.54</bouncycastle-version>
     <boxjavalibv2.version>3.2.1</boxjavalibv2.version>
     <braintree-gateway-version>2.63.0</braintree-gateway-version>
-    <brave-zipkin-version>3.6.0</brave-zipkin-version>
-    <brave-zipkin-bundle-version>3.6.0_1</brave-zipkin-bundle-version>
+    <brave-zipkin-version>3.7.0</brave-zipkin-version>
+    <brave-zipkin-bundle-version>3.7.0_1</brave-zipkin-bundle-version>
     <build-helper-maven-plugin-version>1.10</build-helper-maven-plugin-version>
     <c3p0-version>0.9.5.2</c3p0-version>
     <caffeine-version>2.3.1</caffeine-version>


[2/2] camel git commit: Camel-Zipkin: replaced deprecated methods

Posted by ac...@apache.org.
Camel-Zipkin: replaced deprecated methods


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/92268c1f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/92268c1f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/92268c1f

Branch: refs/heads/master
Commit: 92268c1fa96d84039710e50f2eae7d6649028cc0
Parents: 520afce
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Jun 13 14:00:32 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Jun 13 14:00:32 2016 +0200

----------------------------------------------------------------------
 .../org/apache/camel/zipkin/ZipkinClientRequestAdapter.java  | 8 ++++----
 .../src/main/java/org/apache/camel/zipkin/ZipkinHelper.java  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/92268c1f/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
index a5aa944..ac0608b 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
@@ -63,10 +63,10 @@ public final class ZipkinClientRequestAdapter implements ClientRequestAdapter {
             exchange.getIn().setHeader(ZipkinConstants.SAMPLED, "0");
         } else {
             exchange.getIn().setHeader(ZipkinConstants.SAMPLED, "1");
-            exchange.getIn().setHeader(ZipkinConstants.TRACE_ID, IdConversion.convertToString(spanId.getTraceId()));
-            exchange.getIn().setHeader(ZipkinConstants.SPAN_ID, IdConversion.convertToString(spanId.getSpanId()));
-            if (spanId.getParentSpanId() != null) {
-                exchange.getIn().setHeader(ZipkinConstants.PARENT_SPAN_ID, IdConversion.convertToString(spanId.getParentSpanId()));
+            exchange.getIn().setHeader(ZipkinConstants.TRACE_ID, IdConversion.convertToString(spanId.traceId));
+            exchange.getIn().setHeader(ZipkinConstants.SPAN_ID, IdConversion.convertToString(spanId.spanId));
+            if (spanId.nullableParentId() != null) {
+                exchange.getIn().setHeader(ZipkinConstants.PARENT_SPAN_ID, IdConversion.convertToString(spanId.nullableParentId()));
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/92268c1f/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java
index da5e568..d54556a 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java
@@ -32,9 +32,9 @@ public final class ZipkinHelper {
 
     public static SpanId createSpanId(String traceId, String spanId, String parentSpanId) {
         if (parentSpanId != null) {
-            return SpanId.create(IdConversion.convertToLong(traceId), IdConversion.convertToLong(spanId), IdConversion.convertToLong(parentSpanId));
+            return SpanId.builder().traceId(IdConversion.convertToLong(traceId)).spanId(IdConversion.convertToLong(spanId)).parentId(IdConversion.convertToLong(parentSpanId)).build();
         }
-        return SpanId.create(IdConversion.convertToLong(traceId), IdConversion.convertToLong(spanId), null);
+        return SpanId.builder().traceId(IdConversion.convertToLong(traceId)).spanId(IdConversion.convertToLong(spanId)).build();
     }
 
     public static StreamCache prepareBodyForLogging(Exchange exchange, boolean streams) {