Commit Graph

63 Commits

Author SHA1 Message Date
Marcin Grzejszczak
f2104620df Merge branch 'master' into 2.0.x 2017-07-15 19:52:43 +02:00
Marcin Grzejszczak
8c98386c14 WIP 2017-07-15 19:39:48 +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
474493a54d Bumped libs 2017-06-27 14:02:43 +02:00
Marcin Grzejszczak
ddf4ea131d WIP 2017-06-02 13:58:09 +02:00
Marcin Grzejszczak
91a8e51599 Bumping versions to 1.2.2.BUILD-SNAPSHOT after release 2017-05-23 00:13:03 +02:00
Marcin Grzejszczak
23f9c58116 Going back to snapshots 2017-05-23 00:13:02 +02:00
Marcin Grzejszczak
4f2139e6d6 Update SNAPSHOT to 1.2.1.RELEASE 2017-05-23 00:10:34 +02:00
Adrian Cole
48b4f57dad Bumps to zipkin version aligned with boot 1.5 (#573) 2017-04-26 21:18:36 +08:00
Marcin Grzejszczak
816cfe317a Moved an executor aspect to a bean post processor
without this change when an executor implementation was a final class or had a final method - the application wouldn't start or would produce NPE at startup.
    with this change we have a custom bean post processor that wraps an aspect manualy either via a JDK Proxy when a class is final or a method is final or creates a CGLIB proxy if that's possible.

    fixes #550
2017-04-12 12:14:45 +02:00
Marcin Grzejszczak
c9bbc2e4a5 Bumping versions to 1.2.1.BUILD-SNAPSHOT after release 2017-04-11 10:18:41 +02:00
Marcin Grzejszczak
850534689c Going back to snapshots 2017-04-11 10:06:35 +02:00
Marcin Grzejszczak
fdace4f93a Update SNAPSHOT to 1.2.0.RELEASE 2017-04-11 10:03:04 +02:00
Marcin Grzejszczak
e68bc5e634 Going back to snapshots 2017-03-17 09:44:27 +01:00
Marcin Grzejszczak
760c1841b7 Update SNAPSHOT to 1.2.0.RC1 2017-03-17 09:39:16 +01:00
Marcin Grzejszczak
6d445f56f4 Going back to snapshots 2017-01-30 10:37:40 +01:00
Marcin Grzejszczak
adfaa036a2 Bumping versions before release 2017-01-30 10:31:39 +01:00
Adrian Cole
32d8ea8fc7 Updates to latest zipkin 1.19 (#495)
Most changes are not very interesting to sleuth, though the server is
quite a lot better with UI fixes galore. For sleuth mainly, small api
unaffecting glitch fixes around the Span.Builder.
2017-01-19 20:20:27 +08:00
Marcin Grzejszczak
9785bcae15 Due to possible performance problems when DiscoveryClient gives nonexistent DNS name as local address Local endpoint is created from server properties by default.
Local Ip determined from spring.commons InetUtils.
    To enable local endpoint resolution via service discovery, DiscoveryClient must be present and 'spring.zipkin.service.locator.discovery' should be set to true.
    FallbackHavingEndpointLocator was caching and recreating EndpointLocator in the same time - removed the caching part.

    Fixes gh-403
2017-01-11 12:46:19 +01:00
Marcin Grzejszczak
69521f37f0 Updated version to 1.2.0 2016-11-02 13:58:40 +01:00
Adrian Cole
91e506ce35 Reroutes HttpZipkinSpanReporter to use zipkin.reporter.AsyncReporter (#407)
AsyncReporter is a more robust version of what we were doing before.
Notably, it can give a memory threshold instead of span count for the
backlog. This change ports to use AsyncReporter internally.

See https://github.com/openzipkin/zipkin-reporter-java#asyncreporter
2016-09-15 21:03:28 +08:00
Marcin Grzejszczak
9641d4ef98 Possibility to customize HTTP Client for Zipkin calls
* Added RestTemplate for Zipkin
* Added ZipkinRestTemplateCustomizer to allow possibility to customize RestTemplate
* Addded DefaultZipkinRestTemplateCustomizer with GZip compression interceptor
2016-06-28 12:11:40 +02:00
Marcin Grzejszczak
6456709020 Update to SNAPSHOT 2016-06-10 15:56:21 +02:00
Marcin Grzejszczak
8f726cb514 Update SNAPSHOT to 1.0.1.RELEASE 2016-06-10 15:38:37 +02:00
Dave Syer
fc29838b86 Update to 1.0.1 snapshots 2016-05-11 09:21:54 +01:00
Spencer Gibb
feeb8bda0c Revert "Update SNAPSHOT to 1.0.0.RELEASE"
This reverts commit 4b347228a3.
2016-05-10 15:27:39 -06:00
Spencer Gibb
4b347228a3 Update SNAPSHOT to 1.0.0.RELEASE 2016-05-10 15:21:44 -06:00
Dave Syer
c14f803363 Tidy up some dependencies
Removes wiremock as a test dependency in core (which created more
issues than you might expect because Tomcat and Jetty don't treay
HTTP headers in the same way apparently).

Also moves the spring-messaging dependency to where it is needed
in sleuth stream.
2016-05-04 11:23:03 +01:00
Dave Syer
7dc30191cc Revert to snapshots 2016-04-18 15:11:14 +01:00
Dave Syer
7b40b9808e Update to RC2 2016-04-18 15:09:54 +01:00
Marcin Grzejszczak
e31edbd254 Revert to snapshots 2016-03-23 13:00:05 +01:00
Marcin Grzejszczak
51fd6f784f Bump for 1.0.0.RC1 2016-03-23 12:54:35 +01:00
Marcin Grzejszczak
18b0ea8bea Fixed Sleuth Zipkin tests 2016-03-17 16:28:01 +01:00
Adrian Cole
be1b986bec Refactors HTTP SpanReporter tests to use ZipkinRule
This replaces direct usage of MockWebServer with ZipkinRule.
2016-02-24 14:14:19 +08:00
Marcin Grzejszczak
ee8d7a54c7 Delomboking 2016-02-10 19:09:20 +01:00
Dave Syer
bc48a0094e Revert to snapshots 2016-02-05 10:02:47 +00:00
Dave Syer
203d9cc4f2 Update to 1.1.0.M5 2016-02-05 09:56:38 +00:00
Adrian Cole
9bcab5b0c6 Updates to zipkin-java 0.4.3 2016-01-20 12:22:18 +08:00
Adrian Cole
779b32b363 Introduces HttpZipkinSpanReporter
Brave's span collector, which turned out to not be a great tool for
direct use. Brave internally creates spans before sending to its
collector, so validation is implicit. The flip side of this is using the
collector directly does not validate spans. This means it is easy to
send invalid ones, for example missing span names. The problem is more
difficult as the data is in binary (thrift).

This introduces HttpZipkinSpanReporter, which validates via zipkin-java
classes before sending on the wire. Moreover, this sends in json to make
debugging problems easier.

This does not fully remove the Brave dependency, as further work is
needed. Particularly, Brave is indirectly referenced in other code.

See https://github.com/openzipkin/zipkin-java/issues/68
See #98 (Reporter is an OpenTracing term)
2016-01-14 12:41:59 +01:00
Dave Syer
368d1ccae7 Rename some of the core API concepts
E.g. annotation -> tag, timelineAnnotation -> log

See gh-98
2016-01-12 17:39:58 +00:00
Marcin Grzejszczak
33fda076ad Updated with Adrian's changes 2016-01-12 16:28:21 +01:00
Adrian Cole
84d2706a57 Updates to latest zipkin and brave, removing Scribe dependency
Recent versions of zipkin and brave operate with http instead of scribe.
This changes the implementation accordingly, as well adds a sampler to
the POST endpoint.

A notable impact is that we no longer require a collector process, as
the zipkin server's POST endpoint is a collector.
2016-01-12 21:58:48 +08:00
Dave Syer
ff3c39e497 Revert to snapshots 2015-12-23 09:22:21 +00:00
Dave Syer
3b0ff4b4c5 Update to 1.0.0.M4 2015-12-23 09:12:22 +00:00
Marcin Grzejszczak
8469a4e425 [#73] Added Fallback for enpoint locating. FIxes #73 2015-12-17 18:00:40 +01:00
Adrian Cole
87ff492f2d Updates to latest zipkin/brave
Zipkin now has Span.timestamp/duration, so no more need for
"aquire/release".

This also corrects the host/endpoint logged for timeline annotations, as
it should always be the local process.
2015-11-19 11:16:59 -08:00
Dave Syer
7d3668b23f Revert to snapshots 2015-11-17 12:36:46 +00:00
Dave Syer
576424a514 Update to 1.0.0.M3 2015-11-17 12:34:31 +00:00
Dave Syer
d9bf984e5f Add spring-cloud-sleuth-stream 2015-10-12 11:09:08 +01:00