Commit Graph

467 Commits

Author SHA1 Message Date
Marcin Grzejszczak
e027d4cfb5 Making the branch 1.5.0 boot compatible
fixes #499
2017-01-23 12:37:55 +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
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
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
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
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
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
Marcin Grzejszczak
5502bab61b 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 13:59:03 +01:00
Marcin Grzejszczak
8ff34c28a9 Made tests less brittle - fixed the stupid change 2016-12-16 13:37:01 +01:00
Marcin Grzejszczak
1fd3afe7aa Made tests less brittle - fixed the stupid change 2016-12-16 13:36:43 +01:00
Marcin Grzejszczak
ac365686cd Made tests less brittle 2016-12-16 13:33:03 +01:00
Marcin Grzejszczak
ee51d41e1e Made tests less brittle 2016-12-16 13:32:49 +01:00
Marcin Grzejszczak
9c5c965162 Spans are continued in Handler Interceptors (#474)
without this change an explicit new span is created on the server side. Its name is equal to the method name of the controller. It introduces some nice advantages in terms of readability of trace.

with this change we're continuing a previous span on the server side. We're attaching the tags and logs to that span with information about controller class and controller name. Also events related to start and finish of the controller are there.

fixes #471 #469 #427
2016-12-16 13:25:04 +01:00
Marcin Grzejszczak
ee8c73df53 Spans are continued in Handler Interceptors (#474)
without this change an explicit new span is created on the server side. Its name is equal to the method name of the controller. It introduces some nice advantages in terms of readability of trace.

with this change we're continuing a previous span on the server side. We're attaching the tags and logs to that span with information about controller class and controller name. Also events related to start and finish of the controller are there.

fixes #471 #469 #427
2016-12-16 13:02:58 +01:00
Marcin Grzejszczak
9662e79677 Fixed disabling of Sleuth
without this change it's impossible to disable Sleuth when you have registered a Random bean
with this change the conditions are fixed

fixes #462
2016-12-08 15:11:51 +01:00
Marcin Grzejszczak
0f4427bbf3 Fixed disabling of Sleuth
without this change it's impossible to disable Sleuth when you have registered a Random bean
with this change the conditions are fixed

fixes #462
2016-12-08 15:05:23 +01:00
Jean-Philippe Courson
3c720116c3 Custom HTTP status codes support (#460)
Provides  custom HTTP status codes support

without this change applications using custom HTTP status codes are currently having issues with Spring Cloud Sleuth. TraceFilter.httpStatusSuccessful() is throwing an IllegalArgumentException on HttpStatus.valueOf(response.getStatus()).

with this change that gets fixed
2016-12-03 17:23:11 +02:00
Jean-Philippe Courson
398d26186e Custom HTTP status codes support (#460)
Provides  custom HTTP status codes support

without this change applications using custom HTTP status codes are currently having issues with Spring Cloud Sleuth. TraceFilter.httpStatusSuccessful() is throwing an IllegalArgumentException on HttpStatus.valueOf(response.getStatus()).

with this change that gets fixed
2016-12-03 17:22:46 +02:00
Marcin Grzejszczak
822c5fbba2 Going back to snapshots 2016-11-24 13:19:11 +01:00
Marcin Grzejszczak
b663ab397b Bumping versions before release 2016-11-24 13:00:18 +01:00
Dave Syer
427df71b76 Fix broken test (duh) 2016-11-24 12:52:47 +01:00
Dave Syer
ea9553cef7 Ensure websockets 1xx response is not treated as an error 2016-11-24 12:42:28 +01:00
Marcin Grzejszczak
34c4eacb5e Going back to Snapshots 2016-11-24 12:39:06 +01:00
Marcin Grzejszczak
c47d0b6c18 Bumping versions before release 2016-11-24 12:08:10 +01:00
Marcin Grzejszczak
06ab758d69 Fixed wrong proxying of executors
without this change tracing worked fine but the custom types were not registered as beans. Thus autowiring of them was not possible
with this change the bean post processor is removed and an aspect is used - that way tracing is still working fine but we don't interfere in bean registration

fixes #445
2016-11-21 16:48:38 +01:00
Marcin Grzejszczak
a3c0f81671 Fixed wrong proxying of executors
without this change tracing worked fine but the custom types were not registered as beans. Thus autowiring of them was not possible
with this change the bean post processor is removed and an aspect is used - that way tracing is still working fine but we don't interfere in bean registration

fixes #445
2016-11-21 16:41:20 +01:00
Adrian Cole
24e52c690d Starts 128-bit traces when spring.sleuth.traceId128=true (#455) (#456)
This adds autoconfiguration to create 128-bit traces when
`spring.sleuth.traceId128=true`.
2016-11-18 22:58:34 +08:00