Marcin Grzejszczak
da620649cf
Fixing build
2017-11-03 22:56:36 +01:00
Marcin Grzejszczak
c45537da95
Merge branch 'master' into 2.0.x
2017-11-03 22:48:24 +01:00
Marcin Grzejszczak
4203566d87
Exceptions that escape SpringMVC DispatcherServlet should be logged with trace & span IDs
...
without this change any exception that is not caught by a filter, get caught and logged by server's internals (e.g. Tomcat's Valve). To make the Valve log the exception together with the tracing information we would have to allow the tracing context remain in the thread after TraceFilter gets executed. That is problematic cause we're polluting the ThreadLocal and would have to assume that some component will eventually clear the context.
with this change we're trying to solve the issue from a different angle. Whenever an uncaught exception is thrown, we are already catching it in the `catch(...) {}` clause. It's enough to just log it at the error level and that way, regardless of the underlying server implementation (Tomcat, Undertow) we will log the uncaught exception and rethrow it.
fixes #714
2017-11-03 22:41:50 +01:00
Marcin Grzejszczak
854fd67109
Removed security code
2017-11-02 06:13:05 +01:00
Marcin Grzejszczak
fcba41a0f0
Merge branch 'master' into 2.0.x
2017-11-02 05:57:26 +01:00
Marcin Grzejszczak
f1a6a7f687
Merge branch '1.2.x'
2017-11-02 05:55:53 +01:00
Marcin Grzejszczak
dadb46731e
Sleuth no longer corrupts Error Message Channel Headers ( #765 )
...
fixes #761
2017-11-01 14:21:41 +01:00
Marcin Grzejszczak
79070b66ef
Fixed checkstyle
2017-10-31 17:01:18 +01:00
Simon Baslé
a6ae8ed4fd
make use of Reactor Context in WebFlux related tracing ( #764 )
...
hopefully fixes #679 #677
2017-10-31 16:49:02 +01:00
Marcin Grzejszczak
0149c46ba2
Fixed broken test
2017-10-31 16:17:04 +01:00
buildmaster
7aa40800c0
Going back to snapshots
2017-10-28 07:49:17 +00:00
buildmaster
e369db7d6a
Update SNAPSHOT to 2.0.0.M3
2017-10-28 07:48:07 +00:00
buildmaster
30d3379347
Going back to snapshots
2017-10-24 08:48:01 +00:00
buildmaster
8950751782
Update SNAPSHOT to 1.3.0.RC1
2017-10-24 08:46:31 +00:00
Marcin Grzejszczak
521814a0e2
Merge branch 'master' into 2.0.x
2017-10-23 20:40:59 +02:00
Marcin Grzejszczak
c4241413a0
Merge branch '1.2.x'
2017-10-23 20:40:33 +02:00
Marcin Grzejszczak
3c2c43adff
Fixed the invalid closing of spans; fixes #759
2017-10-23 19:39:08 +02:00
Marcin Grzejszczak
2ea701357e
Merge branch 'master' into 2.0.x
2017-10-20 12:49:07 +02:00
Marcin Grzejszczak
5fff2e03a2
Merge branch '1.2.x'
2017-10-20 12:48:11 +02:00
Marcin Grzejszczak
6f85526096
Setting headers instead of adding them for Zuul; fixes #755
2017-10-20 12:47:15 +02:00
Marcin Grzejszczak
79ba3dbb7f
More defensive approach with HandlerMethod
2017-10-19 15:15:42 +02:00
Marcin Grzejszczak
91a2c799de
More defensive approach with HandlerMethod
2017-10-19 15:15:13 +02:00
Marcin Grzejszczak
2fc22f674b
Merge branch 'master' into 2.0.x
2017-10-19 15:10:09 +02:00
Marcin Grzejszczak
5bdc64ab6c
Merged 1.2.x to master
2017-10-19 13:49:29 +02:00
Dave Syer
7cb320b6c7
Merge branch 'master' into 2.0.x
2017-10-18 10:18:09 +01:00
Dave Syer
70821f4dc3
Test executor channel interceptor
2017-10-18 10:13:57 +01:00
Dave Syer
00e9a1f5dc
Add tests for native headers in message interceptor
2017-10-18 10:13:57 +01:00
Dave Syer
c21a1e6dda
Test for intercepting broker channel
2017-10-18 10:13:57 +01:00
Dave Syer
85d8151592
Ensure native headers get added to STOMP messages
...
Also changed some of the span creation logic in the messaging
interceptor. Seems to make sense. Need more tests.
2017-10-18 10:13:47 +01:00
Adrian Cole
8221068581
Encodes epoch seconds into first 32bits of a 128-bit trace ID ( #724 )
...
Amazon will throw out trace IDs that aren't associated with a recent
timestamp. This encodes the current epoch seconds into the first 32
of a 128-bit trace ID to support conversion to an Amazon Root ID.
2017-10-17 14:55:45 +08:00
Marcin Grzejszczak
eb5a605152
Fixed the build
2017-10-16 09:33:45 +02:00
Marcin Grzejszczak
587da24e8d
Merge branch 'master' into 2.0.x
2017-10-16 09:29:53 +02:00
Marcin Grzejszczak
86a6f7a6d7
Merge branch '1.2.x'
2017-10-16 09:29:41 +02:00
Marcin Grzejszczak
5ec3ca53bf
Fixing recreation of a random; fixes #728
2017-10-16 09:28:32 +02:00
Marcin Grzejszczak
ae3582b1aa
Merge branch 'master' into 2.0.x
2017-10-16 09:21:18 +02:00
Marcin Grzejszczak
11bd578738
Skipping actuator endpoints; fixes #737
2017-10-16 08:28:11 +02:00
Anton Kislitsyn
8c7a20b07c
Filter values having Zipkin compatible keys ( #740 )
...
Optimization linked with necessity to exclude unrequired values from the temporary carrier of header values
2017-10-16 08:14:35 +02:00
Marcin Grzejszczak
9543c33cba
Merge branch 'master' into 2.0.x
2017-10-16 08:10:54 +02:00
Marcin Grzejszczak
ab656f09b6
Merge branch '1.2.x'
2017-10-16 08:10:40 +02:00
Robert Hafner
d7cebccf0c
Non-ASCII characters included in X-SPAN-NAME header. ( #735 )
2017-10-16 08:05:16 +02:00
Marcin Grzejszczak
3dbbd57524
Merge branch 'master' into 2.0.x
2017-10-10 14:19:02 +02:00
Marcin Grzejszczak
29335363c5
Merge branch '1.2.x'
2017-10-10 14:10:51 +02:00
Marcin Grzejszczak
d2672f832a
Added missing delegates to ThreadPoolTaskExecutor; fixes #722
2017-10-10 13:56:42 +02:00
Marcin Grzejszczak
67e7d07b80
Bringing back reactor & webflux support
2017-10-08 20:38:18 +02:00
Adrian Cole
42cd5b737e
Merge branch 'master' into 2.0.x
2017-10-06 14:35:21 +08:00
Adrian Cole
522087ac25
Adds spring.sleuth.supports-join to disable span ID sharing ( #725 )
...
This adds the ability to opt out of span sharing between the client and
server side of an RPC. This is important when reporting to systems that
do not share span IDs, such as Google Stackdriver and Amazon X-Ray.
2017-10-06 14:18:02 +08:00
Adrian Cole
981fbd18f1
Encodes epoch seconds into first 32bits of a 128-bit trace ID ( #724 )
...
Amazon will throw out trace IDs that aren't associated with a recent
timestamp. This encodes the current epoch seconds into the first 32
of a 128-bit trace ID to support conversion to an Amazon Root ID.
2017-10-05 15:29:53 +02:00
Marcin Grzejszczak
c82c52b5ce
Fixed some tests
2017-10-04 16:31:51 +02:00
Marcin Grzejszczak
abac50b4a4
Made Sleuth compile again
2017-10-04 14:56:24 +02:00
Marcin Grzejszczak
2b7a254d96
Bumping versions to 1.2.6.BUILD-SNAPSHOT after release
2017-10-03 14:28:31 +02:00
