Commit Graph

410 Commits

Author SHA1 Message Date
Marcin Grzejszczak
1b1a1698ca Removed setting of the "fallback span"
without this change we created a "fallback span" in the case where a Spring component didn't handle the span. By handling it means that it got processed by anyway (a tag, log was added etc.). Why did we do that? That's because if no component was involved in creation of additional spans then in the Zipkin UI the service that had only the span that has the SR, SS logs wouldn't show up. In other words, if service A called service B and service B had only a single span, then service B wouldn't show up in the UI (there would be no blue bar). All the data would show up however in the client side of that span.

with this change we're removing this behaviour. That's because it introduces confusion for our users, that use non Spring related components. Also it seems that the Zipkin UI got fixed and this error no longer is present. If however it turns out that it's still there, it clearly seems that the place to fix this error should be Zipkin and not Sleuth.

fixes #708
2017-09-22 13:21:46 +02:00
Marcin Grzejszczak
cfd3a619dd Introduced a "shared" field in Span (#698)
whenever:

- a span or trace id get generated when a request / message arrives
- child span is created

we set the field to false

whenever we find ids in the incoming request / message we set the field to true

fixes #696
2017-09-14 17:14:09 +02:00
Marcin Grzejszczak
5bb444f042 Adding tags for spans created via annotations (#691)
without this change we don't know which class or method (if the SpanCreator got overridden) was annotated
with this change we're adding the tags with this info

fixes #690
2017-09-12 13:37:01 +02:00
Marcin Grzejszczak
b83caf4ac0 Polish 2017-08-25 11:52:14 +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
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
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
acfbb3b8f7 Added missing profile 2017-08-18 02:50:27 +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
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
Marcin Grzejszczak
24c1471f92 Merged 1.2.x into master 2017-08-14 10:33:58 -04:00
Marcin Grzejszczak
253b34b1cf Fixed missing interceptor injection in OAuth2RestTemplate
fixes #581
2017-08-14 10:10:38 -04:00
Marcin Grzejszczak
3034497617 Merge branch '1.2.x' 2017-08-05 22:11:13 +02:00
Canaan Stafford
7dffabd91a Expand type check in TraceChannelInterceptor (#673)
The type check in the method 'getMessage' was only for a sub-class of
MessagingException. The check was expanded to the base class.
2017-08-05 22:10:54 +02:00
Marcin Grzejszczak
09862f3516 Updated poms 2017-08-04 11:53:27 +02:00
Marcin Grzejszczak
48227e7793 Returns proper message; fixes #669 2017-08-04 11:52:31 +02:00
Marcin Grzejszczak
883a8d4e24 Merge branch '1.2.x' 2017-08-03 17:56:47 +02:00
Marcin Grzejszczak
aadf0a8334 Added support for failed messages
without this change when messages arrive at a error channel a new traceid is set
with this change we continue the trace

fixes #667
2017-08-03 17:50:47 +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
bddad6e2bc Merge branch '1.2.x' 2017-07-15 10:17:16 +02:00
Marcin Grzejszczak
87411d760c Ensured lower case of baggage keys
fixes #641
2017-07-15 10:14:39 +02:00
Marcin Grzejszczak
b5120b11ff Merge branch '1.2.x' 2017-07-14 12:45:24 +02:00
Marcin Grzejszczak
aaf191e4c6 Logs are no longer altered when sleuth is disabled
fixes #638
2017-07-14 12:33:57 +02:00
Marcin Grzejszczak
2a38230bb6 Merge branch '1.2.x' 2017-07-12 18:09:15 +02:00
Marcin Grzejszczak
feac9980da Fixed not clearing trace attribute on closed span
due to this Zuul spans have been improperly closed and the span remained in the main thread. After sending enough requests the traces started to be reused by the worker threads.

fixes #634
2017-07-12 18:08:43 +02:00
Marcin Grzejszczak
4158443ad7 Merge branch '1.2.x' 2017-07-06 12:25:35 +02:00
Marcin Grzejszczak
050dfe9bdf Added missing error setting on the span in zuul pre filters
without this change when an exception is thrown in a filter we're not setting the error message as a tag.

fixes #616
2017-07-06 12:23:49 +02:00
Marcin Grzejszczak
6b1d0397ca Merge branch '1.2.x' 2017-07-06 11:55:33 +02:00
Marcin Grzejszczak
a977e4ae0e Added missing methods to override in SleuthHystrixConcurrencyStrategy
according to issue #612:
> When 2 or more customized HystrixConcurrencyStrategy are registered (e.g SleuthHystrixConcurrencyStrategy and SecurityContextConcurrencyStrategy) depending on the order of registration the overrides from SecurityContextConcurrencyStrategy might get ignored.
I think the override and delegation should be made all methods of HystrixConcurrencyStrategy otherwise the delegation will possibly be incomplete.

fixes #612
2017-07-06 11:54:21 +02:00
Marcin Grzejszczak
373e56f94b Merge 2017-07-03 08:11:42 +02:00
Marcin Grzejszczak
e5fafb8d77 Merge branch '1.2.x' 2017-07-03 08:11:37 +02:00
Marcin Grzejszczak
2a09be747d Making Hystrix + Feign opt in
without this change we allways force Feign to use Hystrix
with this change you need to pass the `feign.hystrix.enabled=true` flag to turn it on

fixes #627
2017-07-03 08:00:40 +02:00
Marcin Grzejszczak
3d3201aa17 Merge branch '1.2.x' 2017-06-30 11:30:01 +02:00
Marcin Grzejszczak
c3e90e4e21 Fixed NPE for error parser 2017-06-30 11:29:53 +02:00
Marcin Grzejszczak
2f6a8df5fe Removes deprecations; fixes #621 2017-06-29 08:49:40 +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
cc00e3ae80 Making baggage keys case insensitive
fixes #605
2017-06-07 10:40:57 +02:00
Marcin Grzejszczak
f834e5222b Added the ErrorParser interface
without this change there's no way to alter the exception message that gets attached as a tag to the span
    with this change you can register your own ErrorParser bean to alter that behaviour

    fixes #576
2017-06-06 08:05:27 +02:00
Marcin Grzejszczak
95e14c0a68 Polish 2017-06-01 13:03:50 +02:00
svenz
e783df88a0 Cleanup test case based on review comments 2017-05-30 19:19:27 -07:00
svenz
6948088085 https://github.com/spring-cloud/spring-cloud-sleuth/issues/597
Fix Http headers as tags
2017-05-29 13:49:55 -07:00
Marcin Grzejszczak
419ec7232a Fixed the Duplicate Trace Header Propagation for Zuul Proxy Applications
without this change we're always setting values for headers regardless of the fact whether they have already been set.
with this change we're only setting headers if there was no any previous value of the header

fixes #586
2017-05-27 02:58:58 +02:00
Marcin Grzejszczak
a5a898a06b Trying to fix flickering tests 2017-05-12 18:52:52 +02:00
Marcin Grzejszczak
5230626c5b Merge branch '1.1.x' 2017-05-08 10:51:43 +02:00