Marcin Grzejszczak
73b67e2b57
Merge branch 'master' into 2.0.x
2017-08-25 13:23:50 +02:00
Marcin Grzejszczak
17e303a1f7
Removed remaining deprecations
2017-08-25 13:07:36 +02:00
Marcin Grzejszczak
f14f5efe43
Going back to snapshots
2017-08-25 12:47:28 +02:00
Marcin Grzejszczak
61ca762dd4
Update SNAPSHOT to 1.3.0.M1
2017-08-25 12:44:31 +02:00
Marcin Grzejszczak
57b0ac0e51
Removing Reactor support from Sleuth
...
Sleuth requires Reactor in version 3.x whereas from Boot we get 2.0.8. That's a gigantic difference.
2017-08-25 12:30:04 +02: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
76d7dfb5b3
Merge branch 'master' into 2.0.x
2017-08-24 14:36:43 +02:00
Marcin Grzejszczak
126101f0ab
Merge branch '1.2.x'
2017-08-24 14:24:02 +02:00
Marcin Grzejszczak
c951dc88fd
Improvements of customizing the TraceFilter
...
without this change you have to add a `@Primary` annotation around your custom `TraceFilter` bean to alter the behaviour of the current `TraceFilter` implementation
with this change we're marking the `TraceFilter` as conditional on missing bean; also we're ensuring that the registered `SkipPatternProvider` will be reused when no explicit pattern was set.
also documentation is added
fixes #633
2017-08-24 14:14:01 +02:00
Marcin Grzejszczak
8e96cb29f3
Merge branch 'master' into 2.0.x
2017-08-23 18:20:14 +02:00
Marcin Grzejszczak
47b1b05a75
Merge branch '1.2.x'
2017-08-23 18:20:02 +02:00
Marcin Grzejszczak
77c1de386f
Fixed class not being static
2017-08-23 18:19:36 +02:00
Marcin Grzejszczak
0dc0147174
Merge branch 'master' into 2.0.x
2017-08-23 18:18:44 +02:00
Marcin Grzejszczak
d147b19a8d
Merge branch '1.2.x'
2017-08-23 18:18:38 +02:00
Marcin Grzejszczak
6d25738ec4
Adding the default Trace representation of UserInfoRestTemplateCustomizer
2017-08-23 18:15:48 +02:00
Marcin Grzejszczak
830531c56d
Merge branch 'master' into 2.0.x
2017-08-22 13:21:16 +02:00
Marcin Grzejszczak
05f1d6df43
Merge branch '1.2.x'
2017-08-22 13:07:08 +02:00
Marcin Grzejszczak
58f3d0fce0
Added fallback approach to try to create a JDK proxy when CGLIB one fails
...
without this change when a CGLIB proxy fails to be created an exception is thrown
with this change we're trying to save the situation by trying to create a JDK proxy. If that also won't work then we're throwing an exception.
fixes #684
2017-08-22 12:52:35 +02:00
Marcin Grzejszczak
1b0cb0a05e
Fixed broken pom
2017-08-21 11:27:06 +02:00
Marcin Grzejszczak
9f15e0df15
Merge branch 'master' into 2.0.x
2017-08-21 10:16:47 +02:00
Marcin Grzejszczak
6c9e50df40
Merge branch '1.2.x'
2017-08-21 10:16:03 +02:00
Marcin Grzejszczak
17df781524
Bumping versions to 1.2.5.BUILD-SNAPSHOT after release
2017-08-21 10:06:48 +02:00
Marcin Grzejszczak
cbddd5568c
Going back to snapshots
2017-08-21 10:06:47 +02:00
Marcin Grzejszczak
5eba47d891
Update SNAPSHOT to 1.2.4.RELEASE
2017-08-21 10:01:14 +02:00
Marcin Grzejszczak
02a0c864e8
Bumping versions to 1.2.4.BUILD-SNAPSHOT after release
2017-08-18 18:46:50 +02:00
Marcin Grzejszczak
73211f673b
Going back to snapshots
2017-08-18 18:46:49 +02:00
Marcin Grzejszczak
47612da5cc
Update SNAPSHOT to 1.2.3.RELEASE
2017-08-18 18:36:51 +02:00
Marcin Grzejszczak
aa20124088
TraceFilter skipPattern and extra span when X-B3-Flags header is present
...
without this change if there's a debug flag we set traceid & spanid for the first request inside the zipkin http extractor. we don't set the parent span flag so an additional span is created.
with this change we set the trace and span id ONLY when the debug flag is set AND the request is malformed. That means - only when the span id is set and there is no trace id.
fixes #665
2017-08-18 16:51:01 +02:00
Marcin Grzejszczak
3931087628
Merge branch '1.2.x'
2017-08-18 16:42:25 +02:00
Marcin Grzejszczak
59f5a99c24
TraceFilter skipPattern and extra span when X-B3-Flags header is present
...
without this change if there's a debug flag we set traceid & spanid for the first request inside the zipkin http extractor. we don't set the parent span flag so an additional span is created.
with this change we set the trace and span id ONLY when the debug flag is set AND the request is malformed. That means - only when the span id is set and there is no trace id.
fixes #665
2017-08-18 16:24:28 +02:00
Marcin Grzejszczak
6b3f238342
Merge branch 'master' into 2.0.x
2017-08-18 03:52:42 +02:00
Marcin Grzejszczak
ebe74c1d8f
Merge branch '1.2.x'
2017-08-18 03:52:31 +02:00
Marcin Grzejszczak
e9211e8bd0
Polish
2017-08-18 03:32:24 +02:00
Marcin Grzejszczak
c268d55656
Added debug logs for TraceChannelInterceptor
2017-08-18 03:31:35 +02:00
Marcin Grzejszczak
4ab1c7e006
Merge branch 'master' into 2.0.x
2017-08-18 02:51:12 +02:00
Marcin Grzejszczak
4649d7e3cb
Merge branch '1.2.x'
2017-08-18 02:50:55 +02:00
Marcin Grzejszczak
acfbb3b8f7
Added missing profile
2017-08-18 02:50:27 +02:00
Marcin Grzejszczak
d1010d7e74
Merge branch 'master' into 2.0.x
2017-08-17 18:42:57 +02:00
Marcin Grzejszczak
875dba823e
Merge branch '1.2.x'
2017-08-17 18:42:12 +02:00
Marcin Grzejszczak
29065e9a15
Added description of how to use Traverson with Sleuth
...
fixes #671
2017-08-17 18:42:01 +02:00
Marcin Grzejszczak
d59b0985c0
Added a similar support to WebFlux as to #668
2017-08-17 18:04:16 +02:00
Marcin Grzejszczak
2603d339e4
Merge branch 'master' into 2.0.x
2017-08-17 17:52:01 +02:00
Marcin Grzejszczak
4c53d65039
Added http keys for a root span
...
without this, the root span doesn't have any HTTP trace keys set
with this, the root span has both the request and response trace keys set
fixes #668
2017-08-17 17:51:50 +02:00
Marcin Grzejszczak
2784fe91b3
Merge branch 'master' into 2.0.x
2017-08-17 14:53:12 +02:00
Marcin Grzejszczak
6f8f02e944
Fixed the Sonar issue related to non static class
2017-08-17 14:53:06 +02:00
Marcin Grzejszczak
cbbaec67e3
Merge branch 'master' into 2.0.x
2017-08-17 14:05:41 +02:00
Marcin Grzejszczak
f322d7a06c
@Async Spans should use SpanNamer
...
without this change there's no way to alter the name of the methods annotated with @Async
with this change the value passed to @Async annotated method via @SpanName will be the name of the span
fixes #653
2017-08-17 14:05:31 +02:00
Marcin Grzejszczak
a85bb0f743
Merge branch '1.2.x'
2017-08-17 13:41:12 +02:00
Marcin Grzejszczak
c3d198053f
Enable spring-data only on demand for tests
2017-08-17 13:40:27 +02:00