Commit Graph

860 Commits

Author SHA1 Message Date
Marcin Grzejszczak
abefcaa354 Removed duplicated dependency
fixes #504
2017-02-01 11:19:51 +01:00
Marcin Grzejszczak
4060c0b805 Fixing the moment when SS is set
without this change there's a problem with the time when the SS is set on a span. Currently it's done in TraceFilter's finally block. The problem is that this code is executed after the response has been sent back to the client. Thus CR sometimes was set faster than SS (it doesn't make any sense from the logical point of view).

with this change we're introducing wrappers over the HttpServletResponse where we annotate the span with SS just after the response gets sent to the recipient.

fixes #492 #431
2017-02-01 10:31:50 +01:00
Marcin Grzejszczak
5c117534aa Revert "Fixing the moment when SS is set (#505)"
This reverts commit 92bcae68f3.
2017-01-31 16:20:31 +01:00
Marcin Grzejszczak
92bcae68f3 Fixing the moment when SS is set (#505)
without this change there's a problem with the time when the SS is set on a span. Currently it's done in TraceFilter's finally block. The problem is that this code is executed after the response has been sent back to the client. Thus CR sometimes was set faster than SS (it doesn't make any sense from the logical point of view).

with this change we're introducing wrappers over the HttpServletResponse where we annotate the span with SS just after the response gets sent to the recipient.

fixes #492 #431
2017-01-31 15:57:22 +01:00
Marcin Grzejszczak
7151a9cdb3 Giving an option to reuse a custom feign client
without this change you couldn't register your own client (for example to set your ssl config) for Sleuth to reuse it
with this change we're reusing a registered feign client bean or creating a default one if necessary

fixes #502
2017-01-26 18:47:43 +01:00
Marcin Grzejszczak
a84e624bc4 Fixed broken tests 2017-01-23 13:07:11 +01:00
Marcin Grzejszczak
e027d4cfb5 Making the branch 1.5.0 boot compatible
fixes #499
2017-01-23 12:37:55 +01:00
Adrian Cole
a396a09603 Updates to latest zipkin 1.19 (#495)
Most changes are not very interesting to sleuth, though the server is
quite a lot better with UI fixes galore. For sleuth mainly, small api
unaffecting glitch fixes around the Span.Builder.
2017-01-19 20:17:24 +08:00
Marcin Grzejszczak
49e92443fb Going back to snapshots 2017-01-12 13:03:16 +01:00
Marcin Grzejszczak
7dd5a26802 Bumped versions before release 2017-01-12 12:28:53 +01:00
Marcin Grzejszczak
4d7def0362 Merge branch '1.0.x' into 1.1.x 2017-01-11 12:32:09 +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
33173ebd05 Merge branch '1.0.x' into 1.1.x 2017-01-11 11:21:55 +01:00
Ryan Baxter
e2427b6a7e Merge pull request #446 from ryanjbaxter/disable-retry
Disable Feign Retry
2017-01-10 11:23:40 -05:00
Marcin Grzejszczak
863ba87f5f Going back to snapshots 2017-01-09 17:02:20 +01:00
Marcin Grzejszczak
e4546afd49 Bumping versions before release 2017-01-09 16:22:49 +01:00
Marcin Grzejszczak
2097acb486 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:21:32 +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
9d60602115 Added test for non web apps, fixed the autoconfig in that case
without this change the non web apps can't start
    with this change the missing bean gets registered

    also in terms of non boot apps if there is no port or address set we're providing some default values. In terms of the service name one can always use the override via the spring.zipkin.service.name property

    fixes #32
2017-01-02 14:44:54 +01:00
Marcin Grzejszczak
f085aae3b6 Added test for non web apps, fixed the autoconfig in that case
without this change the non web apps can't start
    with this change the missing bean gets registered

    also in terms of non boot apps if there is no port or address set we're providing some default values. In terms of the service name one can always use the override via the spring.zipkin.service.name property

    fixes #32
2017-01-02 14:39:26 +01:00
Marcin Grzejszczak
e117531d75 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:48 +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
Arthur Gavlyukovskiy
2a06734106 Created @ConfigurationProperties classes and updated additional metadata (#486)
* Created @ConfigurationProperties classes and updated additional metadata
2016-12-30 12:36:18 +01:00
Arthur Gavlyukovskiy
6aa7328cd9 Created @ConfigurationProperties classes and updated additional metadata (#486)
* Created @ConfigurationProperties classes and updated additional metadata
2016-12-30 12:35:46 +01:00
Marcin Grzejszczak
ab77e8ee74 Added checks to close / detach only if tracing
without this change during asynchronous communication some components are trying to detach or close spans that were aready detached. This leads to exceptions utils warnings and spans were not closed.
    with this change we're adding additional checks to ensure that we're tracing

    fixes #447
2016-12-30 11:36:16 +01:00
Marcin Grzejszczak
31531f4c84 Added checks to close / detach only if tracing
without this change during asynchronous communication some components are trying to detach or close spans that were aready detached. This leads to exceptions utils warnings and spans were not closed.
    with this change we're adding additional checks to ensure that we're tracing

    fixes #447
2016-12-30 11:35:55 +01:00
Marcin Grzejszczak
c968aae9e7 Explained TraceAsyncRestTemplate bean creation
fixes #484
2016-12-29 13:38:25 +01:00
Marcin Grzejszczak
b5b5a4761b Explained TraceAsyncRestTemplate bean creation
fixes #484
2016-12-29 13:38:07 +01:00
Toshiaki Maki
f7fea826f3 Add tip in case of using spring-cloud-sleuth-stream and spring-cloud-netflix-hystrix-stream (#482)
* Add tip in case of

spring-cloud-sleuth-stream and spring-cloud-netflix-hystrix-stream
2016-12-27 08:51:07 +01:00
Toshiaki Maki
6c99c73bd7 Add tip in case of using spring-cloud-sleuth-stream and spring-cloud-netflix-hystrix-stream (#482)
* Add tip in case of

spring-cloud-sleuth-stream and spring-cloud-netflix-hystrix-stream
2016-12-27 08:50:34 +01:00
Marcin Grzejszczak
a88731fd9b Adding parent id to MDC
without this change we couldn't reference parent id in the logs
    with this change we add the parent id to MDC context

    fixes #480
2016-12-20 18:14:23 +01:00
Marcin Grzejszczak
b0533f7a60 Adding parent id to MDC
without this change we couldn't reference parent id in the logs
    with this change we add the parent id to MDC context

    fixes #480
2016-12-20 18:13:57 +01:00
Marcin Grzejszczak
bbc246bb53 Added a check for tracing in Trace Filter 2016-12-20 15:56:57 +01:00
Marcin Grzejszczak
fa74bf8f27 Added a check for tracing in Trace Filter 2016-12-20 15:56:29 +01:00
Marcin Grzejszczak
3b09f2789c Detaching async traces only if tracing is still in progress 2016-12-19 16:52:32 +01:00
Marcin Grzejszczak
362f270f54 Detaching async traces only if tracing is still in progress 2016-12-19 16:52:13 +01:00
Marcin Grzejszczak
e96076b624 Added video with Sleuth & Zipkin 2016-12-19 15:02:23 +01:00
Marcin Grzejszczak
9a49c7f4f3 Added video with Sleuth & Zipkin 2016-12-19 15:00:00 +01:00
Marcin Grzejszczak
9e596705be Updated docs with new span approach 2016-12-19 14:54:14 +01:00
Marcin Grzejszczak
fb75423f37 Updated readme with new span approach 2016-12-19 14:52:08 +01:00
Marcin Grzejszczak
db39fee588 Updated readme with new span approach 2016-12-19 14:48:03 +01:00
Marcin Grzejszczak
dcb3efd5b0 Updated docs with new span approach 2016-12-19 14:45:59 +01:00
Marcin Grzejszczak
cd6a25ac1a Adding SA only if peer tag is present
without this change Zipkin doesn't properly visualize the span on the server side.
with this change we're setting SA only if peer tag is set.

fixes #481
2016-12-19 13:26:19 +01:00
Marcin Grzejszczak
ad700ea664 Adding SA only if peer tag is present
without this change Zipkin doesn't properly visualize the span on the server side.
with this change we're setting SA only if peer tag is set.

fixes #481
2016-12-19 13:26:04 +01:00
Marcin Grzejszczak
4d3b13800e Added consistency between metric and metrics
without this change we have 2 different properties. One is `spring.sleuth.metric` and the other is `spring.sleuth.metrics`.
with this change we're introducing conditionality on `spring.sleuth.metric.enabled`

fixes #477
2016-12-19 11:58:27 +01:00
Marcin Grzejszczak
b24713c943 Added consistency between metric and metrics
without this change we have 2 different properties. One is `spring.sleuth.metric` and the other is `spring.sleuth.metrics`.
with this change we're introducing conditionality on `spring.sleuth.metric.enabled`

fixes #477
2016-12-19 11:57:56 +01:00
Marcin Grzejszczak
c3bc578323 Fixing race conditions in tests 2016-12-19 10:20:07 +01:00
Marcin Grzejszczak
76209a3653 Fixing race conditions in tests 2016-12-19 10:19:52 +01:00
Marcin Grzejszczak
5fb1eebac2 Made tests even less brittle 2016-12-16 15:00:22 +01:00
Marcin Grzejszczak
439fefd3af Made tests even less brittle 2016-12-16 15:00:03 +01:00