Marcin Grzejszczak
88c007698e
Merge branch 'master' into 2.0.x
2017-09-30 18:55:49 +02:00
Marcin Grzejszczak
1937d15553
Merge branch '1.2.x'
2017-09-30 18:55:37 +02:00
Marcin Grzejszczak
16cd03a82b
Ensured that the stream auto configuration gets registered after the Integration one; fixes #719
2017-09-30 18:55:25 +02: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
1311bbb39e
Ignored all broken tests
2017-09-29 11:38:31 +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
4bf4484dcd
Merge branch '1.2.x'
2017-09-19 10:59:58 +01:00
Marcin Grzejszczak
867a49bac8
Reusing environment to get address; fixes #701
2017-09-19 10:59:51 +01:00
Marcin Grzejszczak
cefef8cc9f
Fixed return value of the tracer
2017-09-18 20:49:55 +01:00
Marcin Grzejszczak
2bee027ee1
Trying to make this work
2017-09-17 10:25:13 +02:00
Marcin Grzejszczak
5df9c2e37d
Fixed a typo
2017-09-14 17:33:43 +02:00
Marcin Grzejszczak
5b6d039036
Fixed a typo
2017-09-14 17:15:30 +02:00
Marcin Grzejszczak
cfd3a619dd
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-09-14 17:14:09 +02:00
Marcin Grzejszczak
d439bd527f
Fixed compilation issues
2017-09-12 14:35:17 +02:00
Marcin Grzejszczak
dca34b1db1
Merge branch 'master' into 2.0.x
2017-09-12 13:40:32 +02:00
Marcin Grzejszczak
72eb24ab2a
Bringing back reactor support
2017-09-12 13:37:46 +02:00
Marcin Grzejszczak
5bb444f042
Adding tags for spans created via annotations ( #691 )
...
without this change we don't know which class or method (if the SpanCreator got overridden) was annotated
with this change we're adding the tags with this info
fixes #690
2017-09-12 13:37:01 +02:00
Marcin Grzejszczak
c9945ad173
Added 1.2.x to whitelist
2017-09-06 15:32:20 +02:00
Marcin Grzejszczak
044800806d
Merge branch 'master' into 2.0.x
2017-08-31 15:12:26 +02:00
Marcin Grzejszczak
cdace454c8
Bumped build
2017-08-31 15:10:37 +02:00
Marcin Grzejszczak
746f9b27e0
Merge branch '1.2.x'
2017-08-31 15:08:02 +02:00
Marcin Grzejszczak
a93e475e73
Referrencing resources from sc-build
2017-08-31 15:07:12 +02:00
Marcin Grzejszczak
f8c65bd86f
Merge branch 'master' into 2.0.x
2017-08-29 16:10:28 +02:00
Marcin Grzejszczak
281c9b69f7
Merge branch '1.2.x'
2017-08-29 16:09:59 +02:00
Marcin Grzejszczak
16b28368d2
Migrated to new docs
2017-08-29 16:08:20 +02:00
Marcin Grzejszczak
b2fa4286df
Fixed the multipaged documentation
2017-08-29 16:07:10 +02:00
Marcin Grzejszczak
a7e8e8533a
Migrated to new docs; fixes #687
2017-08-29 16:05:22 +02:00
Marcin Grzejszczak
600effc1ab
Whitelisting 2.0.x
2017-08-29 11:43:36 +02:00
Marcin Grzejszczak
6cae8bf1cd
Fixed the multipaged documentation
2017-08-29 11:43:36 +02:00
Marcin Grzejszczak
dbb69d43c3
Migrated to new docs; fixes #687
2017-08-29 11:43:36 +02:00
Marcin Grzejszczak
3751b2ae61
Fixed the multipaged documentation
2017-08-29 11:40:02 +02:00
Marcin Grzejszczak
5ff48f6c52
Migrated to new docs; fixes #687
2017-08-29 11:40:02 +02:00
Marcin Grzejszczak
deb407eab0
Bumped libs
2017-08-29 11:40:02 +02:00
Dave Syer
d51ea611e4
Merge branch 'master' into 2.0.x
2017-08-29 08:22:48 +01:00
Dave Syer
673658e7c4
Remove unnecessary .google files
2017-08-29 08:22:17 +01:00
Marcin Grzejszczak
3e7bd74abf
Bumped libs
2017-08-29 08:57:40 +02:00
Dave Syer
2a0d434300
Merge branch 'master' into 2.0.x
2017-08-28 10:30:01 +01:00
Dave Syer
9d084a7a4f
Update build to 1.3.5 latest
2017-08-28 10:28:21 +01:00
Marcin Grzejszczak
895673c164
Going back to snapshots
2017-08-25 13:50:16 +02:00
Marcin Grzejszczak
2561094ac4
Update SNAPSHOT to 2.0.0.M2
2017-08-25 13:48:56 +02:00
Marcin Grzejszczak
3719a49db3
Removed reactor property
2017-08-25 13:41:20 +02:00
Marcin Grzejszczak
27854634ca
Added boot property in benchmark
2017-08-25 13:40:19 +02:00
Marcin Grzejszczak
2e03ca667a
Removed webflux and reactor support due to reactor version incompatibility
2017-08-25 13:35:25 +02:00
Marcin Grzejszczak
2729a9095a
Revert "Merge branch 'master' into 2.0.x"
...
This reverts commit 73b67e2b57db5e16f998
2017-08-25 13:25:43 +02:00
Marcin Grzejszczak
73b67e2b57
Merge branch 'master' into 2.0.x
2017-08-25 13:23:50 +02:00
