Commit Graph

75 Commits

Author SHA1 Message Date
Spencer Gibb
7deb9aff7b Polish logging listeners.
Rename slf4j package to log.
Shorten enabled properties.
JsonLogSpanListener only depends on Commons Logging.
2015-08-07 11:16:15 -06:00
Spencer Gibb
a1349f5441 Optionally print spans to log in json.
Uses jackson ObjectMapper to log one line json between a prefix and suffix strings.

fixes gh-12
2015-08-06 16:39:38 -06:00
Spencer Gibb
8afc23c5e4 Add or update copywrite 2015-08-05 17:14:14 -06:00
Spencer Gibb
a16fbab0a1 Initial implementation of http annotations
Part of gh-11
2015-08-04 14:37:46 -06:00
Spencer Gibb
4a7a9deefe Update readme with new content 2015-08-03 16:38:09 -06:00
Spencer Gibb
017edaea39 Merge pull request #13 from rwinch/readme-polish
Polish README
2015-08-03 16:36:45 -06:00
Rob Winch
5e625c9c62 Polish README
General fixes to README

* Change links to asciidoc format
* Update links to use new repository location
* Update travis build status
2015-08-03 17:28:44 -05:00
Spencer Gibb
6c4d62f1a9 Update readme with new content 2015-08-03 16:07:22 -06:00
Spencer Gibb
fcd1ada1ec Allow sample to enable log collector with a property.
Property is sleuth.sample.logging.collector.enabled=true
2015-08-03 16:02:09 -06:00
Dave Syer
df28936718 Finish async customizer 2015-07-31 10:12:06 +01:00
Dave Syer
d38598467c Polish async support
An @Async method should start a new trace. Still not finished that bit
because if the user also customizes the async post processor there will
be a clash.

Biggest change here is better support for async web requests.
Each async request goes through the TraceFilter multiple times so you
have to re-attach to the span in the request if there is one.
2015-07-31 09:38:52 +01:00
Dave Syer
c58381f8ce Fix README to reflect statrus of zipkin
Fixes gh-9
2015-07-31 07:36:38 +01:00
Spencer Gibb
397cb55287 Merge pull request #7 from dsyer/refactor/collector
Use brave collector and add needed parents/ids
2015-07-29 11:53:12 -06:00
Dave Syer
15db080542 Stop using Brave client/server senders in favour of the collector
Directly using the collector gives us more control of the annotations.
The main improvement/change here is that we need to send the span
name and parent details downstream as well as the span id. It's not
logically required by the trace model, but zipkin needs it, so it
can set annotations on the parent span (server recv/send).
2015-07-29 17:27:33 +01:00
Dave Syer
af03054573 Separate parent and child a bit more in ZipkinSpanListener 2015-07-29 13:52:31 +01:00
Dave Syer
145cc641c2 Simplfy some of the core API interfaces and add javadocs 2015-07-29 10:37:44 +01:00
Spencer Gibb
76ca7d1afe added sample kv annotation 2015-07-28 16:27:13 -06:00
Spencer Gibb
eb397417cc fixed missing module 2015-07-28 16:21:50 -06:00
Spencer Gibb
7d2c8aa6f6 updated README 2015-07-28 15:58:51 -06:00
Spencer Gibb
d709fc693f change refs from consul to sleuth 2015-07-28 15:55:08 -06:00
Spencer Gibb
e45cd6bc74 remove unused import 2015-07-28 15:54:48 -06:00
Spencer Gibb
bee30a61e0 Merge commits from dsyer/refactor/zipkin
* refactor/zipkin:
  add SleuthTracer that uses lower level brave classes
  Do not call serverTracer.clearCurrentSpan() at the start of a span
  Add request path to span name
  Use listeners instead of custom callbacks
  Integrate server-side zipkin with core
  Use generics
2015-07-28 14:42:50 -06:00
Spencer Gibb
0f84a5738d add SleuthTracer that uses lower level brave classes
to enable it, set `spring.cloud.sleuth.zipkin.braveTracer.enabled=false`
2015-07-28 14:41:30 -06:00
Dave Syer
7a1ad19097 Do not call serverTracer.clearCurrentSpan() at the start of a span 2015-07-28 18:04:00 +01:00
Dave Syer
203e97681d Add request path to span name 2015-07-28 17:56:48 +01:00
Dave Syer
97ae6151e2 Use listeners instead of custom callbacks 2015-07-28 17:40:27 +01:00
Dave Syer
cba63d0dec Integrate server-side zipkin with core 2015-07-28 17:11:18 +01:00
Dave Syer
19dfe2b0d6 Use generics 2015-07-27 14:13:50 +01:00
Spencer Gibb
a51e92ad0b Merge pull request #4 from spring-cloud-incubator/correlation-abstraction2
Tracing abstraction
2015-07-04 01:58:57 -05:00
Spencer Gibb
cf41d8ece6 polish 2015-07-04 00:49:44 -06:00
Spencer Gibb
74c077816d fix lombok builder syntax 2015-07-04 00:47:49 -06:00
Spencer Gibb
2877d6b870 comment out TraceHandlerInterceptor bean, fix error overflow. 2015-06-26 16:11:25 -06:00
Spencer Gibb
0de00870a6 add TraceWebAspect to wrap Callable's returned in Controllers. 2015-06-26 16:01:50 -06:00
Spencer Gibb
3a24b6f472 add wrappers for Runnable and Callable 2015-06-26 15:36:35 -06:00
Spencer Gibb
749e492bd5 removed references to correlation id 2015-06-26 14:24:09 -06:00
Spencer Gibb
17f27a4cce use TraceInfo instead of creating a bogus parent span 2015-06-26 13:48:30 -06:00
Spencer Gibb
a4e92c2c38 remove unneeded qualifier 2015-06-26 13:48:13 -06:00
Spencer Gibb
4320bbc663 removed setters 2015-06-26 13:30:59 -06:00
Spencer Gibb
fa5996e38e change span.description to span.name 2015-06-26 13:21:04 -06:00
Spencer Gibb
6e7e090a1c Add zuul instrumentation 2015-06-26 12:58:27 -06:00
Spencer Gibb
9829ff9903 Move to event driven interceptors.
use Span{Started|Stopped}Event rather than SpanStartListener/SpanReceiver
2015-06-26 12:37:05 -06:00
Spencer Gibb
2fdae44262 rename property 2015-06-25 15:03:29 -06:00
Spencer Gibb
0425bf333a removed unneeded aop annotation 2015-06-25 15:02:49 -06:00
Spencer Gibb
7ee4c99fa9 move trace intercepting from aop to spring mvc interceptors 2015-06-25 15:02:23 -06:00
Spencer Gibb
4cc3e1c9de fixed build 2015-06-25 14:37:24 -06:00
Spencer Gibb
553645f7cf moved instrumenting classes to instrument package.
removed unneeded RestTemplate infrastructure.
2015-06-25 14:36:16 -06:00
Spencer Gibb
07844b769f rename SpanHolder to TraceContextHolder 2015-06-25 14:13:13 -06:00
Spencer Gibb
05a5709136 Updates to get tracing working on sample app. 2015-06-25 13:58:28 -06:00
Spencer Gibb
e141280720 just set headers rather than creating a new HttpEntity. 2015-06-24 10:24:15 -06:00
Spencer Gibb
cd74691d6a find and update headers using arg type rather than index 2015-06-24 10:22:04 -06:00