Commit Graph

773 Commits

Author SHA1 Message Date
Marcin Grzejszczak
6456709020 Update to SNAPSHOT 2016-06-10 15:56:21 +02:00
Marcin Grzejszczak
8f726cb514 Update SNAPSHOT to 1.0.1.RELEASE 2016-06-10 15:38:37 +02:00
Marcin Grzejszczak
0a188cd8df Extracted a method for readability purposes 2016-06-10 15:09:40 +02:00
Marcin Grzejszczak
7cd49319dc Bumped up logging level to DEBUG 2016-06-10 09:31:21 +02:00
Marcin Grzejszczak
65796e9aa2 Added client side tags for zuul (#302)
Now when a request is sent via Zuul, the HTTP client side tags will be added to the request
2016-06-10 08:53:01 +02:00
Marcin Grzejszczak
fbfed722c7 Altered tests 2016-06-09 21:42:57 +02:00
Marcin Grzejszczak
0f60e5bf67 Fixed the issues with Zuul exception handling (#300)
TraceFilter no longer is a OncePerRequestFilter
TraceFilter processes the request that is executed upon ERROR dispatch (the logs will be present there)
Altered the logic in TraceFilter that an already processed request will not be detached (which resulted in an exception)
Added some debugging to instrumentation
Added assertion over a list of spans
Bumped up SC-Netflix to 1.1.2.BUILD-SNAPSHOT
Added Zuul integration tests
Added Http keys injection to Zuul client call
2016-06-09 18:26:46 +02:00
Marcin Grzejszczak
e9cfe6d2ab Lowered logging level for RxJava hook - in debug mode it's present every second 2016-06-07 15:20:12 +02:00
Marcin Grzejszczak
5f716611ae Fixed the missing spanid in incoming http request
until now if traceid was set and span id wasn't we were generating a new span id. That approach was wrong since
1) there shouldn't be such a situation in the first place (you have to have neither or both headers set)
2) if there is one we should assume that the span is the root one

so ATM in case of missing span id we are placing the trace id value there.
2016-06-07 15:07:10 +02:00
Marcin Grzejszczak
23d9b23cec Fixed a typo 2016-06-07 14:11:56 +02:00
Marcin Grzejszczak
8856854002 Fixed duplicated logs in tracefilter 2016-06-07 10:17:32 +02:00
Marcin Grzejszczak
a613e8a0e4 Changed aspect into filter with custom dispatch (#297) 2016-06-06 12:25:37 +02:00
Marcin Grzejszczak
7e215aac82 Added aspect that closes spans for wrong http responses (#296)
with this change trace filter is not closing all spans. It's closing only spans when the response is successful. If the response status is 4xx,5xx then an exception controller should start processing the response. At the end of the day an aspect will close the span once the controller has finished processing.

fixes #278
2016-06-06 10:20:18 +02:00
Dave Syer
2b058be77e Update tp mvn 3.3.9 2016-06-04 09:14:48 +01:00
Marcin Grzejszczak
a194c4a17a Added list of threads to ignore for rx (#294)
fixes #274

* Updates following code review
2016-06-02 19:20:12 +02:00
Marcin Grzejszczak
a3dc021ec4 Added a test for deferred result returning controller 2016-05-31 13:41:49 +02:00
Marcin Grzejszczak
d30efca703 Updated HTTP client side span with HTTP tags
After this change when sending an HTTP request, the client side span will have all the necessary HTTP related tags.

Fixes #290
2016-05-31 09:31:55 +02:00
Marcin Grzejszczak
a7480880ea Fixed sonar suggestion 2016-05-28 23:43:57 +02:00
Marcin Grzejszczak
4f9a953285 Decreased visibility of TraceFeignContext 2016-05-27 09:01:39 +02:00
Marcin Grzejszczak
0a0d36053d Cloning the Retryer
@dpalita's suggested that since Default Retryer implemenation is not thread-safe we have to clone the delegate. And obviously he's right!
2016-05-27 08:52:47 +02:00
Marcin Grzejszczak
00d06a17c0 Fixed wrong cloning of TraceFeignRetryer
ATM we're cloning the retryer with the default retryer as a delegate. We should be honouring the retryer that the user has provided.

Fixes #291
2016-05-27 08:19:18 +02:00
Marcin Grzejszczak
358d0b16b5 Issues #286 custom feign config (#289)
After this change a custom FeignContext is created that before returning instance  or instances of beans will wrap, if necessary, that bean into a tracing representation. That way all the custom Feign configurations will have wrapped beans and tracing will get propagated.

Fixes #286
2016-05-25 18:12:06 +02:00
Pei-Tang Huang
f729781734 Fixed typo. (#277) 2016-05-24 10:14:56 +02:00
Marcin Grzejszczak
af70f0dde1 Fixing CGLIB issue with Spring Boot 1.4.0 2016-05-19 17:01:57 +02:00
Marcin Grzejszczak
f8ed14bd5b Revert "Fixed tests with a workaround"
This reverts commit 94ed8cfe4b.
2016-05-12 10:10:49 +02:00
Dave Syer
fc29838b86 Update to 1.0.1 snapshots 2016-05-11 09:21:54 +01:00
Spencer Gibb
feeb8bda0c Revert "Update SNAPSHOT to 1.0.0.RELEASE"
This reverts commit 4b347228a3.
2016-05-10 15:27:39 -06:00
Spencer Gibb
4b347228a3 Update SNAPSHOT to 1.0.0.RELEASE 2016-05-10 15:21:44 -06: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
Dave Syer
7dc30191cc Revert to snapshots 2016-04-18 15:11:14 +01:00
Dave Syer
7b40b9808e Update to RC2 2016-04-18 15:09:54 +01: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