Commit Graph

678 Commits

Author SHA1 Message Date
Marcin Grzejszczak
d20f5d4937 Trying to fix Travis - clearing traces 2016-04-04 18:37:24 +02:00
Marcin Grzejszczak
0a285ba06e Trying to fix Travis 2016-04-04 18:19:59 +02:00
Marcin Grzejszczak
e822f1df8a Fixed wrong RxJava link 2016-04-04 17:42:49 +02:00
Marcin Grzejszczak
743f1cc127 Updated RxJava docs 2016-04-04 17:41:53 +02:00
Shivang Shah
beafc3a5a7 Support rx java
RxJava Support

fixes #235
2016-04-04 16:40:45 +02:00
Marcin Grzejszczak
60cb5eb49c Removed docker compose
Removed docker compose and updated README

fixes #230
2016-04-04 14:40:22 +02:00
Adrian Cole
9f869b8b0b Merge pull request #244 from spring-cloud/zipkin-0.11.0
Updates to zipkin 0.11
2016-04-04 07:24:55 +08:00
Adrian Cole
eaa008f933 Updates to zipkin 0.11
The only notable change for Sleuth is an artifact id change from
spanstore to storage.
2016-04-03 21:04:55 +08:00
Marcin Grzejszczak
b3c78c139d Fixed closing of Zuul span, added local component span for zuul
fixes #242
2016-04-02 00:04:28 +02:00
Marcin Grzejszczak
441bd0834e Removed unnecessary qualifier from Zuul 2016-04-01 23:18:41 +02:00
Marcin Grzejszczak
4afe702e27 Making TraceAsyncRestTemplate public 2016-04-01 18:40:33 +02:00
Dave Syer
49112c3d6e Add zipkin-ui to dependencies 2016-04-01 14:06:13 +01:00
Dave Syer
72e1e6da0c Ensure span is cleaned up if Feign client throws a non retryable
The retryable case was already covered and tested but if the exception
is not retryable, we need to rethrow and clean up the thread state.

Fixes gh-240
2016-04-01 10:23:40 +01:00
Adrian Cole
eea96fbd3e Merge pull request #241 from spring-cloud/zipkin-0.10.4
Updates to zipkin 0.10.4
2016-03-31 21:11:50 +08:00
Dave Syer
00b67a87d5 Remove @Bean RestTemplate
(If users need one they can add it themselves)

Fixes gh-239
2016-03-31 13:31:34 +01:00
Dave Syer
84f4d3720c Add Feign sample that fails to close a span
See gh-240
2016-03-31 13:04:52 +01:00
Adrian Cole
8382a823e5 Updates to zipkin 0.10.4
This updates to the latest release. Beyond bug fixes, there are some
notable changes:

* storage: writes are now via AsyncSpanConsumer
* storage: added elasticsearch
* zipkin-ui: constrains start time to look for traces
* zipkin-ui: assets set cache headers, increasing responsiveness
* core: debug logging available for zipkin.internal.DependencyLinker
2016-03-31 19:31:45 +08:00
Marcin Grzejszczak
caba82c740 Merge pull request #238 from spring-cloud/fixing_dependencies_messaging
Messages don't log events even though they should
2016-03-31 13:12:29 +02:00
Marcin Grzejszczak
900b4758b7 Messages don't log events even though they should 2016-03-30 17:01:21 +02:00
Marcin Grzejszczak
9aba475ac9 Updated readme 2016-03-29 13:01:28 +02:00
Marcin Grzejszczak
f38f979d13 Fixed missing logs for untraced first request
fixes #231
2016-03-29 12:59:45 +02:00
Marcin Grzejszczak
5be6ebf671 Added test for tags 2016-03-29 10:46:32 +02:00
Marcin Grzejszczak
e1cbc374c1 Merge pull request #233 from spring-cloud/json-logs
Tightens Log to forbid null events and fixes Span json serialization
2016-03-28 21:11:24 +02:00
Adrian Cole
8413344e88 Tightens Log to forbid null events and fixes Span json serialization
The Log object should never have a null entry as it is defined. This
change fixes that, backfills equals/hashCode for convenience, and adds
Jackson annotations that use the validating constructor.

This also adds a json annotation to span that allows logs to be
serialized. This is tested by round-tripping the json.
2016-03-28 21:03:08 +08:00
Marcin Grzejszczak
48f3f9783f Fixed the //NOSONAR 2016-03-25 11:45:33 +01:00
Marcin Grzejszczak
27ca7777e9 Polish and added tests 2016-03-25 09:50:30 +01:00
Marcin Grzejszczak
0f60a0c21a Added conditionals for Slf4j 2016-03-25 09:50:13 +01:00
Marcin Grzejszczak
c62a13aa35 Added JMH & JMeter benchmarks for Sleuth 2016-03-24 16:55:42 +01:00
Marcin Grzejszczak
ad1b62b560 One more fix for TraceWebSocketAutoConfig 2016-03-23 22:32:22 +01:00
Marcin Grzejszczak
1fe98c9685 Added conditionals for TraceWebSocketAutoConfig
fixes #227
2016-03-23 20:55:24 +01:00
Marcin Grzejszczak
e99731fe90 Added conditionals for TraceFeignClientAutoConfig
fixes #226
2016-03-23 16:23:37 +01:00
Marcin Grzejszczak
59614149ff Added conditionals for SleuthHystrixAutoConfig
fixes #225
2016-03-23 16:02:39 +01:00
Marcin Grzejszczak
184afe698d Added tests for exporting to Zipkin 2016-03-23 14:28:06 +01:00
Marcin Grzejszczak
e31edbd254 Revert to snapshots 2016-03-23 13:00:05 +01:00
Marcin Grzejszczak
51fd6f784f Bump for 1.0.0.RC1 2016-03-23 12:54:35 +01:00
Marcin Grzejszczak
9c66bed2bb Added missing check for exportable
fixes #224
2016-03-23 12:23:45 +01:00
Spencer Gibb
e87389bb45 Update mvnw to determine profile on mac and linux 2016-03-22 12:39:27 -06:00
Adrian Cole
4ffae5c1da Merge pull request #221 from spring-cloud/0.9.2
Updates to zipkin 0.9.3, which fixes a UI recursion bug
2016-03-22 17:25:51 +08:00
Adrian Cole
bd5d3ded0e Merge pull request #222 from spring-cloud/zipkin-web-be-gone
Scrubs docs about zipkin-web as it is now embedded
2016-03-22 17:25:40 +08:00
Adrian Cole
ac0049f836 Updates to zipkin 0.9.3 and fixes UI dependencies for scs-zipkin-stream 2016-03-21 22:37:23 +08:00
Adrian Cole
d1972a67f1 Scrubs docs about zipkin-web as it is now embedded 2016-03-21 22:30:56 +08:00
Marcin Grzejszczak
8749854a8a Added tests for HystrixConcurrencyStrategy 2016-03-21 15:08:36 +01:00
Marcin Grzejszczak
a0048a806e Polish 2016-03-21 14:58:30 +01:00
Dave Syer
35e8965e0a Add VetoCapableInterceptor so that we can prevent multiple instances
The TraceMessageChannelInterceptor should only be added once to a
channel. Normally this is the case automatically, but when the
application context hierarchy is complex, Spring Integration can
occasionally screw up and add the interceptor twice.

This change uses a Spring Integration specific API (VetoCapableInterceptor)
to prevent the double interceptor from being added.
2016-03-21 13:20:48 +00:00
Marcin Grzejszczak
95f4ac4411 Updated .gitignore 2016-03-21 13:45:32 +01:00
Marcin Grzejszczak
c1f3806607 Added test to LazyTraceAsyncCustomizer 2016-03-21 13:45:03 +01:00
Marcin Grzejszczak
05f3429b42 Removed unused classes 2016-03-21 13:43:47 +01:00
Dave Syer
02998ef45a Fix some compiler warnings and tidy up a few javadocs 2016-03-21 09:17:12 +00:00
Adrian Cole
32cdd7d5a2 Merge pull request #220 from spring-cloud/zipkin-0.9
Updates to zipkin 0.9
2016-03-18 20:20:58 +08:00
Marcin Grzejszczak
6a2186b26c Trying to make Bamboo work 2016-03-18 11:30:37 +01:00