Commit Graph

1346 Commits

Author SHA1 Message Date
Dave Syer
2259fc6ca9 Remove duplicate maven wrapper 2015-10-12 17:05:44 +01:00
Dave Syer
d9bf984e5f Add spring-cloud-sleuth-stream 2015-10-12 11:09:08 +01:00
Adrian Cole
ea481eee54 Merge pull request #48 from spring-cloud/adrian.fix-type
Sets annotation type to String, so the zipkin UI won't render base64
2015-10-09 22:00:06 -07:00
Adrian Cole
c40c62498b Sets annotation type to String, so the zipkin UI won't render base64 2015-10-09 21:19:30 -07:00
Dave Syer
4e21bf1b35 Add strategy EndpointLocator to help with service host/port location 2015-10-01 11:52:28 +01:00
Dave Syer
1d8d5a0956 Fix null span bug in Zuul filter
If a request is not being sampled, the ClientReceivedEvent should
not be fired.

Fixes gh-47
2015-09-28 07:47:38 +01:00
Dave Syer
588c609b09 Add enabled flag as courtesy 2015-09-22 17:34:42 +01:00
Spencer Gibb
77178afb62 Merge pull request #46 from marcingrzejszczak/issues/42-tracewebfilter-conditional
Removed ConditionalOnMissingBean. Fixes #42
2015-09-21 12:05:21 -06:00
Marcin Grzejszczak
e9b27e6a49 Removed ConditionalOnMissingBean. Fixes #42 2015-09-21 20:02:46 +02:00
Spencer Gibb
8b2593f334 Merge pull request #45 from spring-cloud/bump-zipkin
Updates docker-compose to zipkin 1.9.0
2015-09-21 10:50:50 -06:00
Dave Syer
3b305e6f8f Add basic test for zipkin span listener 2015-09-21 11:59:03 +01:00
Dave Syer
c786f81086 Fix rest template interceptors (workaround for Boot) 2015-09-21 11:59:03 +01:00
Adrian Cole
b867f29cd4 Updates docker-compose to zipkin 1.9.0 2015-09-20 13:32:17 -07:00
Adrian Cole
24b582a325 Merge pull request #43 from spring-cloud/brave-3-final
Updates to brave 3.0.0, removing zipkin's Annotation.duration
2015-09-20 10:07:07 -07:00
Adrian Cole
9e4693e379 Updates to brave 3.0.0, removing zipkin's Annotation.duration 2015-09-20 08:26:39 -07:00
Dave Syer
9612f66754 Drop back to snapshot 2015-09-10 09:02:53 +01:00
Dave Syer
614cfc243b Bump to M1 2015-09-10 09:02:16 +01:00
Dave Syer
0b77e8abdd Ensure Feign is sending complete set of headers
Otherwise the span name is null and the downstream services can't
log the server annotations.

Fixes gh-38
2015-09-07 12:56:34 +01:00
Dave Syer
f7930a10aa Ensure ClientSentEvent is emitted by Feign clients
Fixes gh-38
2015-09-07 12:34:14 +01:00
Dave Syer
2c3528e35b Fix NPE in Feign interceptor
Fixes gh-37
2015-09-07 12:20:18 +01:00
Spencer Gibb
61212c3c9b Merge pull request #36 from wojda/docs-patch-1
Fix minor typo in README.
2015-09-03 17:51:48 -06:00
Spencer Gibb
8fec6942c7 removed extra README 2015-09-03 17:46:48 -06:00
Daniel Wojda
152bd972bb Fix minor typo in README. 2015-09-04 01:11:36 +02:00
Spencer Gibb
5989dfe032 Merge pull request #35 from spring-cloud/brave3
Upgrade to brave 3.0.0-rc-1
2015-08-31 20:22:24 -06:00
Spencer Gibb
78b60b605c Upgrade to brave 3.0.0-rc-1
fixes gh-33
2015-08-31 18:47:51 -06:00
Dave Syer
69751ae63e Make server_send/recv a feature of the web filter 2015-08-23 10:03:25 +01:00
Dave Syer
3188a01fa1 Fix pointcut for async controllers
We need @within (not @target) to capture method executions inside
annotated controllers. With @target all beans with methods returning
Callable get wrapped in case at runtime there is a target match.
2015-08-23 09:56:22 +01:00
Dave Syer
23868f35b7 Add starters 2015-08-23 09:56:22 +01:00
Spencer Gibb
74268a6d4a Use new zuul abstraction for ribbon command 2015-08-21 12:03:50 -06:00
Spencer Gibb
0f76427ebf add /messaging annotations 2015-08-21 12:03:11 -06:00
Spencer Gibb
821e9536b9 Added LICENSE.txt 2015-08-20 16:12:27 -06:00
Dave Syer
cbcb4bdc68 Allow lombok version to be fixed by parent 2015-08-19 16:56:02 +01:00
Dave Syer
db2cdacbfb Fix bug in header names for streams 2015-08-19 13:53:07 +01:00
Dave Syer
7c33f2cb9c Fix typo in spring.factories 2015-08-19 13:37:27 +01:00
Dave Syer
7a701b7d16 Add spring cloud stream processing headers in bootstrap 2015-08-19 08:32:34 +01:00
Spencer Gibb
0e4b94c0b3 if setting a span to null, call remove() 2015-08-18 17:02:22 -06:00
Spencer Gibb
a8289df871 Add title and short description in README 2015-08-18 13:45:43 -06:00
Spencer Gibb
44e4a2d26b Merge pull request #30 from spring-cloud/threadlocal-remove
Use ThreadLocal.remove() rather than .set(null)
2015-08-18 13:16:36 -06:00
Spencer Gibb
b1537f38e0 Use ThreadLocal.remove() rather than .set(null)
fixes gh-27
2015-08-18 12:51:04 -06:00
Spencer Gibb
8841d4186e Make MilliSpan.getTimelineAnnotations read only 2015-08-18 11:03:25 -06:00
Spencer Gibb
b5f63e0cac Merge pull request #28 from rwinch/millispan-getannotations
Add MilliSpan.getAnnotations()
2015-08-18 11:00:07 -06:00
Rob Winch
19aafebd02 Add MilliSpan.getAnnotations()
This fixes the previous commit.
2015-08-18 11:40:37 -05:00
Dave Syer
8d2efdb9a9 Change a few names of things
KV annotations are just "annotations", and the "start" and "stop"
annotations in zipkin are "acquire" and "release" (since, in
particular the latter can in principle happen more than once
and not necessarily the last thing that happens to a span).

TODO: decide if TraceContextHolder is really holding a Span
or a TraceContext (or TraceScope). Maybe think of a better
name for TraceScope.
2015-08-16 10:05:05 +01:00
Dave Syer
6fa9408e76 Ensure span context is cleared at end of interceptors 2015-08-16 08:18:19 +01:00
Dave Syer
163927edbd Fix parent in samples 2015-08-14 10:33:19 +01:00
Dave Syer
bbb5362410 Fix parent to 1.1.0 2015-08-14 10:30:50 +01:00
Dave Syer
3c2f3fa62e Add Maven wrapper 2015-08-14 10:09:44 +01:00
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