Commit Graph

684 Commits

Author SHA1 Message Date
Marcin Grzejszczak
931b3b7f3b Removed property setting of proxy targetClass 2017-07-06 16:08:16 +02:00
Marcin Grzejszczak
d37231b828 Merge branch 'master' into 2.0.x 2017-07-06 15:56:45 +02:00
Marcin Grzejszczak
c47d20ce9e Adding an option to override the spring.aop.proxyTargetClass
without this change we force everyone to use CGLIB
with this change we fix the way we weave Executors (that was the reason for not being able to turn the flag off) and we're adding an option to switch CGLIB weaving off. `spring.aop.proxyTargetClass` will be by default `true` in Boot 2.0.x

fixes #584
2017-07-06 15:56:29 +02:00
Marcin Grzejszczak
26c69dcf8f Removed deprecated api 2017-07-06 12:37:19 +02:00
Marcin Grzejszczak
325639261d Merge branch 'master' into 2.0.x 2017-07-06 12:25:45 +02:00
Marcin Grzejszczak
4158443ad7 Merge branch '1.2.x' 2017-07-06 12:25:35 +02:00
Marcin Grzejszczak
050dfe9bdf Added missing error setting on the span in zuul pre filters
without this change when an exception is thrown in a filter we're not setting the error message as a tag.

fixes #616
2017-07-06 12:23:49 +02:00
Marcin Grzejszczak
e36c33be41 Merge branch '1.2.x' into 2.0.x 2017-07-06 11:55:43 +02:00
Marcin Grzejszczak
6b1d0397ca Merge branch '1.2.x' 2017-07-06 11:55:33 +02:00
Marcin Grzejszczak
a977e4ae0e Added missing methods to override in SleuthHystrixConcurrencyStrategy
according to issue #612:
> When 2 or more customized HystrixConcurrencyStrategy are registered (e.g SleuthHystrixConcurrencyStrategy and SecurityContextConcurrencyStrategy) depending on the order of registration the overrides from SecurityContextConcurrencyStrategy might get ignored.
I think the override and delegation should be made all methods of HystrixConcurrencyStrategy otherwise the delegation will possibly be incomplete.

fixes #612
2017-07-06 11:54:21 +02:00
Marcin Grzejszczak
be65f3cde2 Merge branch 'master' into 2.0.x 2017-07-03 08:11:57 +02:00
Marcin Grzejszczak
373e56f94b Merge 2017-07-03 08:11:42 +02:00
Marcin Grzejszczak
e5fafb8d77 Merge branch '1.2.x' 2017-07-03 08:11:37 +02:00
Marcin Grzejszczak
2a09be747d Making Hystrix + Feign opt in
without this change we allways force Feign to use Hystrix
with this change you need to pass the `feign.hystrix.enabled=true` flag to turn it on

fixes #627
2017-07-03 08:00:40 +02:00
Marcin Grzejszczak
361e1eaa3c Merge branch 'master' into 2.0.x 2017-06-30 11:30:15 +02:00
Marcin Grzejszczak
3d3201aa17 Merge branch '1.2.x' 2017-06-30 11:30:01 +02:00
Marcin Grzejszczak
c3e90e4e21 Fixed NPE for error parser 2017-06-30 11:29:53 +02:00
Marcin Grzejszczak
56457ce849 Going back to snapshots 2017-06-29 17:04:01 +02:00
Marcin Grzejszczak
0f5e28d078 Update SNAPSHOT to 2.0.0.M1 2017-06-29 16:59:54 +02:00
Marcin Grzejszczak
da629f78d3 Merge branch 'master' into 2.0.x 2017-06-29 08:55:59 +02:00
Marcin Grzejszczak
2f6a8df5fe Removes deprecations; fixes #621 2017-06-29 08:49:40 +02:00
Marcin Grzejszczak
0f28a43444 Merge branch 'master' into 2.0.x 2017-06-27 15:39:27 +02:00
Marcin Grzejszczak
92d7c3443a Bumped libraries
awaitillity to 3.0.0
 wiremock to 2.6.0
 junit params to 1.1.0
 assertj to 3.8.0

fixes #620
2017-06-27 15:05:39 +02:00
Marcin Grzejszczak
474493a54d Bumped libs 2017-06-27 14:02:43 +02:00
Marcin Grzejszczak
dabdb41d86 Merge branch 'master' into 2.0.x 2017-06-27 13:52:44 +02:00
Suttichort Sarathum
c902680244 Add missing implementation of shutdown method 2017-06-27 13:50:54 +02:00
Marcin Grzejszczak
b67ab62cb8 Merge branch 'master' into 2.0.x 2017-06-07 10:41:44 +02:00
Marcin Grzejszczak
cc00e3ae80 Making baggage keys case insensitive
fixes #605
2017-06-07 10:40:57 +02:00
Marcin Grzejszczak
72a609411f Polish 2017-06-06 09:37:54 +02:00
Marcin Grzejszczak
f834e5222b Added the ErrorParser interface
without this change there's no way to alter the exception message that gets attached as a tag to the span
    with this change you can register your own ErrorParser bean to alter that behaviour

    fixes #576
2017-06-06 08:05:27 +02:00
Marcin Grzejszczak
c7fb883e54 Merge branch 'master' into 2.0.x 2017-06-06 07:56:04 +02:00
Marcin Grzejszczak
6a0a57ef7f Fixed percentage value in percentage based sampler
fixes #608
2017-06-06 07:54:17 +02:00
Marcin Grzejszczak
c2d9c4b94e Should be working 2017-06-02 19:57:37 +02:00
Marcin Grzejszczak
83cc5b8064 Fixing tests 2017-06-02 17:10:42 +02:00
Marcin Grzejszczak
ddf4ea131d WIP 2017-06-02 13:58:09 +02:00
Marcin Grzejszczak
95e14c0a68 Polish 2017-06-01 13:03:50 +02:00
svenz
e783df88a0 Cleanup test case based on review comments 2017-05-30 19:19:27 -07:00
svenz
6948088085 https://github.com/spring-cloud/spring-cloud-sleuth/issues/597
Fix Http headers as tags
2017-05-29 13:49:55 -07:00
Marcin Grzejszczak
419ec7232a Fixed the Duplicate Trace Header Propagation for Zuul Proxy Applications
without this change we're always setting values for headers regardless of the fact whether they have already been set.
with this change we're only setting headers if there was no any previous value of the header

fixes #586
2017-05-27 02:58:58 +02:00
Marcin Grzejszczak
802fbb63a6 Added a NPE check for trace web aspect
without this change if there's no tracing an NPE is thrown in TraceWebAspect

fixes #596
2017-05-26 19:31:37 +02:00
Kamil Szymański
63c79033db Tracer#detach(Span) docs fix (#580) 2017-05-26 18:42:55 +02:00
Marcin Grzejszczak
91a8e51599 Bumping versions to 1.2.2.BUILD-SNAPSHOT after release 2017-05-23 00:13:03 +02:00
Marcin Grzejszczak
23f9c58116 Going back to snapshots 2017-05-23 00:13:02 +02:00
Marcin Grzejszczak
4f2139e6d6 Update SNAPSHOT to 1.2.1.RELEASE 2017-05-23 00:10:34 +02:00
Marcin Grzejszczak
61897b6965 Changed a single adjuster to a list of them
with this change we're injecting a list of adjusters instead of a single one. That way you don't have to create a composite version
of adjusters.

fixes #595
2017-05-22 17:38:42 +02:00
Marcin Grzejszczak
a5a898a06b Trying to fix flickering tests 2017-05-12 18:52:52 +02:00
Marcin Grzejszczak
ccbc2fa111 Merge branch '1.1.x' 2017-05-08 11:26:18 +02:00
Marcin Grzejszczak
9d84812de8 Added javadocs for SpanAccessor, fixes #587 2017-05-08 11:26:10 +02:00
Marcin Grzejszczak
4d6d2ebcc7 Merge branch '1.1.x' 2017-05-08 11:05:09 +02:00
Marcin Grzejszczak
11f8cd7f14 Fixed invalid constructor 2017-05-08 10:57:20 +02:00