Commit Graph

702 Commits

Author SHA1 Message Date
Marcin Grzejszczak
e8a7dfc6eb Updated wrong link in docs 2016-07-27 13:00:02 +02:00
Marcin Grzejszczak
8dbb6e36e4 Fixed missing default Feign.Builder
with this fix if someone is not using Feign he gets the default traced Feign.Builder. Thanks to this no more exceptions should be seen in terms of closing the wrong span.

fixes #350
2016-07-22 18:40:30 +02:00
Marcin Grzejszczak
e28ddc0e72 Migrated to new SpringBootTest
fixes #328
2016-07-19 23:35:30 +02:00
Marcin Grzejszczak
8de8f60c2f Disabling Hystrix for a Feign test 2016-07-19 10:19:32 +02:00
Premanand Chandrasekaran
ee80b301e8 Fix for inability to provide custom implementation of AsyncClientHttpRequestFactory (#342) 2016-07-19 10:13:18 +02:00
Marcin Grzejszczak
4a6a556af0 Added tests and fix docs for AsyncRestTemplate
fixes #334
2016-07-15 16:26:21 +02:00
Marcin Grzejszczak
00b1852efe Changed arraylist to linkedlist 2016-07-15 15:43:13 +02:00
Marcin Grzejszczak
1ffa54f4fc Updated docs 2016-07-15 09:13:14 +02:00
Marcin Grzejszczak
d2c3f63ac8 Added exlipict links to videos 2016-07-15 09:06:16 +02:00
Marcin Grzejszczak
e5da08a0fa Added videos to the docs
fixes #336
2016-07-15 09:02:50 +02:00
Marcin Grzejszczak
deb04e300a Updated docs 2016-07-15 09:00:48 +02:00
Marcin Grzejszczak
48efc5980a Updated docs 2016-07-15 08:23:04 +02:00
Steve Oakey
bf3780536b Added patterns to @GlobalChannelInterceptor (#337)
Makes use of property place holders to set the patterns attribute of the
@GlobalChannelInterceptor annotation used for the
TraceChannelInterceptor. As supported by the annotation, only simple
patterns are supported.

Added the Spring configuration metadata for spring.sleuth.integration
properties.

Fixes gh-323
2016-07-15 08:21:03 +02:00
Marcin Grzejszczak
8d87ed4ceb Fixed the port 2016-07-14 23:45:02 +02:00
Marcin Grzejszczak
1b092c8ca5 Updated readme 2016-07-14 13:51:31 +02:00
Marcin Grzejszczak
a6dd902231 Added additional javadoc information for #332 2016-07-14 13:49:11 +02:00
Marcin Grzejszczak
5caddfa1aa Added Codecov integration 2016-07-14 13:48:51 +02:00
Marcin Grzejszczak
9d3ecca72b Fixed missing wrapping of ExecutorService
with this change the missing methods in ExecutorService are wrapped with LocalComponentTraceCallable. We are wrapping only those callables that have not already been wrapped. Kudos to @PranayPS for finding the issue and proposing a solution.

Fixes #333
2016-07-14 12:59:52 +02:00
Marcin Grzejszczak
3ac3d41bad Fix headers in messaging (#335)
* Fix headers in messaging

with this change the span related headers are changed to be compatible with messaging specs. The change is backwards compatible so we accept the old ones as input, and as output we're producing both new and old headers.

fixes #332
2016-07-14 12:06:39 +02:00
Marcin Grzejszczak
795b7c8e81 Randomized port for a test 2016-07-12 14:20:54 +02:00
Marcin Grzejszczak
4ed747d380 Fixed missing ; in circle scrpit 2016-07-11 15:33:47 +02:00
Marcin Grzejszczak
df3276bafb Fixed a typo in docs 2016-07-11 15:17:27 +02:00
Marcin Grzejszczak
f199321878 Added circle.ci integration
- also limited to 5 seconds awaits
2016-07-11 15:14:21 +02:00
Marcin Grzejszczak
81f70ff071 Removed sending the tracing information back in the response (#329)
fixes #327
2016-07-11 13:21:31 +02:00
Adrian Cole
a7aca7562a Updates to Zipkin 1.3 and rounds up Span duration to one when < 1μ (#326)
Duration of 0 is confusing to plot and can be misinterpreted as null.

See https://github.com/openzipkin/zipkin/issues/1174
See https://github.com/openzipkin/zipkin/releases/tag/1.3.0
2016-07-10 12:08:36 +08:00
Marcin Grzejszczak
777a6299c7 Updating travis script 2016-07-07 11:31:10 +02:00
Marcin Grzejszczak
bfce279d52 Re-added missing server side span (#322)
* Re-added missing server side span

with this change

- HandlerInterceptor is responsible for wrapping requests in spans
- added Sring Data REST instrumentation
- added Zuul instrumentation
- it will not wrap error controller related requests with spans
- tests have been changed to ensure that ALWAYS there is at least one span on the server side (that way it will show up in Zipkin)
- "fallback" mechanism has been added that if a HandlerInterceptor hasn't been used then we are forcing creation of a Span at the server side

fixes #321
(cherry picked from commit 4f1ef52e6c)
2016-07-07 11:03:33 +02:00
Dave Syer
9d296a47b6 Add small sample app to README 2016-07-05 09:57:51 +01:00
Spencer Gibb
384b78b86c Upgrade to s-c-build 1.2.0 2016-07-01 16:39:24 -06:00
Marcin Grzejszczak
48d46b07bb Added RibbonCommand instrumentation (#318)
with this change RibbonRequestCustomizers are created for
- Netflix HttpClient
- OkHttp client
- Apache HttpClient

those customizers know how to inject span into the given context. Also a wrapper over a RibbonCommandFactory bean gets created that injects http trace keys to the given span

fixes #313
2016-06-30 13:02:31 +02:00
Marcin Grzejszczak
61e70deff5 Fixed the hacks for Feign 2016-06-30 11:48:54 +02:00
Marcin Grzejszczak
6bc4a9862b Fixed not clearing spans on messaging exception
with this change we're closing spans on afterSendCompletion and not afterPost thus even if an exception is thrown we will close the span

    fixes #319
2016-06-30 11:21:27 +02:00
Marcin Grzejszczak
6b5fa63553 Exposes getAccumulatedMicros for more precise Span duration (#317)
Formerly, `Span.getAccumulatedMillis()` worked, but could returns
    imprecise measurements, particularly local spans. This changes the
    internals of Span to keep track of a start tick. Using this, it can
    return a more precise `Span.getAccumulatedMicros()`.

    To ensure this precision isn't lost in serialization, this adds a
    json field `durationMicros`, which is only set when the span is stopped.
    This is set instead of start tick because `System.nanoTime()` is JVM
    specific and so cannot be used across the network. `durationMicros` uses
    null instead of zero comparisons because nano time can be negative.

    Fixes #312

    Fixed integration tests to use ZipkinRule
    Introduce assertj assertions (#315)

    * Introduce assertJ assertions in some tests
    * Fix code formatting to be inline with Spring rules
2016-06-29 10:44:00 +02:00
Marcin Grzejszczak
9641d4ef98 Possibility to customize HTTP Client for Zipkin calls
* Added RestTemplate for Zipkin
* Added ZipkinRestTemplateCustomizer to allow possibility to customize RestTemplate
* Addded DefaultZipkinRestTemplateCustomizer with GZip compression interceptor
2016-06-28 12:11:40 +02:00
Spencer Gibb
43a8bcfe2e Pass empty collections rather than null. 2016-06-27 14:46:27 -06:00
Marcin Grzejszczak
98c99db209 Fixed integration tests to use ZipkinRule
Introduce assertj assertions (#315)

    * Introduce assertJ assertions in some tests
    * Fix code formatting to be inline with Spring rules
2016-06-27 15:47:16 +02:00
Marcin Grzejszczak
32450358bf Introduce assertj assertions (#315)
* Introduce assertJ assertions in some tests
    * Fix code formatting to be inline with Spring rules
2016-06-25 10:29:28 +02:00
Marcin Grzejszczak
e4e36d42b7 Fixed issues with aspects 2016-06-24 02:04:40 +02:00
Marcin Grzejszczak
9242ccec06 Updated aspects with SpanNameUtil 2016-06-24 02:01:39 +02:00
Marcin Grzejszczak
7a4dcf6f05 Fixed the aspect for controllers 2016-06-24 01:50:37 +02:00
Marcin Grzejszczak
8f9bba09de Merge branch 'master' of github.com:spring-cloud/spring-cloud-sleuth 2016-06-23 15:00:46 +02:00
Marcin Grzejszczak
7ea2859583 Merge branch '1.0.x' 2016-06-23 14:45:43 +02:00
Marcin Grzejszczak
872afe453b Merge pull request #311 from spring-cloud/renaming_child_server_span
Renaming child server span
2016-06-23 14:44:29 +02:00
Marcin Grzejszczak
05e221ef54 HTTP filter child span renamed
with this change the child span of the HTTP filter span gets changed into a span coming from the Controller aspect. The name of the span becomes the name of the method.
2016-06-23 13:24:16 +02:00
Adrian Cole
f92a84ed1c Updates to zipkin 1.1.5 (#309)
Changes since 1.1.1 related to cassandra or json parsing.

See https://github.com/openzipkin/zipkin/releases/tag/1.1.5
2016-06-23 17:58:19 +08:00
Marcin Grzejszczak
187c58aceb Fixed the issue with Zuul and error code 2016-06-23 11:26:41 +02:00
Marcin Grzejszczak
34cf968bff Randomized port for Zipkin tests 2016-06-23 11:26:41 +02:00
Marcin Grzejszczak
31a0bd885f Added connection factory to rest template for tests 2016-06-23 11:26:41 +02:00
Adrian Cole
be76a076f1 Updates to zipkin 1.1.5 (#309)
Changes since 1.1.1 related to cassandra or json parsing.

See https://github.com/openzipkin/zipkin/releases/tag/1.1.5
2016-06-23 14:41:47 +08:00
Marcin Grzejszczak
0d6f27f43a Throwing exception when tracing is malformed (#308)
with this change we will throw an IllegalArgumentException when the malformed tracing data are sent. In TraceFilter we're catching it and sending back 400 response. In case of messaging the exception gets propagated

fixed #306

* Changes following review

* Changes following review
2016-06-22 16:39:33 +02:00