Commit Graph

412 Commits

Author SHA1 Message Date
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
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
Adrian Cole
02e6eb5745 Starts 128-bit traces when spring.sleuth.traceId128=true (#455)
This adds autoconfiguration to create 128-bit traces when
`spring.sleuth.traceId128=true`.
2016-11-18 20:10:34 +08:00
Adrian Cole
2a1b4befba Propagates logs and reports 128-bit trace IDs (1.1.x) (#453)
This supports 128-bit traces via a new field traceIdHigh, which matches
other zipkin implementations. In encoded form, the trace ID is simply
twice as long (32 hex characters).

With this change in, a 128-bit trace propagated will not be downgraded
to 64-bits when sending downstream, reporting to Zipkin or adding to
the logging context.

This will be followed by a change to support initiating 128-bit traces.
2016-11-18 14:40:25 +08:00
Adrian Cole
6cb0c21e5a Switches ID encoding to fixed-length (1.0.x backport) (#451)
Before, we were using variable encoding for trace and span identifiers.
This complicates search for those who are copy/pasting fixed-length IDs
provisioned upstream. This moves to standard formatting, while
maintaining tolerant reads.

The code added will also be used to support 128-bit (32 char) trace IDs.

Backport of #450
2016-11-16 16:50:38 +08:00
Marcin Grzejszczak
2a740db1d2 Wrapping ExecutorService in its own representation
without this change ExecutorService was treated as an Executor and wrapped in the Executor bean. Due to this the bean was missing / bean of invalid type was registered.
with this change we do not wrap ExecutorService with a Executor bean, instead we wrap it in a TraceableExecutorService representation.

fixes #445
2016-11-08 15:15:21 +01:00
Christoffer Sawicki
e0a20b205f Allow TraceWebAutoConfiguration to work without Web MVC
Fixes #436
2016-11-06 20:04:28 +01:00
Marcin Grzejszczak
0609396ea1 Updated libs 2016-11-06 20:04:18 +01:00
Marcin Grzejszczak
7e84459f64 Added 1.1.x version 2016-11-02 14:11:05 +01:00
Marcin Grzejszczak
7a042af177 Fixing spring.sleuth.web.client.enabled (#437)
Ensuring that disabling of modules work

without this change when you disable Sleuth web client the context fails to load
with this change it's working fine. We've moved beans around + the async web client will be turned off automatically if the sync one is also disabled

fixes #433
2016-11-02 11:49:23 +01:00
Marcin Grzejszczak
538b5c956e Added error tag upon exceptions (#435)
without this change there's no error colouring on Zipkin side
with this change we set error tags
- whenever there is an exception thrown on the server side (5xx)
- wheneber on the client side it's impossible to send a message

fixes #384
2016-10-31 13:12:25 +01:00
Marcin Grzejszczak
faa3d4ecf9 Providing examples of how to work with executors
without this example it might be misleading for users how to work with callables and custom executors.
with this example we're showing both the case when you're using a custom executor (in this case you just have to register it as a bean and then use that bean in your callable); and also we show an example of how to reuse the taskScheduler one (it's enough to wrap it with LazyTraceExecutor).

fixes #423
2016-10-28 09:30:01 +02:00
Biju Kunjummen
8437bef6a9 Issue 424 - Documentation for adding trace/span headers to http response (#429)
fixes #424
2016-10-27 13:59:22 +02:00
Marcin Grzejszczak
a2449ddc59 Going back to snapshots 2016-10-18 17:17:08 +02:00
Marcin Grzejszczak
66c6dd3010 Bumping versions before release 2016-10-18 17:05:11 +02:00
Marcin Grzejszczak
b505e4a1f9 Propagating exceptions in trace filter
without this change any exception occurring while creating a span will be swallowed.
with this change we're propagating the exception so that it gets handled properly.

fixes #426
2016-10-18 16:21:04 +02:00
Marcin Grzejszczak
9240fdbd9c Failure in extracting headers results in new span
without this change if the users sends invalid headers then exceptions are thrown.
with this change extractors catch the exception, log it and then a new span is created. That of course will lead to an invalid trace graph cause a new trace will be created but at least business apps will not be broken due to an issue in instrumentation.

fixes #425
2016-10-18 14:36:41 +02:00
Dave Syer
d092d62397 Ensure lifecycle callbacks are applied to delegate
When wrapping a ThreadPoolTaskExecutor in a bean postprocessor
we should take care that the delegate gets the lifecycle callbacks
from the container. Otherwise when it is first used, the thread pool
will not have been initialized, resulting in an exception.

(Can't believe this ever actually worked)
2016-10-10 13:32:03 +01:00
Dave Syer
1d1f28d971 Ensure message headers are still mutable after interceptor is called
Some components in Spring assume (perhaps wrongly) that a channel
interceptor will not convert a mutable message into an immutable
one, and they continue to modify the headers dowstream. We can
dosge the issue of whether this is right or wrong by keeping the
message headers mutable, just in case.

It would probably be better to refactor the SpanInjector so that
it works with something other than the MessageBuilder, but we can
defer doing that in favour of this smaller change that works.

Adds a test for mutability. Also tested with the
gs-messaging-stomp-websocket guide from spring.io.

Fixes gh-276
2016-10-10 13:27:53 +01:00
Marcin Grzejszczak
8bd8e3db1f Fixed race condition in tests 2016-10-04 14:30:56 +02:00
Marcin Grzejszczak
7289212868 Fixing ConcurrentModificationException 2016-10-04 14:02:00 +02:00
Marcin Grzejszczak
d1cb4b2990 Returning a copy of spans from ArrayListSpanAccumulator 2016-10-04 13:53:33 +02:00
Marcin Grzejszczak
842f8a1bb4 Fixed javadocs 2016-10-04 13:51:44 +02:00
Marcin Grzejszczak
d0bedb22cc Wrapping all Executors and ThreadPoolTaskExecutors
without this change there was a gap in passing tracing info to executors.

With this change the Executors are wrapped in LazyTraceExecutor and ThreadPoolTaskExecutors are wrapped in their tracing representation too

fixes #410
2016-10-04 13:42:22 +02:00
Marcin Grzejszczak
72d0032859 Going back to snapshots 2016-09-21 13:20:57 +02:00
Marcin Grzejszczak
755e01d646 Bumping versions before release 2016-09-21 12:55:19 +02:00
Adrian Cole
02473f7c18 Tolerate reads of 128 bit X-B3-TraceId (#408)
The first step of transitioning to 128bit `X-B3-TraceId` is tolerantly reading 32 character long ids by throwing away the high bits (any characters left of 16 characters). This allows the tracing system to more flexibly introduce 128bit trace id support in the future.

Ex. when `X-B3-TraceId: 463ac35c9f6413ad48485a3953bb6124` is received, parse the lower 64 bits (right most 16 characters ex48485a3953bb6124) as the trace id.
2016-09-15 21:13:38 +08:00
Marcin Grzejszczak
4490b1b81e Simplified TraceZuulHandlerMapping
without this change we were wrapping the ZuulHandlerMapping in its tracing representation.

with this change we are simplifing that by adding interceptors

fixes #399
2016-09-13 10:16:30 +02:00
Marcin Grzejszczak
8a32f02f9f Going back to SNAPSHOTs 2016-09-08 23:29:24 +02:00
Marcin Grzejszczak
2e4c59b3c6 Bumping versions before release 2016-09-08 22:45:02 +02:00
Marcin Grzejszczak
9e01d77431 Feign fixes
it turned out that some of the tests were leaky and didn't catch that ExceptionUtils were throwing an exception (race condition with Hystrix). That was due to the fact that When Hystrix with Feign were doing retries the RequestInterceptor wasn't called. That means that a new span wasn't created but a parent span was closed.

With this change the only place where the span creation and closing takes place is TraceFeignClient. I removed the Feign RequestInterceptor. Now whenever there is a retry - a new span is created and closed after getting a response. There are no exceptions, special cases etc.

In addition to that since Feign is fully immutable and SpanInjector is by design made to mutate objects I had to wrap the immutable Request in an AtomicReference in order to change the contents of the Request. I'm ashamed but didn't have a better idea. Since that is packaged scope nobody should every see that (outside the package of course)
2016-09-08 22:25:12 +02:00
Marcin Grzejszczak
ef2445090d Going back to SNAPSHOTs 2016-09-08 18:20:57 +02:00
Marcin Grzejszczak
877b80b70e Bumping versions before release 2016-09-08 17:37:08 +02:00
Marcin Grzejszczak
10a169ed26 TraceLoadBalancerFeignClient not closing span
when TLBFC is throwing an exception the span wasn't closed. Throwing exception can occurr when IOExcepiton is thrown. Then the span wouldn't be closed and the whole series of problems occur.

fixes #393
2016-09-08 15:29:27 +02:00
Marcin Grzejszczak
3ebcd1e693 Wrapping LoadBalancerFeignClient in tracing representation
without this change when using SC-Netflix 1.2.0 Feign can't call an external URL

fixes #393
2016-09-08 10:53:33 +02:00
Marcin Grzejszczak
634020eea6 Synchronizing on spans in ArrayListSpanAccumulator
without this change tests happen to have ConcurrentModificationException
2016-08-23 15:35:00 +02:00
Marcin Grzejszczak
cd17b35ea3 Going back to Snapshots 2016-08-22 13:20:14 +02:00
Marcin Grzejszczak
995371fc0d Bumping versions before release 2016-08-22 12:39:30 +02:00
Marcin Grzejszczak
b7f0c4e7c5 Fixing TraceFilter order (#382)
after making TraceFilter process different dispatch types we've introduced a bug related to filter ordering. TraceFilter was registered with a default ordering which is of lowest precedence.

With this change we ensure that the ordering of TraceFilter is fixed.

Fixes #380
2016-08-22 12:22:26 +02:00
Marcin Grzejszczak
2bad78ee4b Going back to snapshots after release 2016-08-19 15:06:37 +02:00
Marcin Grzejszczak
f56779e255 Bumping versions before release 2016-08-19 14:26:49 +02:00
Marcin Grzejszczak
8e01425eed Synchronized ArrayListSpanAccumulator spans
without this change we could have ConcurrentModificationExceptions
2016-08-18 16:11:46 +02:00
Marcin Grzejszczak
fdea5d6bac Wraped debug logs with conditional 2016-08-17 13:59:01 +02:00
Marcin Grzejszczak
f677be026e Ensured reusability of Feign components
Tests have been refactored to ensure that the custom components registered as beans are working properly

fixes #374
2016-08-16 11:48:49 +02:00
Marcin Grzejszczak
e0fbcfe7c6 Polish 2016-08-10 17:33:44 +02:00
Marcin Grzejszczak
35652a43d9 Removed sending the tracing information back in the response (#329)
fixes #327
2016-08-10 17:31:40 +02:00
Marcin Grzejszczak
ee23ea6465 Simplified Feign (#372)
with this change we no longer treat retries as a continuation of a previous span. That way the Feign code simplifies a lot. RequestInterceptor starts a span and the TraceFeignClient will always close it no matter what's happening.

fixes #202
2016-08-09 19:01:48 +02:00
Marcin Grzejszczak
e408fd4190 Added NPE gueard for TraceFeignContext 2016-08-06 15:35:48 -07:00