SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,496 Commits 14 Branches 0 Tags
7aa40800c0ccc080ea632b126d9ae238e01aaef6
Commit Graph

1496 Commits

This Branch
This Branch
All Branches
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
Marcin Grzejszczak
b033cb809d Fixed docs 2017-10-28 09:41:59 +02:00
Marcin Grzejszczak
dabc01ac40 Made the plugin use boot version property 2017-10-28 09:20:17 +02: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
Marcin Grzejszczak
986d8d755f Merge branch 'master' into 2.0.x 2017-10-24 19:19:32 +02: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
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
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
bf6c54330c Removes explicit zipkin2 exclusions 2017-10-20 16:40:01 +03:00
Adrian Cole
931f59e42a Removes explicit zipkin2 exclusions 2017-10-20 16:37:48 +03: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
2d934fc744 Using zipkin2 for stream 2017-10-20 11:39:53 +02:00
Marcin Grzejszczak
3cd77438c1 Fixed deps 2017-10-20 11:22:47 +02:00
Marcin Grzejszczak
eb9f0f5f5f Merge branch 'master' into 2.0.x 2017-10-20 11:12:01 +02:00
Marcin Grzejszczak
3b577d9760 Excluding zipkin2 from zipkin-stream-server 2017-10-20 11:11:00 +02:00
Marcin Grzejszczak
1f9a19c54c Merge branch 'master' into 2.0.x 2017-10-19 18:15:17 +02:00
Marcin Grzejszczak
5b52ddc312 Excluding Zipkin2 dependency from zipkin reporter 2017-10-19 18:15:08 +02:00
Marcin Grzejszczak
6b772cef2a Merge branch 'master' into 2.0.x 2017-10-19 16:44:23 +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
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
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
bf88fa51cf Rename DiscoveryClient*Locator to ServiceInstance*Locator. 
Removes references to removed DiscoveryClient.getLocalServiceInstance()
 2017-10-18 15:13:48 -04:00
Spencer Gibb
8ba5b661f3 Merge branch 'master' into 2.0.x 2017-10-18 14:51:44 -04: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
8c7487a72c Merge branch 'master' into 2.0.x 
# Conflicts:
#	spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java
#	spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/DiscoveryClientEndpointLocatorConfigurationTest.java
#	spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/DiscoveryClientEndpointLocatorTest.java
 2017-10-18 14:23:27 -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
16220f6df8 Merge branch 'master' into 2.0.x 2017-10-18 19:04:22 +02:00
Marcin Grzejszczak
c3f8c2d8e5 Changed to RelaxedPropertyResolver from Environment 2017-10-18 18:50:17 +02:00
Marcin Grzejszczak
0439a7c7b0 Merge branch 'master' into 2.0.x 2017-10-18 18:07:57 +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
Marcin Grzejszczak
2974a50c0c Fixed not compiling code 2017-10-18 13:56:57 +02:00
Dave Syer
7cb320b6c7 Merge branch 'master' into 2.0.x 2017-10-18 10:18:09 +01:00