Commit Graph

1366 Commits

Author SHA1 Message Date
Marcin Grzejszczak
b60ff42fc8 Made ZIpkin 2 default
fixes #785
2017-11-20 23:06:13 +01:00
Marcin Grzejszczak
2ecd77d151 Fighting flakey tests 2017-11-17 12:02:05 +01:00
Marcin Grzejszczak
85517c6670 Increased timeouts 2017-11-15 17:40:36 +01:00
Marcin Grzejszczak
1ab3870d43 Modified a test to present better output 2017-11-15 17:18:00 +01:00
Marcin Grzejszczak
ab2ccf2562 Updated docs 2017-11-15 15:36:30 +01:00
Marcin Grzejszczak
08b5d04133 Removed @EnableAsync from configuration; fixes #780 2017-11-14 18:03:03 +01:00
Marcin Grzejszczak
e2c11b592c Added RestTemplateBuilder support
fixes #777
2017-11-14 14:57:27 +01:00
Marcin Grzejszczak
360f7ed187 Removed type target from New/ContinueSpan; fixes #772 2017-11-14 11:32:25 +01:00
Adrian Cole
c72bb22cf9 Updates to zipkin version fixing encoding bug 2017-11-10 15:21:21 +08: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
f1a6a7f687 Merge branch '1.2.x' 2017-11-02 05:55:53 +01:00
Marcin Grzejszczak
b96ca210c3 Fixed invalid starter name; fixes #769 2017-11-01 14:26:03 +01:00
Marcin Grzejszczak
dadb46731e Sleuth no longer corrupts Error Message Channel Headers (#765)
fixes #761
2017-11-01 14:21:41 +01:00
Adrian Cole
bfe15ab0cd Misaligns Zipkin v1 from sharing the same version number as v2 (#760)
This does two things: ensures samples don't use Zipkin v1 in any way,
and misaligns the version numbers of zipkin v1 and zipkin v2 apis.

This is an attempt to walk around the gradle plugin issue, which only
exists when someone is using both versions of zipkin.

See https://github.com/spring-projects/spring-boot/issues/10778
2017-10-27 17:29:45 +03:00
Marcin Grzejszczak
08093b0a6e Bumped libs 2017-10-24 19:18:53 +02:00
Marcin Grzejszczak
b800462381 Updated docs 2017-10-24 10:56:26 +02: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
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
Adrian Cole
808572d78e Deprecates all span transports except spring-cloud-sleuth-zipkin2 (#758)
This deprecates span transports in favor of `spring-cloud-sleuth-zipkin2`
which:
* Supports RabbitMQ and Kafka automatically when adding spring-rabbit or spring-kafka deps
* Supports any io.zipkin.reporter2:zipkin-reporter sender, including Amazon X-Ray
* Defaults to zipkin v2 format, but can be configured to use zipkin v1 format as needed

This lowers the amount of maintenance on the project, as discussed in various issues

See #727
See #711
2017-10-22 19:29:22 +03:00
Adrian Cole
bf6c54330c Removes explicit zipkin2 exclusions 2017-10-20 16:40:01 +03: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
2d934fc744 Using zipkin2 for stream 2017-10-20 11:39:53 +02:00
Marcin Grzejszczak
3b577d9760 Excluding zipkin2 from zipkin-stream-server 2017-10-20 11:11:00 +02:00
Marcin Grzejszczak
5b52ddc312 Excluding Zipkin2 dependency from zipkin reporter 2017-10-19 18:15:08 +02:00
Marcin Grzejszczak
444e68c405 Merge branch '1.2.x' 2017-10-19 16:44:13 +02:00
Marcin Grzejszczak
2404afc639 Added docs about parallelStream; fixes #744 2017-10-19 16:24:42 +02:00
Marcin Grzejszczak
07ea07e2b6 Added an interface to provide your own load balancing strategy for Zipkin (#743)
Added an interface to provide your own load balancing strategy for Zipkin. The load balancing strategy allows usage of LoadBalancerClient (impl of which can be Ribbon)

fixes #734
2017-10-19 14:00:53 +02:00
Marcin Grzejszczak
9b42dff6c5 Removed unnecessary import 2017-10-19 14:03:25 +02:00
Marcin Grzejszczak
5bdc64ab6c Merged 1.2.x to master 2017-10-19 13:49:29 +02:00
Marcin Grzejszczak
05a6c35a2c Adjusting the adjusted span; fixes #750 2017-10-19 13:45:58 +02:00
Marcin Grzejszczak
1aa30eda5e Updates sample decisions upon context refresh (#751)
fixes #747
2017-10-19 10:15:11 +02:00
Spencer Gibb
a822e84711 Update DiscoveryClientHostLocator to use Registration.
Leave deprecated constructor with use of deprecated DiscoveryClient.getLocalServiceInstance()

see https://github.com/spring-cloud/spring-cloud-commons/issues/265
2017-10-18 14:51:24 -04:00
Spencer Gibb
410ac62af2 Update DiscoveryClientEndpointLocator to use Registration.
Leave deprecated constructor with use of deprecated DiscoveryClient.getLocalServiceInstance()

see https://github.com/spring-cloud/spring-cloud-commons/issues/265
2017-10-18 14:19:01 -04:00
Marcin Grzejszczak
c3f8c2d8e5 Changed to RelaxedPropertyResolver from Environment 2017-10-18 18:50:17 +02:00
Marcin Grzejszczak
d02c62bb44 Resolve service name at runtime when sending a span to Zipkin; fixes #749 2017-10-18 16:18:41 +02: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
e2dd91e8d5 Adds auto-configuration for RabbitMQ and Kafka transports
Add one of the following to auto-configure a messaging transport:

* spring-kakfa 2.0+
* spring-rabbit < 2.0 (unless amqp-client 5.x is compatible w/ 4.x)
2017-10-18 01:24:18 +08: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
83be1229a1 Fixed case of stream headers 2017-10-16 10:23:33 +02:00
Marcin Grzejszczak
93682d44dd Merge branch '1.2.x' 2017-10-16 09:56:41 +02:00
Marcin Grzejszczak
9ec8283101 Spring Cloud Sleuth is treating comma separated Stream headers in an invalid way
without this change when you pass Stream message headers that are comma separated, Sleuth fails to add proper binding properties for them
with this change we try to first split the headers (assuming that they might be comma based) and then we generate the proper header binding properties

fixes #742
2017-10-16 09:56:27 +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
806f07e4ce Updated docs with service name & bootstrap config; fixes #741 2017-10-16 09:21:05 +02:00