Commit Graph

295 Commits

Author SHA1 Message Date
Marcin Grzejszczak
7eb374b5a5 Sleuth now uses Brave (#829)
with this pull request we have rewritten the whole Sleuth internals to use Brave. That way we can leverage all the functionalities & instrumentations that Brave already has (https://github.com/openzipkin/brave/tree/master/instrumentation).

Migration guide is available here: https://github.com/spring-cloud/spring-cloud-sleuth/wiki/Spring-Cloud-Sleuth-2.0-Migration-Guide

fixes #711 - Brave instrumentation
fixes #92 - we move to Brave's Sampler
fixes #143 - Brave is capable of passing context
fixes #255 - we've moved away from Zipkin Stream server
fixes #305 - Brave has GRPC instrumentation (https://github.com/openzipkin/brave/tree/master/instrumentation/grpc)
fixes #459 - Brave (openzipkin/brave#510) & Zipkin (openzipkin/zipkin#1754) will deal with the AWS XRay instrumentation
fixes #577 - Messaging instrumentation has been rewritten
2018-01-19 22:45:47 +01:00
Marcin Grzejszczak
63ad13a561 Merge branch '1.3.x' 2017-12-18 16:56:30 +01:00
Adrian Cole
5995bbc5fd Moves to significantly more performant zipkin-reporter (#807)
Under load, the previous version of zipkin-reporter's AsyncReporter
caused a lot of overhead. This version fixes that by ensuring encoding
is deferred and not done inside a lock.
2017-12-14 10:09:16 +08:00
Adrian Cole
a1b97002c6 Moves to significantly more performant zipkin-reporter (#808)
Under load, the previous version of zipkin-reporter's AsyncReporter
caused a lot of overhead. This version fixes that by ensuring encoding
is deferred and not done inside a lock.
2017-12-14 10:09:04 +08:00
Marcin Grzejszczak
8a190ddabc Fixed flickering test (due to starting 0 in the traceid) 2017-12-03 09:34:01 -05:00
buildmaster
a8703d71de Going back to snapshots 2017-12-02 04:22:29 +00:00
buildmaster
be281e20a5 Update SNAPSHOT to 2.0.0.M5 2017-12-02 04:21:26 +00:00
Spencer Gibb
ed6642112f Merge branch 'master' into 2.0.x 2017-11-27 23:17:41 -05:00
buildmaster
fc767e972e Bumping versions to 1.3.1.BUILD-SNAPSHOT after release 2017-11-22 14:42:35 +00:00
buildmaster
eb5abec075 Going back to snapshots 2017-11-22 14:42:34 +00:00
buildmaster
69f40d8606 Update SNAPSHOT to 1.3.0.RELEASE 2017-11-22 14:36:16 +00:00
Adrian Cole
54fa7faba4 Bumps to zipkin 2.3.1 2017-11-22 21:17:50 +08:00
Marcin Grzejszczak
63118c79cb Merge branch 'master' into 2.0.x 2017-11-21 19:56:59 +01:00
Marcin Grzejszczak
183ea3b8cf Revert "Updates to zipkin version fixing encoding bug"
This reverts commit dfc5ae5
2017-11-21 19:37:07 +01:00
Marcin Grzejszczak
68709c7843 Trying to fix the build 2017-11-21 19:35:17 +01:00
Marcin Grzejszczak
31ebbf5ccb Fixed wrong versions 2017-11-21 19:26:58 +01:00
Adrian Cole
dfc5ae57bb Updates to zipkin version fixing encoding bug 2017-11-21 19:22:43 +01:00
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
8ba607c7a4 Trying to limit flakey tests 2017-11-17 11:37:17 +01:00
buildmaster
a438e382d6 Going back to snapshots 2017-11-16 19:54:06 +00:00
buildmaster
87a7d13119 Update SNAPSHOT to 2.0.0.M4 2017-11-16 19:52:57 +00:00
Marcin Grzejszczak
f63d37e39c Merge branch 'master' into 2.0.x 2017-11-15 17:40:45 +01:00
Marcin Grzejszczak
85517c6670 Increased timeouts 2017-11-15 17:40:36 +01:00
Marcin Grzejszczak
12715b9d23 Merge branch 'master' into 2.0.x 2017-11-15 17:18:48 +01:00
Marcin Grzejszczak
1ab3870d43 Modified a test to present better output 2017-11-15 17:18:00 +01:00
Marcin Grzejszczak
a4dbfbee5f MAde tests pass, fixed webclient support 2017-11-15 11:51:24 +01:00
Marcin Grzejszczak
8b16089445 Added debug info for messaging tests 2017-11-14 17:20:26 +01:00
Adrian Cole
bd98537297 Updates to zipkin version fixing encoding bug 2017-11-10 15:28:23 +08:00
Adrian Cole
c72bb22cf9 Updates to zipkin version fixing encoding bug 2017-11-10 15:21:21 +08: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
Adrian Cole
338076d351 Merge branch 'master' into 2.0.x 2017-10-27 22:33:34 +08: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
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
Adrian Cole
e56a5a9b3f Removes spring-cloud-sleuth-zipkin-stream (#756)
Fixes #727
2017-10-22 22:55:51 +03:00
Adrian Cole
2a0b09477b Merge branch 'master' into 2.0.x 2017-10-22 19:36:17 +03: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
931f59e42a Removes explicit zipkin2 exclusions 2017-10-20 16:37:48 +03:00
Marcin Grzejszczak
3cd77438c1 Fixed deps 2017-10-20 11:22:47 +02:00
Dave Syer
7cb320b6c7 Merge branch 'master' into 2.0.x 2017-10-18 10:18:09 +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
Marcin Grzejszczak
558c7e2423 Trying to fix the flickering build 2017-10-17 08:29:03 +02:00
Marcin Grzejszczak
45bcc34bc2 Merge branch 'master' into 2.0.x 2017-10-11 10:41:37 +02:00
Adrian Cole
a68c001aab Aligns zipkin versions which include RabbitMQ support (#733) 2017-10-11 10:37:41 +02:00
Marcin Grzejszczak
525e32a7a2 Made the tests pass 2017-10-08 20:18:20 +02:00
Adrian Cole
df78812969 Fixes bad imports 2017-10-06 16:19:29 +08:00
Marcin Grzejszczak
c82c52b5ce Fixed some tests 2017-10-04 16:31:51 +02:00
Marcin Grzejszczak
a79dfbfd59 Merge branch 'master' into 2.0.x 2017-10-03 08:55:17 +02:00