Marcin Grzejszczak
24c1471f92
Merged 1.2.x into master
2017-08-14 10:33:58 -04:00
Marcin Grzejszczak
253b34b1cf
Fixed missing interceptor injection in OAuth2RestTemplate
...
fixes #581
2017-08-14 10:10:38 -04:00
Marcin Grzejszczak
e0ad6214c0
Trying to fix the build
2017-08-13 18:01:02 -04:00
Marcin Grzejszczak
f08a92bd10
Trying to fix the build
2017-08-13 17:51:54 -04:00
Marcin Grzejszczak
9ed2e87fa0
Trying to fix the build
2017-08-07 22:52:41 +02:00
Marcin Grzejszczak
af19b5c4c8
Fixed hooks
2017-08-07 10:30:29 +02:00
Marcin Grzejszczak
88233bf718
Fixing Reactor
2017-08-05 22:59:38 +02:00
Marcin Grzejszczak
8fb7de4c64
Merge branch 'master' into 2.0.x
2017-08-05 22:55:28 +02:00
Marcin Grzejszczak
df81c1abbe
Polish
2017-08-05 22:52:31 +02:00
Stephane Maldini
e698607184
Sync with reactor-core 3.1.B-S latest hooks updates ( #672 )
2017-08-05 22:13:09 +02:00
Marcin Grzejszczak
57f24c7ce8
Merge branch 'master' into 2.0.x
2017-08-05 22:11:30 +02:00
Marcin Grzejszczak
3034497617
Merge branch '1.2.x'
2017-08-05 22:11:13 +02:00
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
44804d9391
Updated pom
2017-08-04 11:38:33 +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
Marcin Grzejszczak
d71c55f290
Added webflux and webclient to docs
2017-08-03 16:09:55 +02:00
Marcin Grzejszczak
4d5156bca7
Started to publish test core jar
2017-08-03 11:09:31 +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
Dave Syer
5ad34cf6e6
Add startup benchmarks
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
e8eef5ad62
Merge branch 'master' into 2.0.x
2017-07-21 11:39:28 +02:00
Marcin Grzejszczak
e76be78512
Updated Zipkin Properties with Javadocs
2017-07-21 11:39:21 +02:00
Pavol Loffay
cbbb3c2a40
Zipkin settings add thrift encoding ( #650 )
...
* Zipkin settings add thrift encoding
2017-07-21 11:34:30 +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
Stephane Maldini
1d50aded1c
fix #646 : Filter fused flows from tracing ( #648 )
2017-07-20 10:29:47 +02:00
Marcin Grzejszczak
271719d22d
Merge branch 'master' into 2.0.x
2017-07-18 10:33:48 +02:00
Marcin Grzejszczak
0efd29de35
Merge branch '1.2.x'
2017-07-18 10:33:40 +02:00
Marcin Grzejszczak
5d773d85d8
Added Circle CI 2.0 support
2017-07-18 10:33:31 +02:00
Marcin Grzejszczak
f4567ba465
Merge branch 'master' into 2.0.x
2017-07-15 22:04:06 +02:00
Marcin Grzejszczak
64a9577e4c
Moved zipkin load balancing to runtime
...
without this change we resolved the Zipkin URL only at startup
with this change whenever we are to send a span to Zipkin we will try to resolve the URL via Discovery Client (if applicable)
fixes #642
2017-07-15 22:02:57 +02:00
Marcin Grzejszczak
f2104620df
Merge branch 'master' into 2.0.x
2017-07-15 19:52:43 +02:00
Marcin Grzejszczak
a626632b40
Added support for service discovery based Zipkin URL resolution
2017-07-15 19:50:05 +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
