This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 790d7cc CAMEL-1202: use the old default of not block for direct in
these tests as they rely on that.
new 947e145 Adds zipkin http transport and moves off deprecated collector
new 7de1986 Fixed CS. This closes #2151
new bcf9bd1 CAMEL-12088: camel-zipkin - Karaf feature dont work with new
upgrade
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-zipkin/pom.xml | 12 +-
components/camel-zipkin/src/main/docs/zipkin.adoc | 36 ++++--
.../camel/zipkin/ZipkinLegacyReporterAdapter.java | 48 ++++++++
.../java/org/apache/camel/zipkin/ZipkinTracer.java | 136 +++++++++++++++------
.../camel/zipkin/ManagedZipkinSimpleRouteTest.java | 7 +-
.../apache/camel/zipkin/ZipkinABCRouteTest.java | 7 +-
.../zipkin/ZipkinClientRecipientListRouteTest.java | 7 +-
.../camel/zipkin/ZipkinMulticastRouteTest.java | 7 +-
...Scribe.java => ZipkinOneRouteFallbackTest.java} | 22 ++--
...onfigureScribe.java => ZipkinOneRouteTest.java} | 20 ++-
.../camel/zipkin/ZipkinRecipientListRouteTest.java | 7 +-
.../camel/zipkin/ZipkinRouteConcurrentTest.java | 7 +-
.../zipkin/ZipkinSimpleFallbackRouteTest.java | 7 +-
.../zipkin/ZipkinSimpleLogStreamsRouteTest.java | 7 +-
.../apache/camel/zipkin/ZipkinSimpleRouteTest.java | 7 +-
....java => ZipkinSpanReporterInRegistryTest.java} | 9 +-
...rRouteScribe.java => ZipkinTimerRouteTest.java} | 23 ++--
.../apache/camel/zipkin/ZipkinTwoRouteTest.java | 7 +-
.../camel/zipkin/http/ZipkinABCRouteHttp.java | 40 +++---
.../ZipkinAutoConfigureHttp.java} | 22 ++--
.../zipkin/http/ZipkinMulticastRouteHttp.java | 40 +++---
.../zipkin/http/ZipkinOneRouteFallbackHttp.java | 40 +++---
.../camel/zipkin/http/ZipkinOneRouteHttp.java | 40 +++---
.../camel/zipkin/http/ZipkinSimpleRouteHttp.java | 40 +++---
.../camel/zipkin/http/ZipkinTimerRouteHttp.java | 40 +++---
.../camel/zipkin/http/ZipkinTwoRouteHttp.java | 40 +++---
.../camel/zipkin/scribe/ZipkinABCRouteScribe.java | 78 ++----------
.../zipkin/scribe/ZipkinAutoConfigureScribe.java | 15 ++-
.../zipkin/scribe/ZipkinMulticastRouteScribe.java | 79 ++----------
.../scribe/ZipkinOneRouteFallbackScribe.java | 58 ++-------
.../camel/zipkin/scribe/ZipkinOneRouteScribe.java | 56 ++-------
.../zipkin/scribe/ZipkinSimpleRouteScribe.java | 58 ++-------
.../zipkin/scribe/ZipkinTimerRouteScribe.java | 64 ++--------
.../camel/zipkin/scribe/ZipkinTwoRouteScribe.java | 67 ++--------
examples/camel-example-zipkin/README.md | 14 +--
.../main/java/sample/camel/ClientApplication.java | 3 +-
.../src/main/resources/application.properties | 3 +-
.../src/main/java/sample/camel/Service2Route.java | 3 +-
parent/pom.xml | 6 +-
.../karaf/features/src/main/resources/features.xml | 6 +-
.../zipkin/starter/ZipkinAutoConfiguration.java | 1 +
.../starter/ZipkinConfigurationProperties.java | 17 ++-
42 files changed, 517 insertions(+), 689 deletions(-)
create mode 100644
components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinLegacyReporterAdapter.java
copy
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/{scribe/ZipkinOneRouteFallbackScribe.java
=> ZipkinOneRouteFallbackTest.java} (78%)
copy
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/{scribe/ZipkinAutoConfigureScribe.java
=> ZipkinOneRouteTest.java} (80%)
rename
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/{ZipkinSpanCollectorInRegistryTest.java
=> ZipkinSpanReporterInRegistryTest.java} (84%)
copy
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/{scribe/ZipkinTimerRouteScribe.java
=> ZipkinTimerRouteTest.java} (80%)
copy
examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
=>
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinABCRouteHttp.java
(51%)
copy
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/{scribe/ZipkinAutoConfigureScribe.java
=> http/ZipkinAutoConfigureHttp.java} (76%)
copy
examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
=>
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinMulticastRouteHttp.java
(51%)
copy
examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
=>
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinOneRouteFallbackHttp.java
(51%)
copy
examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
=>
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinOneRouteHttp.java
(51%)
copy
examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
=>
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinSimpleRouteHttp.java
(51%)
copy
examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
=>
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinTimerRouteHttp.java
(51%)
copy
examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
=>
components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinTwoRouteHttp.java
(51%)
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <commits@camel.apache.org>'].
