Commit Graph

773 Commits

Author SHA1 Message Date
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
6d445f56f4 Going back to snapshots 2017-01-30 10:37:40 +01:00
Marcin Grzejszczak
adfaa036a2 Bumping versions before release 2017-01-30 10:31:39 +01:00
Marcin Grzejszczak
ba4e4f32c1 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:52:59 +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
Brian Devins
1c7d861ffc Add a new log method to span that allows for setting the time (#501)
* Add a new log method that allows for setting the time
* Clarify with time unit
* Simple test and spelling correction
* Consolidate "logic" and add a test for the other log method
2017-01-25 17:25:44 +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
c347f724cd Add an option to use the X-B3-Flags header to override any sampling decision
without this change it's pretty much impossible to enforce sampling for certain traces
    with this change setting the X-B3-Flags to 1 for HTTP messages / spanFlags to 1 for messaging will override any sampling decisions

    fixes #496
2017-01-18 13:12:13 +01: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
33173ebd05 Merge branch '1.0.x' into 1.1.x 2017-01-11 11:21:55 +01:00
Ryan Baxter
583893a29d Merging PR #446 into master. 2017-01-10 14:55:32 -05: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
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
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
6ddd009498 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 15:42:28 +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
Arthur Gavlyukovskiy
24f6827a4a Created @ConfigurationProperties classes and updated additional metadata (#485)
* Created @ConfigurationProperties classes and updated additional metadata
2016-12-30 12:42:38 +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
7c7660a84f 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:49:05 +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
03c4300215 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:38 +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
7ad0803336 Added a check for tracing in Trace Filter 2016-12-20 15:57:07 +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
d2bf1ea776 Detaching async traces only if tracing is still in progress 2016-12-19 16:52:43 +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
4f9bf6d6e4 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:36 +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
b61be04866 Fixing race conditions in tests 2016-12-19 10:20:18 +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
964afe10f7 Premature async rest template (#479)
without this change the async rest template provides wrong value of the span duration
with this change the span is closed via a callback

fixes #475
2016-12-16 15:18:29 +01:00
Marcin Grzejszczak
73fb8a8c4c Made tests even less brittle 2016-12-16 15:10:28 +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
Marcin Grzejszczak
1298d3d581 Made tests less brittle 2016-12-16 14:54:08 +01:00
Marcin Grzejszczak
ce94d15a54 Made tests less brittle 2016-12-16 14:53:54 +01:00
Marcin Grzejszczak
22a4c77219 Premature async rest template (#479)
without this change the async rest template provides wrong value of the span duration
with this change the span is closed via a callback

fixes #475
2016-12-16 14:32:00 +01:00