Commit Graph

189 Commits

Author SHA1 Message Date
Dave Syer
d7e1fcccf0 Add some docs for zipkin stream 2015-12-17 14:55:22 +00:00
Marcin Grzejszczak
4ef93029fb Fixed wrong switch for sleuth stream 2015-12-16 21:19:34 +01:00
Dave Syer
366eb34b1c Add back SLEUTH_STREAM tests 2015-12-16 17:37:24 +00:00
Dave Syer
eaa3c65a9d Comment out missing acceptance tests 2015-12-16 11:45:18 +00:00
Dave Syer
c49ee09b68 Zipkin java bumped to 0.1.1 2015-12-16 10:57:19 +00:00
Adrian Cole
33d7022ca2 Merge pull request #72 from spring-cloud/zipkin-versions
Cleans up unused brave refs and consolidates to zipkin docker 1.26.0
2015-12-16 12:16:36 +08:00
Adrian Cole
1ec5d4f636 Cleans up unused brave refs and consolidates to zipkin docker 1.26.0 2015-12-16 11:11:09 +08:00
Dave Syer
9a38c0d183 Update chmod on sh script 2015-12-15 14:48:13 +00:00
Dave Syer
28dbb0cd14 Refactor docker compose so default launches everything 2015-12-15 11:44:28 +00:00
Dave Syer
327bb46e90 Remove reference to unused class 2015-12-15 09:44:17 +00:00
Adrian Cole
4b54bec809 Merge pull request #70 from spring-cloud/trusty-gce
Updates to use the more powerful and newer trusty slave
2015-12-15 17:25:14 +08:00
Marcin Grzejszczak
a750b4b73e Merge pull request #71 from wybczu/tech/cleanup-bash-scripts
Refactored bash script for running acceptance tests
2015-12-12 09:01:20 +01:00
Lukasz Szczesny
2fc9e25221 Fixed Travis script for branches 2015-12-11 23:36:02 +01:00
Lukasz Szczesny
55de10f195 Refactored bash script for running acceptance tests 2015-12-11 21:15:30 +01:00
Dave Syer
b1068e2050 Re-organize docker files for Zipkin server
Still not quite working:

$ docker-compose -f docker-compose.yml -f docker-compose.zipkin.yml up

everything starts up fine (once the database is initialized), but
the zipkin server is not listening to rabbit (and there are errors
in the logs).
2015-12-11 16:33:25 +00:00
Dave Syer
ce4a7409fa Add Zipkin stream support
@EnableZipkinStreamServer and bind to a Spring Cloud Stream message
broker. That's it. The default span store is in memory, but Zipkin
also supports MySQL (and Cassandra coming soon).
2015-12-11 10:24:03 +00:00
Adrian Cole
0a0aa39c41 Updates to use the more powerful and newer trusty slave 2015-12-11 14:43:31 +08:00
Spencer Gibb
2d0ff8f436 polish 2015-12-10 10:33:21 -07:00
Spencer Gibb
2f35fc7966 polish 2015-12-10 10:11:26 -07:00
Marcin Grzejszczak
ecf7c446a7 Refactored code according to the review 2015-12-10 17:16:32 +01:00
Marcin Grzejszczak
14c1cd1182 Added acceptance tests for Sleuth 2015-12-10 11:48:28 +01:00
Marcin Grzejszczak
c1eb04b68a Fixed Travis script for branches
Added test to ensure that traces are cleared, added fix for Hystrix commands
2015-12-02 19:03:24 +01:00
Marcin Grzejszczak
ad8ba1529f Added test for TraceTemplate 2015-12-02 13:38:01 +01:00
Marcin Grzejszczak
74c7ba54d0 Fixed tests for TraceWebAspect, added WebTask aspect 2015-12-02 13:28:46 +01:00
Dave Syer
70708e22a1 Remove trace from current thread in thread pool
The TraceManager.detach() method should be called by wrapper
tasks submitted to background threads. This change fixes it
in TraceCallable and TraceRunnable. Possibly still some work
to do for Hystrix.

The "detached" flag didn't seem to be doing anything, so I
removed it in the process.

Fixes gh-64, fixes gh-61
2015-12-02 07:58:46 +00:00
Dave Syer
5a9757fede Add additional tests for null thread local in thread pools
Fixes gh-64, probably also gh-61
2015-12-02 07:01:54 +00:00
Dave Syer
327ef60d9e Fix @Ignored test 2015-12-01 17:42:40 +00:00
Dave Syer
192964751a Normalize usage of IdGenerator (only in TraceManager)
Also ensures TraceFilter sends traceId and spanId in response if
they are generated in the request.

Fixes gh-65
2015-12-01 17:08:45 +00:00
Dave Syer
fcb12c8f5e Switch to Spring Core IdGenerator 2015-12-01 16:44:48 +00:00
Marcin Grzejszczak
c0e5c865dd Added tests for trace callable and runnable 2015-12-01 16:03:07 +01:00
Marcin Grzejszczak
ac9ef5f740 Added random port for integration tests 2015-12-01 15:16:57 +01:00
Marcin Grzejszczak
4a1743c984 Moved to BDDAssertJ 2015-12-01 15:13:56 +01:00
Spencer Gibb
cc36d6b8ad Added integration tests 2015-12-01 14:06:04 +00:00
Dave Syer
ffa97c1f20 Big refactor of sleuth core API
Instrumentation should be able to get by with only 2
interfaces: TraceManager and TraceAccessor (the former is
not needed if you aren't starting a new Span). No explicit
access to thread locals or manipulation of thread context
is required (except locally where necessary).

A Span is enclosed by a Trace (actually a view of the complete
Trace that would be constructed remotely).
2015-12-01 14:06:04 +00:00
Spencer Gibb
8351c9ba2c polish 2015-11-30 13:17:32 -07:00
Gaurav Rai Mazra
c588d73552 Providing support to enable tracing in Executors
User can opt to wrap java.unit.concurrent package usage with a
traceable version of the same thing.

Fixes gh-60, fixes gh-58
2015-11-30 09:34:24 +00:00
Adrian Cole
2f253e035c Merge pull request #53 from spring-cloud/annotation-updates
Updates to latest zipkin/brave
2015-11-20 09:22:25 -08: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
1bda0c7c6a Add additional project to BOM 2015-11-02 15:05:16 +00:00
Dave Syer
e935f4e964 Revert profile and add comment 2015-10-20 09:37:16 -04:00
Spencer Gibb
d58a3241f2 Don't trace /hystrix.stream 2015-10-19 15:48:14 -06:00
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