Commit Graph

284 Commits

Author SHA1 Message Date
Marcin Grzejszczak
f8ed14bd5b Revert "Fixed tests with a workaround"
This reverts commit 94ed8cfe4b.
2016-05-12 10:10:49 +02:00
Marcin Grzejszczak
f7b1fc5fce Removing custom RxJavaPlugins reset impl.
With RxJava 1.1.4, `RxJavaPlugins.reset()` method has been made public (though `experimental`). With this update, we no longer require to manually wrapp and expose the `reset()` method of RxJavaPlugins. This PR is in conjunction with [Spring-Cloud-Netflix PR] (https://github.com/spring-cloud/spring-cloud-netflix/pull/1007) since RxJava version is maintained as a part of that dependency. Merge this PR only after the Spring-Cloud-Netflix PR is merged to avoid compile errors.
2016-05-09 18:09:56 +02:00
Marcin Grzejszczak
657bba35b3 Sampling child span
when parent is null, the created child span will be sampled

    fixes #271
2016-05-09 18:01:01 +02:00
Marcin Grzejszczak
94ed8cfe4b Fixed tests with a workaround
had to add @EnableIntegration. Will remove it once https://github.com/spring-projects/spring-boot/issues/5901 is resolved
2016-05-09 17:28:58 +02:00
Dave Syer
47f74c7500 Ignore adhoc tests again 2016-05-06 15:21:31 +01:00
Dave Syer
9ce77ad22a Refactor some tests to work with Spring Boot 1.4 2016-05-06 15:16:14 +01:00
Dave Syer
c14f803363 Tidy up some dependencies
Removes wiremock as a test dependency in core (which created more
issues than you might expect because Tomcat and Jetty don't treay
HTTP headers in the same way apparently).

Also moves the spring-messaging dependency to where it is needed
in sleuth stream.
2016-05-04 11:23:03 +01:00
Marcin Grzejszczak
a724dd3efc Removed unnecessary colon 2016-05-04 11:17:45 +02:00
Marcin Grzejszczak
645845e88c Upgraded the percentage based sampler algorithm 2016-04-29 16:00:59 +02:00
Marcin Grzejszczak
db0e3097d2 I've reused the algorithm from Zipkin CalculatingSampler#fixes #260* Changed the algo to counting one* Added comments* Made tests intolerant to errors* Fixed checkstyle
I've reused the algorithm from Zipkin CountingTraceIdSampler

fixes #260
2016-04-29 13:18:43 +02:00
Marcin Grzejszczak
2d87fed521 Closing on error decoding
when an exception was thrown by Feign it was not caught by our Feign customizations and wasn't properly closed. By adding a custom implementation we're closing span whenever an exception is thrown.

Fixes #257
2016-04-27 12:22:51 +02:00
Dave Syer
24f65fd65f Tidy up SleuthRxJavaPlugins
It doesn't need to extend RxJavaPlugins, and this change makes the
deprecation less of a mess.
2016-04-25 11:13:56 +01:00
Marcin Grzejszczak
6cd3161599 Removing entries from MDC (#252)
when iterating over saved spans during span closing we can apply a function that should be executed on each iteration.

fixes #248
2016-04-21 17:06:42 +02:00
Marcin Grzejszczak
b047d7a9bc Added docs with an example of CompletableFuture usage - fixed executor service 2016-04-19 10:19:12 +02:00
Marcin Grzejszczak
2806747c6e Added docs with an example of CompletableFuture usage 2016-04-19 10:01:32 +02:00
Marcin Grzejszczak
8f8b9893f0 Easier Async configuration (#251)
added possibility to provide in an easy way custom client request factories

fixes #236
2016-04-15 12:03:01 +02:00
Marcin Grzejszczak
b5ba1c00db Stopping parent before reporting
The problem resulted in wrong span durations. The issue was such that for the case where span from request has a parent that needs to be reported we didn't stop that parent. That means that it has value of 'end' equal to 0. In that situation the duration of Span was calculated as a difference between current time and the start time. We should never report spans that have not been stopped - otherwise that stopping will take place a lot of time later.

fixes #247
2016-04-11 15:24:49 +02:00
Marcin Grzejszczak
d46f2ae30d Improved RxJava tests 2016-04-05 14:35:04 +02:00
Marcin Grzejszczak
b1a34d2892 Fixed the broken test 2016-04-05 09:37:51 +02:00
Marcin Grzejszczak
7de50918ee Trying to fix Travis - coming back to subscriptions on call 2016-04-04 20:04:51 +02:00
Marcin Grzejszczak
4e7e04c281 Trying to fix Travis - awaiting until event is emited 2016-04-04 19:41:20 +02:00
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
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