Commit Graph

833 Commits

Author SHA1 Message Date
buildmaster
7aa40800c0 Going back to snapshots 2017-10-28 07:49:17 +00:00
buildmaster
e369db7d6a Update SNAPSHOT to 2.0.0.M3 2017-10-28 07:48:07 +00:00
Marcin Grzejszczak
521814a0e2 Merge branch 'master' into 2.0.x 2017-10-23 20:40:59 +02:00
Marcin Grzejszczak
c4241413a0 Merge branch '1.2.x' 2017-10-23 20:40:33 +02:00
Marcin Grzejszczak
3c2c43adff Fixed the invalid closing of spans; fixes #759 2017-10-23 19:39:08 +02:00
Marcin Grzejszczak
2ea701357e Merge branch 'master' into 2.0.x 2017-10-20 12:49:07 +02:00
Marcin Grzejszczak
5fff2e03a2 Merge branch '1.2.x' 2017-10-20 12:48:11 +02:00
Marcin Grzejszczak
6f85526096 Setting headers instead of adding them for Zuul; fixes #755 2017-10-20 12:47:15 +02:00
Marcin Grzejszczak
79ba3dbb7f More defensive approach with HandlerMethod 2017-10-19 15:15:42 +02:00
Marcin Grzejszczak
91a2c799de More defensive approach with HandlerMethod 2017-10-19 15:15:13 +02:00
Marcin Grzejszczak
2fc22f674b Merge branch 'master' into 2.0.x 2017-10-19 15:10:09 +02:00
Marcin Grzejszczak
5bdc64ab6c Merged 1.2.x to master 2017-10-19 13:49:29 +02:00
Dave Syer
7cb320b6c7 Merge branch 'master' into 2.0.x 2017-10-18 10:18:09 +01:00
Dave Syer
70821f4dc3 Test executor channel interceptor 2017-10-18 10:13:57 +01:00
Dave Syer
00e9a1f5dc Add tests for native headers in message interceptor 2017-10-18 10:13:57 +01:00
Dave Syer
c21a1e6dda Test for intercepting broker channel 2017-10-18 10:13:57 +01:00
Dave Syer
85d8151592 Ensure native headers get added to STOMP messages
Also changed some of the span creation logic in the messaging
interceptor. Seems to make sense. Need more tests.
2017-10-18 10:13:47 +01:00
Adrian Cole
8221068581 Encodes epoch seconds into first 32bits of a 128-bit trace ID (#724)
Amazon will throw out trace IDs that aren't associated with a recent
timestamp. This encodes the current epoch seconds into the first 32
of a 128-bit trace ID to support conversion to an Amazon Root ID.
2017-10-17 14:55:45 +08:00
Marcin Grzejszczak
eb5a605152 Fixed the build 2017-10-16 09:33:45 +02:00
Marcin Grzejszczak
587da24e8d Merge branch 'master' into 2.0.x 2017-10-16 09:29:53 +02:00
Marcin Grzejszczak
86a6f7a6d7 Merge branch '1.2.x' 2017-10-16 09:29:41 +02:00
Marcin Grzejszczak
5ec3ca53bf Fixing recreation of a random; fixes #728 2017-10-16 09:28:32 +02:00
Marcin Grzejszczak
ae3582b1aa Merge branch 'master' into 2.0.x 2017-10-16 09:21:18 +02:00
Marcin Grzejszczak
11bd578738 Skipping actuator endpoints; fixes #737 2017-10-16 08:28:11 +02:00
Anton Kislitsyn
8c7a20b07c Filter values having Zipkin compatible keys (#740)
Optimization linked with necessity to exclude unrequired values from the temporary carrier of header values
2017-10-16 08:14:35 +02:00
Marcin Grzejszczak
9543c33cba Merge branch 'master' into 2.0.x 2017-10-16 08:10:54 +02:00
Marcin Grzejszczak
ab656f09b6 Merge branch '1.2.x' 2017-10-16 08:10:40 +02:00
Robert Hafner
d7cebccf0c Non-ASCII characters included in X-SPAN-NAME header. (#735) 2017-10-16 08:05:16 +02:00
Marcin Grzejszczak
3dbbd57524 Merge branch 'master' into 2.0.x 2017-10-10 14:19:02 +02:00
Marcin Grzejszczak
29335363c5 Merge branch '1.2.x' 2017-10-10 14:10:51 +02:00
Marcin Grzejszczak
d2672f832a Added missing delegates to ThreadPoolTaskExecutor; fixes #722 2017-10-10 13:56:42 +02:00
Marcin Grzejszczak
67e7d07b80 Bringing back reactor & webflux support 2017-10-08 20:38:18 +02:00
Adrian Cole
42cd5b737e Merge branch 'master' into 2.0.x 2017-10-06 14:35:21 +08:00
Adrian Cole
522087ac25 Adds spring.sleuth.supports-join to disable span ID sharing (#725)
This adds the ability to opt out of span sharing between the client and
server side of an RPC. This is important when reporting to systems that
do not share span IDs, such as Google Stackdriver and Amazon X-Ray.
2017-10-06 14:18:02 +08:00
Adrian Cole
981fbd18f1 Encodes epoch seconds into first 32bits of a 128-bit trace ID (#724)
Amazon will throw out trace IDs that aren't associated with a recent
timestamp. This encodes the current epoch seconds into the first 32
of a 128-bit trace ID to support conversion to an Amazon Root ID.
2017-10-05 15:29:53 +02:00
Marcin Grzejszczak
c82c52b5ce Fixed some tests 2017-10-04 16:31:51 +02:00
Marcin Grzejszczak
abac50b4a4 Made Sleuth compile again 2017-10-04 14:56:24 +02:00
Marcin Grzejszczak
2b7a254d96 Bumping versions to 1.2.6.BUILD-SNAPSHOT after release 2017-10-03 14:28:31 +02:00
Marcin Grzejszczak
a69610fc0d Going back to snapshots 2017-10-03 14:28:31 +02:00
Marcin Grzejszczak
2cb7663ec8 Update SNAPSHOT to 1.2.5.RELEASE 2017-10-03 14:26:25 +02:00
Marcin Grzejszczak
833bff3372 Fixed a typo 2017-10-03 16:18:51 +08:00
Marcin Grzejszczak
c7d35eea7f Introduced a "shared" field in Span (#698)
whenever:

- a span or trace id get generated when a request / message arrives
- child span is created

we set the field to false

whenever we find ids in the incoming request / message we set the field to true

fixes #696
2017-10-03 16:18:50 +08:00
Marcin Grzejszczak
18eaf4cea4 Merge branch 'master' into 2.0.x 2017-09-30 09:13:35 +02:00
Marcin Grzejszczak
4ac7efa28b Merge branch '1.2.x' 2017-09-30 09:13:01 +02:00
Marcin Grzejszczak
3c447f43b7 Fixing missing new Hook(); fixes #718 2017-09-30 09:12:32 +02:00
Marcin Grzejszczak
535e9f88ef Merge branch 'master' into 2.0.x 2017-09-29 12:21:30 +02:00
Marcin Grzejszczak
171abd664d More stuff compiles 2017-09-27 16:54:51 +02:00
Marcin Grzejszczak
e220179b43 Fixed netflix dependencies (most likely broke sth with oauth2) 2017-09-27 10:45:37 +02:00
Marcin Grzejszczak
1b1a1698ca Removed setting of the "fallback span"
without this change we created a "fallback span" in the case where a Spring component didn't handle the span. By handling it means that it got processed by anyway (a tag, log was added etc.). Why did we do that? That's because if no component was involved in creation of additional spans then in the Zipkin UI the service that had only the span that has the SR, SS logs wouldn't show up. In other words, if service A called service B and service B had only a single span, then service B wouldn't show up in the UI (there would be no blue bar). All the data would show up however in the client side of that span.

with this change we're removing this behaviour. That's because it introduces confusion for our users, that use non Spring related components. Also it seems that the Zipkin UI got fixed and this error no longer is present. If however it turns out that it's still there, it clearly seems that the place to fix this error should be Zipkin and not Sleuth.

fixes #708
2017-09-22 13:21:46 +02:00
Marcin Grzejszczak
cefef8cc9f Fixed return value of the tracer 2017-09-18 20:49:55 +01:00