Commit Graph

240 Commits

Author SHA1 Message Date
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
Dave Syer
9bf19caf07 Add default log pattern for all apps
It goes in the defaultProperties source (appending to the existing
one if possible). That way user can override easily.

Fixes gh-87
2015-12-31 11:09:22 +00:00
Dave Syer
608135551f Add test for closing span hierarchy in message handler 2015-12-31 10:39:57 +00:00
Marcin Grzejszczak
334bc7fdf7 Avoiding NPE in DiscoveryClientEndpointLocator 2015-12-30 16:35:57 +01:00
Adrian Cole
1991bb40c9 Merge pull request #74 from spring-cloud/zipkin-bump
Bumps to latest zipkin and hints about JAVA_OPTS in docker
2015-12-30 09:11:34 +08:00
Dave Syer
882e113c87 Close whole hierarchy at end of message interceptor
Just like in the TraceFilter (web) we need to close the parent
(remote) trace after the message has been processed.
2015-12-29 17:34:55 +00:00
Eric Bottard
bb2aec9f6a Fix small typo in README 2015-12-29 15:44:19 +01:00
Dave Syer
0df278c9af Export export flag via headers when needed
Prevents non-exportable spans from being propagated without knowing
their status.
2015-12-29 10:15:46 +00:00
Adrian Cole
b6e9a8bcac Bumps to latest zipkin and hints about JAVA_OPTS in docker 2015-12-29 17:54:17 +08:00
Adrian Cole
e96401a4c8 Merge pull request #80 from spring-cloud/timestamp-duration
Fixes missing zipkin service name and polishes span converters.
2015-12-29 17:51:41 +08:00
Adrian Cole
e3669417dd Fixes missing zipkin service name and polishes span converters.
Missing service name:

Zipkin service names were logged as null, which is invalid and led to
them showing up as "unknown" in the zipkin ui. This was due to a wiring
bug, and a special-case, which this change fixes.

The special-case was when a sleuth span had no annotations. Since zipkin
service names are attached to annotations, they are only queryable when
annotations exist. When there are no annotations, we add the "lc"
binary annotation, which makes that span attached to the correct service
in zipkin.

Polishing:

Zipkin timestamps were not always set as microseconds. This fixes that.

The de-facto label in zipkin for unknown service is "unknown". This
fixes the code, which formerly fell back to "application".

This also removes complexity in assigning timestamp and duration as we
no longer need to make pseudo-annotations "acquire" and "release".

Finally, this adds tests about above consistently to both scs-zipkin and
scs-zipkin-stream.
2015-12-29 17:10:16 +08:00
Marcin Grzejszczak
fd4df7ce54 Merge pull request #78 from spring-cloud/issues_#39_hystrix_concurrency_strategy
Issues #39 hystrix concurrency strategy
2015-12-24 10:33:56 +01:00
Marcin Grzejszczak
7e8a483149 [#39] Refactored code according to the code review 2015-12-24 10:17:14 +01:00
Marcin Grzejszczak
980e3f2bd5 [#39] Introduced custom Sleuth assertions 2015-12-24 09:50:10 +01:00
Marcin Grzejszczak
6f71402cf9 [#39] Fixed naming and added dependency between hystrix components 2015-12-23 18:50:50 +01:00
Marcin Grzejszczak
6ecfbca6ed [#39] Initial approach to Hystrix concurrency strategy 2015-12-23 18:08:09 +01: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
Marcin Grzejszczak
aaa00a9754 [#75] Working implementation of Hystrix + Feign + Sleuth. Fixes #75 2015-12-23 09:43:04 +01:00
Dave Syer
08f79397ab Add stream sample and docs for how to run it 2015-12-22 12:23:39 +00:00
Dave Syer
c11e530560 Add exportable to Span and use it to determine if data are exported
If the flag is set then annotations are collected and the data are exported
in zipkin or stream. If not you still get the correlation ids, so a purely
log-oriented solution will always have useful data on all requests.
2015-12-22 11:19:24 +00:00
Marcin Grzejszczak
b48f00f677 Removed version param to use default BOM Brixton Snapshot version 2015-12-18 23:14:47 +01:00