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
bd4c33c4b0
Merge branch 'master' into 2.0.x
2017-07-11 17:01:18 +02:00
Marcin Grzejszczak
8a6f5536f0
Updated docs
2017-07-11 17:00:36 +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
6ef4a27d42
Merge branch 'master' into 2.0.x
2017-07-07 16:10:10 +02:00
Marcin Grzejszczak
e93db03544
Updated reactor code
2017-07-07 16:10:02 +02:00
Marcin Grzejszczak
a3e3d362f8
Merge branch 'master' into 2.0.x
2017-07-07 13:55:57 +02:00
Marcin Grzejszczak
27217619da
Migrated packages to instrument.reactor
2017-07-07 13:55:48 +02:00
Marcin Grzejszczak
3b85028058
Merge branch 'master' into 2.0.x
2017-07-07 11:32:51 +02:00
Marcin Grzejszczak
d02f3fb3e5
Added missing entry in the sleuth BOM
2017-07-07 11:32:44 +02:00
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
