Commit Graph

123 Commits

Author SHA1 Message Date
Spencer Gibb
8ba5b661f3 Merge branch 'master' into 2.0.x 2017-10-18 14:51:44 -04:00
Spencer Gibb
a822e84711 Update DiscoveryClientHostLocator to use Registration.
Leave deprecated constructor with use of deprecated DiscoveryClient.getLocalServiceInstance()

see https://github.com/spring-cloud/spring-cloud-commons/issues/265
2017-10-18 14:51:24 -04:00
Marcin Grzejszczak
16220f6df8 Merge branch 'master' into 2.0.x 2017-10-18 19:04:22 +02:00
Marcin Grzejszczak
c3f8c2d8e5 Changed to RelaxedPropertyResolver from Environment 2017-10-18 18:50:17 +02:00
Marcin Grzejszczak
0439a7c7b0 Merge branch 'master' into 2.0.x 2017-10-18 18:07:57 +02:00
Marcin Grzejszczak
d02c62bb44 Resolve service name at runtime when sending a span to Zipkin; fixes #749 2017-10-18 16:18:41 +02:00
Marcin Grzejszczak
0673dc1eef Merge branch 'master' into 2.0.x 2017-10-16 10:23:40 +02:00
Marcin Grzejszczak
83be1229a1 Fixed case of stream headers 2017-10-16 10:23:33 +02:00
Marcin Grzejszczak
bb8dd93718 Merge branch 'master' into 2.0.x 2017-10-16 09:56:51 +02:00
Marcin Grzejszczak
93682d44dd Merge branch '1.2.x' 2017-10-16 09:56:41 +02:00
Marcin Grzejszczak
9ec8283101 Spring Cloud Sleuth is treating comma separated Stream headers in an invalid way
without this change when you pass Stream message headers that are comma separated, Sleuth fails to add proper binding properties for them
with this change we try to first split the headers (assuming that they might be comma based) and then we generate the proper header binding properties

fixes #742
2017-10-16 09:56:27 +02:00
Marcin Grzejszczak
c82c52b5ce Fixed some tests 2017-10-04 16:31:51 +02:00
Marcin Grzejszczak
88c007698e Merge branch 'master' into 2.0.x 2017-09-30 18:55:49 +02:00
Marcin Grzejszczak
1937d15553 Merge branch '1.2.x' 2017-09-30 18:55:37 +02:00
Marcin Grzejszczak
16cd03a82b Ensured that the stream auto configuration gets registered after the Integration one; fixes #719 2017-09-30 18:55:25 +02:00
Marcin Grzejszczak
535e9f88ef Merge branch 'master' into 2.0.x 2017-09-29 12:21:30 +02:00
Marcin Grzejszczak
1311bbb39e Ignored all broken tests 2017-09-29 11:38:31 +02:00
Marcin Grzejszczak
4bf4484dcd Merge branch '1.2.x' 2017-09-19 10:59:58 +01:00
Marcin Grzejszczak
867a49bac8 Reusing environment to get address; fixes #701 2017-09-19 10:59:51 +01:00
Marcin Grzejszczak
db5e16f998 Merge branch 'master' into 2.0.x 2017-08-25 12:04:41 +02:00
Marcin Grzejszczak
b83caf4ac0 Polish 2017-08-25 11:52:14 +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
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
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
bf27382ca8 Fixes the way span adjusters are injected
without this you can't start the context when seuth is disabled
with this change we can autowire an empty list

fixes #600
2017-06-01 14:11:26 +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
54ae618815 Merge branch '1.1.x' 2017-04-19 10:46:59 +02:00
Marcin Grzejszczak
64791deabd Span Adjuster (#567)
with this change, we're adding a possibility to fully customize the span before it gets reported to e.g. Zipkin

fixes #553
2017-04-19 10:35:48 +02:00
Marcin Grzejszczak
816cfe317a Moved an executor aspect to a bean post processor
without this change when an executor implementation was a final class or had a final method - the application wouldn't start or would produce NPE at startup.
    with this change we have a custom bean post processor that wraps an aspect manualy either via a JDK Proxy when a class is final or a method is final or creates a CGLIB proxy if that's possible.

    fixes #550
2017-04-12 12:14:45 +02:00
Marcin Grzejszczak
46257ea370 Moved an executor aspect to a bean post processor
without this change when an executor implementation was a final class or had a final method - the application wouldn't start or would produce NPE at startup.
    with this change we have a custom bean post processor that wraps an aspect manualy either via a JDK Proxy when a class is final or a method is final or creates a CGLIB proxy if that's possible.

    fixes #550
2017-04-12 12:02:39 +02:00
Marius Bogoevici
d0cf7381a4 Fix autoconfiguration ordering with Sleuth Stream (#557)
Fix #556

* Explicitly state that `StreamSleuthAutoConfiguration` should
  execute before `TraceAutoConfiguration`;
* Also ensure that `ChannelsEndpointAutoConfiguration` is configured
  after `StreamSleuthAutoConfiguration` to ensure that the bound
  channels are added to the `/channels` actuator endpoint
2017-04-07 07:10:41 +02:00
Marcin Grzejszczak
34dfb68a82 Yet another try with flickering tests 2017-02-28 10:28:00 +01:00
Marcin Grzejszczak
c8fd5aece5 Removed the flickering test 2017-02-28 09:08:04 +01:00
Marcin Grzejszczak
7b7ceefb0a Reverting the flickering fix
it has become even more flickering
2017-02-27 17:33:20 +01:00
Marcin Grzejszczak
6bb8b996e5 Trying to fix flickering 2017-02-27 16:41:52 +01:00
Marcin Grzejszczak
d1b4f73512 Trying to fix flickering 2017-02-27 16:41:41 +01:00
Marcin Grzejszczak
8d5b60996e Added missing aop dependency
fixes #534
2017-02-27 16:05:52 +01:00
Marcin Grzejszczak
cdba72b44c Added missing aop dependency
fixes #534
2017-02-27 16:05:29 +01:00
Marcin Grzejszczak
b7659ede11 Updated the stream header setting in env post processor
without this kafka needs to add headers manually in properties
with this change is not necessary

fixes #529
2017-02-24 17:49:30 +01:00
Marcin Grzejszczak
8c17451e60 Added missing new trace headers
without this change for kafka the new message headers are not passed
with this change we're finally fixing this

fixes #529
2017-02-24 17:15:37 +01:00
Marcin Grzejszczak
a266d8bc6c Ensured that we guard against negative ports
fixes #518
2017-02-15 13:57:25 +01:00
Marcin Grzejszczak
4948498664 Ensured that we guard against negative ports
fixes #518
2017-02-15 13:55:06 +01:00
Marcin Grzejszczak
e027d4cfb5 Making the branch 1.5.0 boot compatible
fixes #499
2017-01-23 12:37:55 +01:00
Marcin Grzejszczak
9785bcae15 Due to possible performance problems when DiscoveryClient gives nonexistent DNS name as local address Local endpoint is created from server properties by default.
Local Ip determined from spring.commons InetUtils.
    To enable local endpoint resolution via service discovery, DiscoveryClient must be present and 'spring.zipkin.service.locator.discovery' should be set to true.
    FallbackHavingEndpointLocator was caching and recreating EndpointLocator in the same time - removed the caching part.

    Fixes gh-403
2017-01-11 12:46:19 +01:00