Commit Graph

773 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
Shivang Shah
beafc3a5a7 Support rx java
RxJava Support

fixes #235
2016-04-04 16:40:45 +02: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
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
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
Marcin Grzejszczak
900b4758b7 Messages don't log events even though they should 2016-03-30 17:01:21 +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
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
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
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
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
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
Marcin Grzejszczak
6a2186b26c Trying to make Bamboo work 2016-03-18 11:30:37 +01:00
Dave Syer
600c1ce544 Fix compiler error with javac 2016-03-17 20:23:09 +00:00
Dave Syer
ef1c91b24d Use JSON for span transport with Stream by default
User can still override it and Stream should adjust itself, but
now we have JSON flowing between instrumented apps and the Zipkin
server.

Fixes gh-217
2016-03-17 20:04:31 +00:00
Marcin Grzejszczak
bb456ffab2 Trying to fix build 2016-03-17 16:56:23 +01:00
Marcin Grzejszczak
5e7654d329 Fixed issues with not seting Sleuth HystrixConcurrencyStrategy 2016-03-17 16:27:40 +01:00
Dave Syer
35ba7bab95 Ensure that BPP dependencies are not created too early
The FeignBeanPostProcessor was causing other things to misbehave
by forcing early instantiation of all its dependencies. One of those
is a @MessageEndpoint when Sleuth Stream is in use, and the annotation
wasn't being processed because the bean was processed too early.
2016-03-17 11:29:46 +00:00
Marcin Grzejszczak
d365fedbc0 Removed cycle between log -> autoconfig 2016-03-17 08:31:07 +01:00
Marcin Grzejszczak
064debb94b Limited visibility of MessagingSpanIjnector 2016-03-16 16:59:21 +01:00
Marcin Grzejszczak
4d6fbd29bb Added missing conditionals
without it if you provide `spring.sleuth.enaled:false` the app would blow up
2016-03-16 16:31:42 +01:00
Marcin Grzejszczak
3bb7916fff Customizable headers
* Fixed the HttpServlet extractors
    (now the response can contain custom headers)
    * Changed header names to be Zipkin compatible
    * removed qualifiers and properties
    * updated the docs

fixes #19
2016-03-16 16:10:28 +01:00
Marcin Grzejszczak
7c5af8c84e [#19] Introduced SpanInjector and SpanExtractor 2016-03-15 14:33:39 +01:00
Marcin Grzejszczak
146f7f652b Removed events and replaced them with method calls
fixes #156
2016-03-13 10:37:01 +01:00
Dave Syer
84c57d9701 Fix test so it compiles in Eclipse
Maybe a JDT bug, but this version is more readable IMO anyway.
2016-03-11 09:27:21 +00:00
Marcin Grzejszczak
fb60381766 Fixed checkstyle issues 2016-03-11 10:06:02 +01:00
Marcin Grzejszczak
e4bcd13b8c Added tests 2016-03-10 14:28:05 +01:00
Marcin Grzejszczak
045bfc5317 Updated docs 2016-03-10 12:14:27 +01:00
Marcin Grzejszczak
c1648124f5 [#209] Skip pattern for Scheduled
fixes #209
2016-03-10 10:37:49 +01:00
Marcin Grzejszczak
cda62174d8 Added tests for Zuul Rest Client Ribbon 2016-03-09 18:53:12 +01:00
Marcin Grzejszczak
9c3e4909fb Merge pull request #204 from spring-cloud/issues_#187_managementserverprops
[#187] Adds ManagementProperties contextPath to skipPattern
2016-03-09 18:52:40 +01:00
Marcin Grzejszczak
24fa3514da Added missing tests 2016-03-09 17:49:27 +01:00
Marcin Grzejszczak
4f4aa25a5d [#187] Adds ManagementProperties contextPath to skipPattern
Fixes #187
2016-03-09 15:37:02 +01:00
Marcin Grzejszczak
c3722f3c74 [#205] Deferring endpoint localization
- added `/health` endpoint to be skipped by trace filter

fixes #205
2016-03-09 15:16:26 +01:00
Marcin Grzejszczak
c424453b0e Added more tests for websockets 2016-03-08 12:20:45 +01:00