Commit Graph

111 Commits

Author SHA1 Message Date
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
Marcin Grzejszczak
a559c11bcd 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:31:18 +01:00
Marcin Grzejszczak
5b442e9526 Adding the spring.instance_id tag
without this tag it's impossible to discern from which server was the given span originated
    with this change we're adding a tag in which we're passing the instance id value. The value can be taken either from Cloud Foundry or from a concatanation of some local properties like instance_id / application name / application port etc.

    fixes #369
2017-01-03 14:44:56 +01:00
Marcin Grzejszczak
9d8b2a279f Adding the spring.instance_id tag
without this tag it's impossible to discern from which server was the given span originated
    with this change we're adding a tag in which we're passing the instance id value. The value can be taken either from Cloud Foundry or from a concatanation of some local properties like instance_id / application name / application port etc.

    fixes #369
2017-01-03 14:20:56 +01:00
Marcin Grzejszczak
225a2d4cbf Added property for overriding the service name in Zipkin
without this only either service discovery service id / spring.application.name can be chosen as a service name for zipkin
    with this change you can pass spring.zipkin.service.name property to change override that both for HTTP and Stream collectors

    fixes #324
2017-01-02 10:39:18 +01:00
Marcin Grzejszczak
e982c4df80 Added property for overriding the service name in Zipkin
without this only either service discovery service id / spring.application.name can be chosen as a service name for zipkin
    with this change you can pass spring.zipkin.service.name property to change override that both for HTTP and Stream collectors

    fixes #324
2017-01-02 10:18:20 +01:00
Dave Syer
a0adcecba0 Update to Spring Boot 1.5 2016-12-12 12:52:21 +00:00
Marcin Grzejszczak
cec661e8c6 Removed wrong imports 2016-11-06 22:45:06 +01:00
Marcin Grzejszczak
57f95aac3e Added a test for tracing the tracer 2016-11-06 22:36:38 +01:00
Marcin Grzejszczak
e5dce64d71 Added a test for tracing the tracer 2016-11-06 10:06:17 +01:00
Marcin Grzejszczak
718a62ba5b Fixed the missing sampled flag for sleuth stream messages
without this change your message broker will explode due to number of message:sleuth messages
with this change it gets fixed
2016-11-06 09:28:58 +01:00
Marcin Grzejszczak
6642a369bc Not throwing an exception when queue size is exceeded
without this change when queue size of spans is exceeded for Stream span propagation, an exception is thrown that terminates business logic processing
with this change we're not propagating the exception - we're incrementing the dropped spans counter

fixes #421
2016-10-11 15:24:48 +02:00
Marcin Grzejszczak
b8db95bc78 Not throwing an exception when queue size is exceeded
without this change when queue size of spans is exceeded for Stream span propagation, an exception is thrown that terminates business logic processing
with this change we're not propagating the exception - we're incrementing the dropped spans counter

fixes #421
2016-10-11 15:15:11 +02:00