Canaan Stafford
7dffabd91a
Expand type check in TraceChannelInterceptor ( #673 )
...
The type check in the method 'getMessage' was only for a sub-class of
MessagingException. The check was expanded to the base class.
2017-08-05 22:10:54 +02:00
Marcin Grzejszczak
54fb349884
Merge branch 'master' into 2.0.x
2017-08-04 12:02:24 +02:00
Marcin Grzejszczak
09862f3516
Updated poms
2017-08-04 11:53:27 +02:00
Marcin Grzejszczak
48227e7793
Returns proper message; fixes #669
2017-08-04 11:52:31 +02:00
Marcin Grzejszczak
f99c52f2d8
Merge branch 'master' into 2.0.x
2017-08-03 17:56:57 +02:00
Marcin Grzejszczak
883a8d4e24
Merge branch '1.2.x'
2017-08-03 17:56:47 +02:00
Marcin Grzejszczak
aadf0a8334
Added support for failed messages
...
without this change when messages arrive at a error channel a new traceid is set
with this change we continue the trace
fixes #667
2017-08-03 17:50:47 +02:00
Dave Syer
d955c131e8
Merge branch 'master' into 2.0.x
2017-07-26 12:57:17 +01:00
Dave Syer
b60620239c
Remove IntroductionAdvisor from SleuthAdvisorConfig
...
Fxies gh-659
2017-07-26 12:56:09 +01:00
Dave Syer
c43345f197
Merge branch 'master' into 2.0.x
2017-07-26 11:52:10 +01:00
Dave Syer
540c95895a
Remove redundant method matcher
...
Fixes gh-658
2017-07-26 11:51:23 +01:00
Marcin Grzejszczak
e8d30be75e
Going back to snapshots
2017-07-21 12:58:54 +02:00
Marcin Grzejszczak
932f8e74d3
Update SNAPSHOT to 1.2.2.RELEASE
2017-07-21 12:30:53 +02:00
Marcin Grzejszczak
7b11141cd7
fix #646 : Filter fused flows from tracing
2017-07-21 11:31:43 +02:00
Marcin Grzejszczak
2ebba99c4e
Reverting the change
2017-07-20 11:58:10 +02:00
Marcin Grzejszczak
cee2de9b81
Merge branch 'master' into 2.0.x
2017-07-20 10:39:16 +02:00
Marcin Grzejszczak
b94efb90a1
fix #646 : Filter fused flows from tracing
2017-07-20 10:38:09 +02:00
Marcin Grzejszczak
8c98386c14
WIP
2017-07-15 19:39:48 +02:00
Marcin Grzejszczak
362f20d0a8
WIP
2017-07-15 15:15:39 +02:00
Marcin Grzejszczak
0f39563802
Merge branch 'master' into 2.0.x
2017-07-15 10:17:34 +02:00
Marcin Grzejszczak
bddad6e2bc
Merge branch '1.2.x'
2017-07-15 10:17:16 +02:00
Marcin Grzejszczak
87411d760c
Ensured lower case of baggage keys
...
fixes #641
2017-07-15 10:14:39 +02:00
Marcin Grzejszczak
e6e893e786
Merge branch 'master' into 2.0.x
2017-07-14 12:54:40 +02:00
Marcin Grzejszczak
b5120b11ff
Merge branch '1.2.x'
2017-07-14 12:45:24 +02:00
Marcin Grzejszczak
aaf191e4c6
Logs are no longer altered when sleuth is disabled
...
fixes #638
2017-07-14 12:33:57 +02:00
Marcin Grzejszczak
464a272ca5
Changed optional attribute to standard one
2017-07-13 13:20:38 +02:00
Marcin Grzejszczak
64305ca5f1
Merge branch 'master' into 2.0.x
2017-07-13 11:45:46 +02:00
Marcin Grzejszczak
7a7cacb7c5
Merge branch '1.2.x'
2017-07-12 18:51:46 +02:00
Marcin Grzejszczak
be81264398
Added missing span continuation in AsyncRestTemplate
...
fixes #636
2017-07-12 18:50:56 +02:00
Marcin Grzejszczak
051b23920b
Updated code to Boot 2.0.0
2017-07-12 18:27:33 +02:00
Marcin Grzejszczak
2ce1946433
Fixed not clearing trace attribute on closed span
...
due to this Zuul spans have been improperly closed and the span remained in the main thread. After sending enough requests the traces started to be reused by the worker threads.
fixes #634
2017-07-12 18:19:16 +02:00
Marcin Grzejszczak
2a38230bb6
Merge branch '1.2.x'
2017-07-12 18:09:15 +02:00
Marcin Grzejszczak
feac9980da
Fixed not clearing trace attribute on closed span
...
due to this Zuul spans have been improperly closed and the span remained in the main thread. After sending enough requests the traces started to be reused by the worker threads.
fixes #634
2017-07-12 18:08:43 +02:00
Marcin Grzejszczak
f32600a57c
Update TraceWebFilter.java
2017-07-11 19:04:50 +02:00
Marcin Grzejszczak
e1cf6b7777
Added tags for the server side spans
2017-07-11 17:47:24 +02:00
Marcin Grzejszczak
db98d82b0f
Fixed checkstyle
2017-07-11 17:02:57 +02:00
Marcin Grzejszczak
1899e7bb27
Made ordered
2017-07-11 13:45:27 +02:00
Marcin Grzejszczak
23205d5262
Fixed unnecessary rx java hook reset
2017-07-11 13:00:33 +02:00
Marcin Grzejszczak
49eac36d26
Added intial webclient & webflux support
...
fixes #635
2017-07-11 12:34:27 +02:00
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
