SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
99 Commits 14 Branches 0 Tags
0caa495fbb4bcada97ffc87b57358d89ed1d0c7d
Commit Graph

99 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Syer
0caa495fbb Add basic integration test to samples 2015-08-13 11:28:19 +01:00
Dave Syer
4df00755a5 Tidy up sample configs 2015-08-13 11:20:49 +01:00
Dave Syer
4b7154e1e5 Add ribbon/zuul features and docs plus a sample 2015-08-13 10:49:32 +01:00
Dave Syer
74ee062d6d Remove unused filter (endpoint is generated in listener now) 2015-08-13 09:04:57 +01:00
Dave Syer
fdde285a69 Revert changes to headers 
Span name is properly optional in Zipkin, but it makes the logs
in Sleuth a lot easier to read. Process ID is optional because it
is a Sleuth feature, but it seems useful.

This reverts commit b4d71727bf.
 2015-08-13 09:04:57 +01:00
Spencer Gibb
c5f6ff9a25 Polish 2015-08-12 16:19:42 -06:00
Spencer Gibb
acf7417e21 Merge pull request #21 from marcingrzejszczak/tech/correlationid-for-feign 
* tech/correlationid-for-feign:
  adding traceid and other headers for feign
 2015-08-12 15:27:23 -06:00
Marcin Grzejszczak
1622372061 adding traceid and other headers for feign 
fixes gh-20
 2015-08-12 15:24:34 -06:00
Spencer Gibb
516a7e26a4 fixed parent pom version 2015-08-12 13:41:19 -06:00
Dave Syer
b4d71727bf Make span name and process id properly optional 2015-08-12 16:22:03 +01:00
Dave Syer
47dee39bb3 Add more interesting messaging demo 2015-08-12 14:45:22 +01:00
Dave Syer
673d8cb0b8 Add integration sample and vanilla non-zipkin sample 2015-08-12 13:59:42 +01:00
Dave Syer
405e07f74a Add another global channel interceptor to create spans 
This might not be the ultimate solution but it should give us
something to look at and collect some data. It doesn't solve the
sampling problem, or the headers copying problem.

See gh-14
 2015-08-12 10:45:42 +01:00
Dave Syer
79d26aeb91 Ensure headers are only added to outgoing HTTP if tracing 2015-08-12 09:29:23 +01:00
Dave Syer
c0ca63ef59 Add SpanContinuedEvent 
So that it can be used to keep the MDC populated when an async request
is continued.

Fixes gh-18
 2015-08-11 22:00:52 +01:00
Dave Syer
37d7b5bedb Split out @Async instrumentation into its own package 
There was an ordering error in the conditions as well, causing the
wrong async customizers to be registered. Another issue was the
servlet async processing (request atribute not cached in all branches)
resulting in multiple spans per request.
 2015-08-11 18:11:00 +01:00
Dave Syer
cfd6fe6bb4 Some tidying of context propagation in Spring Integration 
The client recv/send events have no meaning in a messaging
context, so we don't need to send them. Also added a new
protected method as the inverse of populatePropergatedContext.

Rebased on master and fixed conflicts.

See gh-15
 2015-08-10 08:59:07 +01:00
Spencer Gibb
7da26be608 Instrument spring integration. 
Via a global channel interceptor that adds headers to messages.

fixes gh-14
 2015-08-10 08:24:47 +01:00
Dave Syer
de60266ab5 Extend traces to all rest templates in context 
Also shorten names of enable flags
 2015-08-10 08:23:09 +01:00
Spencer Gibb
3bad17f6a5 update to new container based build system 2015-08-07 13:28:05 -06:00
Spencer Gibb
3776f1ca6d Merge pull request #16 from spring-cloud/log-json 
Optionally print spans to log in json.
 2015-08-07 13:10:28 -06:00
Spencer Gibb
0ee5b94dbe polish test 2015-08-07 13:05:04 -06:00
Spencer Gibb
3e18af4db9 fixed typo in test 2015-08-07 12:13:10 -06:00
Spencer Gibb
95f0dbed72 Shorten config prefix from 'spring.cloud.sleuth' to 'spring.sleuth' 2015-08-07 11:38:30 -06:00
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