Marcin Grzejszczak
1901c04751
Merge branch 'master' into 2.0.x
2017-07-07 11:28:52 +02:00
Marcin Grzejszczak
3e7e54e09b
Initial Reactor support
2017-07-07 11:16:17 +02:00
Marcin Grzejszczak
fd6bfd6707
Merge branch '1.2.x'
2017-07-06 16:24:20 +02:00
Adrian Cole
51437503a1
Updates to latest zipkin stuff ( #629 ) ( #630 )
...
* zipkin core library has Endpoint.Builder.parseIp now
* reporter being 1.0 is just announcing we won't break compat
2017-07-06 16:24:07 +02:00
Marcin Grzejszczak
18969f063e
Merge branch 'master' into 2.0.x
2017-07-06 16:08:30 +02:00
Marcin Grzejszczak
931b3b7f3b
Removed property setting of proxy targetClass
2017-07-06 16:08:16 +02:00
Adrian Cole
70ec026ce0
Updates to latest zipkin stuff ( #629 )
...
* zipkin core library has Endpoint.Builder.parseIp now
* reporter being 1.0 is just announcing we won't break compat
2017-07-06 16:00:35 +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
ac984637fb
Merge branch 'master' into 2.0.x
2017-07-06 14:14:02 +02:00
Marcin Grzejszczak
1e84290bb4
Merge branch '1.2.x'
2017-07-06 14:13:52 +02:00
Marcin Grzejszczak
f08b3057ab
We no longer set SA for peer.service
...
fixes #619
2017-07-06 14:04:51 +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
0429818394
Merge branch 'master' into 2.0.x
2017-06-29 16:42:47 +02:00
Marcin Grzejszczak
c97210982a
Merge branch '1.2.x'
2017-06-29 16:42:31 +02:00
Marcin Grzejszczak
a159a87af7
Fixed wrong milestone repo
2017-06-29 16:42:18 +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
da7625cba1
Added missing import
2017-06-06 09:26:10 +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
215577a31c
Updated cli
2017-06-05 17:40:35 +02:00
Marcin Grzejszczak
ff2c83741c
Bumped netflix
2017-06-05 15:11:36 +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
