Commit Graph

51 Commits

Author SHA1 Message Date
Marcin Grzejszczak
6b88e97b9c TraceManager -> Tracer; startSpan -> startTrace 2016-01-19 09:02:09 +01:00
Adrian Cole
da065504a7 Merge pull request #115 from spring-cloud/pare-down-http
Pares down default http tags, but opens apis for adding more
2016-01-19 12:50:56 +08:00
Marcin Grzejszczak
11c0846353 [#86] Removes the sampler param. Fixed #86 2016-01-18 17:06:09 +01:00
Adrian Cole
860622fb57 Pares down default http tags, but opens apis for adding more
Previously, sleuth logged more data than necessary. This led to issues
including spans approaching megabytes each. This pares down default keys
to a minimal set, but allows users to opt-into logging more by extending
`TraceFilter`.
2016-01-18 21:48:59 +08:00
Marcin Grzejszczak
82ed9f78a1 [#106] Converted UUID to Long
- Changed Random instantiation to a shared Random
- Changed the name of the converter
- Changed generator into random
- Span id is now non-nullable.
    - it gets generated in the http filter if it's not there
    - it's generated in the spring-integration channels if it wasn't set
2016-01-18 14:38:09 +01:00
Adrian Cole
a3af9de4dd Makes it possible to supply an https zipkin endpoint 2016-01-14 22:31:06 +08:00
Marcin Grzejszczak
bf191d7cba Fixed wrong merging 2016-01-14 14:20:56 +01: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
f7fad008bc Remove superfluous Brave dependencies 2016-01-14 09:18:04 +00:00
Dave Syer
687ef45e6d Further simplify integration tests for zipkin-stream
It's not really necessary to use rabbit, but the existing tests
weren't really using the stream components at all because
zipkin spans were being collected by spring-cloud-sleuth-zipkin.
2016-01-14 09:12:36 +00:00
Adrian Cole
425123df86 Updates to zipkin-java 0.4.1, particularly docker images
Zipkin 0.4.1 obviates some duplication of configuration. It is also the
first version that's published as a docker image.

By switching to the published image of zipkin-java, we can be more
consistent, as `spring-cloud-sleuth-zipkin-stream` is derived from that,
not the scala query service.
2016-01-14 11:06:19 +08:00
Marcin Grzejszczak
c6b2369a45 [#84] Adding missing name to the filter. Fixes #84 2016-01-13 20:50:55 +01:00
Marcin Grzejszczak
4efa4c3f27 Removed docker-compose tests 2016-01-13 12:08:47 +01:00
Marcin Grzejszczak
a4035f61db Refactored code, removed notion of DockerTests 2016-01-13 11:51:25 +01:00
Marcin Grzejszczak
e7aa98af6a Removed RabbitMQ and more docker-compose 2016-01-13 11:36:10 +01:00
Marcin Grzejszczak
4968ad2195 Removed mysql from docker-compose 2016-01-13 11:20:36 +01:00
Dave Syer
f204ed6d51 Fix compiler warnings 2016-01-12 17:45:13 +00:00
Marcin Grzejszczak
33fda076ad Updated with Adrian's changes 2016-01-12 16:28:21 +01:00
Marcin Grzejszczak
091a4fc218 Working Zipkin Stream tests 2016-01-12 15:40:42 +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
Marcin Grzejszczak
bcfe84674b Added missing dependency to eureka 2016-01-12 08:22:07 +01:00
Marcin Grzejszczak
3084eab3eb [#89] Added test for zipkin integration 2016-01-11 17:38:24 +01:00
Marcin Grzejszczak
ff7e4ffa8a Fixed surefire and failsafe plugins setup, fixed docker tests 2016-01-11 10:53:20 +01:00
Marcin Grzejszczak
d8248d23c5 Added integration tests on integration profile 2016-01-08 23:28:10 +01:00
Marcin Grzejszczak
9a8dc17d8c [#89] Initial approach to the integration tests
- Fixed the tests
- Updated surefire
- Added integration tests (for the moment ignored)
- Fixed wrong surefire setup
2016-01-08 19:09:37 +01:00
Dave Syer
6a8f23e185 Remove unnecessary configs from samples 2015-12-31 11:24:28 +00:00
Dave Syer
608135551f Add test for closing span hierarchy in message handler 2015-12-31 10:39:57 +00:00
Adrian Cole
b6e9a8bcac Bumps to latest zipkin and hints about JAVA_OPTS in docker 2015-12-29 17:54:17 +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
Dave Syer
08f79397ab Add stream sample and docs for how to run it 2015-12-22 12:23:39 +00:00
Dave Syer
c49ee09b68 Zipkin java bumped to 0.1.1 2015-12-16 10:57:19 +00: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
28dbb0cd14 Refactor docker compose so default launches everything 2015-12-15 11:44:28 +00:00
Spencer Gibb
2d0ff8f436 polish 2015-12-10 10:33:21 -07: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
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
4e21bf1b35 Add strategy EndpointLocator to help with service host/port location 2015-10-01 11:52:28 +01: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
Spencer Gibb
78b60b605c Upgrade to brave 3.0.0-rc-1
fixes gh-33
2015-08-31 18:47:51 -06:00
Spencer Gibb
0f76427ebf add /messaging annotations 2015-08-21 12:03:11 -06:00
Dave Syer
163927edbd Fix parent in samples 2015-08-14 10:33:19 +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
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
516a7e26a4 fixed parent pom version 2015-08-12 13:41:19 -06:00
Dave Syer
47dee39bb3 Add more interesting messaging demo 2015-08-12 14:45:22 +01:00