Commit Graph

261 Commits

Author SHA1 Message Date
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
Dave Syer
7c54ad9e66 Add extra dependencies module 2016-01-08 14:34:56 +00:00
Marcin Grzejszczak
ee9594ea96 Added missing TODO 2016-01-07 12:44:39 +01:00
Marcin Grzejszczak
3b6b49fc87 Added test for messaging template and sleuth 2016-01-07 12:43:19 +01:00
Marcin Grzejszczak
640ad4c6f7 [#85] Percentage Based Sampler implementation
fixes #85
- Updated maven setup to support jdk8 in tests
2016-01-06 10:26:13 +01:00
Marcin Grzejszczak
5a1f32c92c Refactored Channel Interceptor code to remove duplications 2016-01-04 16:37:03 +01:00
Marcin Grzejszczak
7ed53116fd Refactored Stomp Propagation Channel tests 2016-01-04 15:54:47 +01:00
Marcin Grzejszczak
04ea3c6b79 Refactored tests for STOMP 2016-01-04 15:33:52 +01:00
Marcin Grzejszczak
502b6b1f85 Merged Support for STOMP messages over websocket
- Merge branch 'master' of https://github.com/gauravrmazra/spring-cloud-sleuth into gauravrmazra-master
- Test scope removed for dependency. Needed for stomp message interceptor support
- Removed unused import from integration test
- Integration tests for TraceStompMessageContextChannelInterceptor
- Refactored code and added integration test for TraceStompMessageChannelInterceptor
- Fix for method which was not available in jdk1.7
- Fix build fail error due to new changes for stomp messages
- Support for STOMP messages over websocket
2016-01-04 10:16:12 +01:00
Dave Syer
c3ac8f570f Test for null in StreamSpanListener
A span can have a null name so we need to guard against it explicitly.
2015-12-31 15:27:17 +00:00
Marcin Grzejszczak
870de624a0 Fixed a typo 2015-12-31 14:48:06 +01:00
Dave Syer
55cd5afcb6 Catch exception in filter chain and use it to set status in span
When a controller throws an exception the servlet container will
eventually set the response status to 500, but it is still 200
generally when the filter chain finishes, unless we catch the
exception and do something with it.

Fixes gh-57
2015-12-31 13:38:16 +00:00
Marcin Grzejszczak
aa00265c8b Fixed the separate script for Stream e2e 2015-12-31 14:35:24 +01:00
Marcin Grzejszczak
63b985ec42 Removed stream e2e from travis 2015-12-31 14:21:40 +01:00
Dave Syer
258abebeb1 Formatting 2015-12-31 12:35:14 +00:00
Dave Syer
75a5ba25fd Only add response headers once 2015-12-31 12:35:06 +00:00
Dave Syer
6a8f23e185 Remove unnecessary configs from samples 2015-12-31 11:24:28 +00:00