Commit Graph

70 Commits

Author SHA1 Message Date
Dave Syer
9bfe364518 SamplerConfiguration -> SamplerProperties
Plus tidy up docs a bit
2016-02-02 16:15:35 +00:00
Dave Syer
d8b72473d1 Ensure sampler is called with the new span if it is to be started 2016-02-01 18:01:34 +00:00
Dave Syer
6d3b8ffc60 Removes testcontainers and mouldy jackson dependencies 2016-02-01 17:30:15 +00:00
Dave Syer
70b18054e1 Add Span to Sampler method params
Also allows us to actually create a PercentageBasedSampler (I
don't think anyone tried it before) without resorting to
lazy beans and proxies.

Another freature added here is a default percentage sampler
if we know that spans need to be exported (zipkin or stream
is present).

Fixes gh-138
2016-02-01 17:00:00 +00:00
Dave Syer
065338118b Reomve unecessary custom log config 2016-02-01 16:08:38 +00:00
Dave Syer
2ce2189799 Remove unused configuration 2016-01-27 11:10:32 +00:00
Marcin Grzejszczak
91ba8cd981 [#128] Changes after review 2016-01-25 16:28:34 +01:00
Marcin Grzejszczak
0ff1cf92bd [#128] Added spans for messaging
fixes #128
2016-01-25 15:57:28 +01:00
Adrian Cole
763d2d027c Updates to latest zipkin, which encourages new http tags 2016-01-25 10:51:05 +01:00
Adrian Cole
b6054bfbe4 Clarifies configuration in zipkin sample 2016-01-25 09:24:54 +01:00
Marcin Grzejszczak
8258289550 [#128] Added an integration test 2016-01-22 13:24:42 +01:00
Marcin Grzejszczak
301c6b230a [#99] Basic Health Metrics
Changes following review
    - Reusing CounterService to automatically profit from Dropwizard if present
    - NoOp is the default impl for SpanReporterService
    - SpanReporterService has configurable metric names (it's enough to change the
    name to 'meter.a.b.c' to profit from Dropwizard's meters)

    Fixes gh-99
2016-01-21 15:55:26 +01:00
Dave Syer
0bbd7cb70f Fix messaging and ribbon instrumentation for hex headers
It still feels brittle because it's up to the suthor of the
instrumentation. This patches all the places where we were still
using Long instead of Long.toHexString(..).

Fixes gh-125
2016-01-21 09:48:34 +00:00
Marcin Grzejszczak
d22a497b0c TraceAccessor -> SpanAccessor 2016-01-20 14:39:08 +01:00
Marcin Grzejszczak
e948855d98 Removed redundant import 2016-01-20 13:04:16 +01:00
Marcin Grzejszczak
7b6a533498 Fixed checkstyle issues 2016-01-20 12:36:38 +01:00
Marcin Grzejszczak
d5b523d021 Converted MilliSpan to Span. Removed the interface 2016-01-20 10:52:02 +01:00
Marcin Grzejszczak
797ca4f50c Removed Trace 2016-01-20 10:50:43 +01:00
Adrian Cole
9bcab5b0c6 Updates to zipkin-java 0.4.3 2016-01-20 12:22:18 +08:00
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