Commit Graph

277 Commits

Author SHA1 Message Date
Dave Syer
fa5fab9175 Make TraceKeys configurable
User can now configure additional HTTP headers to tag via
spring.sleuth.keys.http.headers.

Fixes gh-118
2016-01-19 10:07:35 +00:00
Marcin Grzejszczak
8e5c9bec53 Merge pull request #117 from spring-cloud/issues_#98_match_opentracing
[Match OpenTracing] Matching Tracer
2016-01-19 09:30:03 +01: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
28c2f3fb4b Merge pull request #116 from spring-cloud/issues_#86_sampler_param
[#86] Removes the sampler param. Fixed #86
2016-01-18 17:15:54 +01: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
483737fdc1 Merge pull request #109 from spring-cloud/shinies
Makes it possible to supply an https zipkin endpoint
2016-01-18 08:59:07 +08:00
Marcin Grzejszczak
6f7faf6905 Merge pull request #112 from spring-cloud/issues_#104_flickering_test
[#104] Refactoring the flickering test
2016-01-15 17:15:31 +01:00
Marcin Grzejszczak
57d9e62a66 [#104] Refactoring the flickering test 2016-01-15 14:53:35 +01:00
Marcin Grzejszczak
3a8234f8b9 Fixed travis script - now only master builds upload artifacts 2016-01-15 13:56:04 +01:00
Marcin Grzejszczak
d6fb303a2c Updated sleuth stream e2e script 2016-01-15 12:37:56 +01:00
Marcin Grzejszczak
034bcdcb35 Updated sleuth e2e script 2016-01-15 12:37:20 +01:00
Adrian Cole
a3af9de4dd Makes it possible to supply an https zipkin endpoint 2016-01-14 22:31:06 +08:00
Marcin Grzejszczak
2965d5053a Merge pull request #108 from spring-cloud/remove-brave-dep-merged
Introduces HttpZipkinSpanReporter (rebased)
2016-01-14 15:19:42 +01: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
5580064fbc Merge pull request #105 from spring-cloud/zipkin-0.4.1
Updates to zipkin-java 0.4.1, particularly docker images
2016-01-14 11:45:31 +08: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
Adrian Cole
b45bfa2c24 Adds notes about fields in types explicitly new'ed 2016-01-13 12:01:06 +08:00
Adrian Cole
582cd157dc Adds test missing from last PR 2016-01-13 11:44:57 +08:00
Dave Syer
f204ed6d51 Fix compiler warnings 2016-01-12 17:45:13 +00:00
Dave Syer
368d1ccae7 Rename some of the core API concepts
E.g. annotation -> tag, timelineAnnotation -> log

See gh-98
2016-01-12 17:39:58 +00:00
Marcin Grzejszczak
074a029cd0 Updated docs for integration tests 2016-01-12 17:57:50 +01:00
Marcin Grzejszczak
555c525976 Added docs to integration tests 2016-01-12 17:39:51 +01:00
Marcin Grzejszczak
1d9796cd6a Temporarily removing e2e tests from Travis 2016-01-12 16:56:25 +01: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
Marcin Grzejszczak
e9f307a0be Removing -P integration until df bug is fixed 2016-01-12 15:05:22 +01:00
Adrian Cole
d7f03fbf2a Merge pull request #94 from spring-cloud/collector-sample
Updates to latest zipkin and brave, removing Scribe dependency
2016-01-12 22:00:15 +08: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
877f401231 Unified test naming 2016-01-11 17:52:16 +01:00
Marcin Grzejszczak
3084eab3eb [#89] Added test for zipkin integration 2016-01-11 17:38:24 +01:00
Marcin Grzejszczak
4d3300aab6 Reverting the change with DirtiesContext 2016-01-11 12:02:56 +01:00
Marcin Grzejszczak
d038e7b0cb Trying to fix Hystrix stalling test 2016-01-11 11:58:23 +01:00
Marcin Grzejszczak
7a97e0f093 Fixed Travis scripts so e2e are not executed if build fails 2016-01-11 11:03:31 +01:00
Marcin Grzejszczak
ff7e4ffa8a Fixed surefire and failsafe plugins setup, fixed docker tests 2016-01-11 10:53:20 +01:00
Marcin Grzejszczak
104eac4020 Added Docker Host as a variable 2016-01-09 09:25:05 +01:00
Marcin Grzejszczak
00fd471ddc Added JDK8 2016-01-09 09:16:05 +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