Commit Graph

265 Commits

Author SHA1 Message Date
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
Adrian Cole
4ddf929294 Adds Zipkin v2 support (#720)
This adds the ability to use zipkin v2 endpoints natively. It also
allows wiring of standard zipkin reporters and senders.
2017-10-03 08:47:33 +02:00
Marcin Grzejszczak
1311bbb39e Ignored all broken tests 2017-09-29 11:38:31 +02:00
Marcin Grzejszczak
e220179b43 Fixed netflix dependencies (most likely broke sth with oauth2) 2017-09-27 10:45:37 +02:00
Marcin Grzejszczak
895673c164 Going back to snapshots 2017-08-25 13:50:16 +02:00
Marcin Grzejszczak
2561094ac4 Update SNAPSHOT to 2.0.0.M2 2017-08-25 13:48:56 +02:00
Marcin Grzejszczak
f14f5efe43 Going back to snapshots 2017-08-25 12:47:28 +02:00
Marcin Grzejszczak
61ca762dd4 Update SNAPSHOT to 1.3.0.M1 2017-08-25 12:44:31 +02:00
Marcin Grzejszczak
db5e16f998 Merge branch 'master' into 2.0.x 2017-08-25 12:04:41 +02:00
Marcin Grzejszczak
b83caf4ac0 Polish 2017-08-25 11:52:14 +02:00
Marcin Grzejszczak
1b0cb0a05e Fixed broken pom 2017-08-21 11:27:06 +02:00
Marcin Grzejszczak
6c9e50df40 Merge branch '1.2.x' 2017-08-21 10:16:03 +02:00
Marcin Grzejszczak
17df781524 Bumping versions to 1.2.5.BUILD-SNAPSHOT after release 2017-08-21 10:06:48 +02:00
Marcin Grzejszczak
cbddd5568c Going back to snapshots 2017-08-21 10:06:47 +02:00
Marcin Grzejszczak
5eba47d891 Update SNAPSHOT to 1.2.4.RELEASE 2017-08-21 10:01:14 +02:00
Marcin Grzejszczak
02a0c864e8 Bumping versions to 1.2.4.BUILD-SNAPSHOT after release 2017-08-18 18:46:50 +02:00
Marcin Grzejszczak
73211f673b Going back to snapshots 2017-08-18 18:46:49 +02:00
Marcin Grzejszczak
47612da5cc Update SNAPSHOT to 1.2.3.RELEASE 2017-08-18 18:36:51 +02:00
Marcin Grzejszczak
f99c52f2d8 Merge branch 'master' into 2.0.x 2017-08-03 17:56:57 +02:00
Marcin Grzejszczak
4d5156bca7 Started to publish test core jar 2017-08-03 11:09:31 +02:00
Marcin Grzejszczak
e8d30be75e Going back to snapshots 2017-07-21 12:58:54 +02:00
Marcin Grzejszczak
932f8e74d3 Update SNAPSHOT to 1.2.2.RELEASE 2017-07-21 12:30:53 +02:00
Marcin Grzejszczak
49eac36d26 Added intial webclient & webflux support
fixes #635
2017-07-11 12:34:27 +02:00
Adrian Cole
51437503a1 Updates to latest zipkin stuff (#629) (#630)
* zipkin core library has Endpoint.Builder.parseIp now
* reporter being 1.0 is just announcing we won't break compat
2017-07-06 16:24:07 +02:00
Marcin Grzejszczak
18969f063e Merge branch 'master' into 2.0.x 2017-07-06 16:08:30 +02:00
Adrian Cole
70ec026ce0 Updates to latest zipkin stuff (#629)
* zipkin core library has Endpoint.Builder.parseIp now
* reporter being 1.0 is just announcing we won't break compat
2017-07-06 16:00:35 +02:00
Marcin Grzejszczak
56457ce849 Going back to snapshots 2017-06-29 17:04:01 +02:00
Marcin Grzejszczak
0f5e28d078 Update SNAPSHOT to 2.0.0.M1 2017-06-29 16:59:54 +02:00
Marcin Grzejszczak
0f28a43444 Merge branch 'master' into 2.0.x 2017-06-27 15:39:27 +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
474493a54d Bumped libs 2017-06-27 14:02:43 +02:00