Commit Graph

83 Commits

Author SHA1 Message Date
Marcin Grzejszczak
32e915dae4 Ignoreing both reactor tests 2020-03-31 15:06:53 +02:00
Marcin Grzejszczak
15d2de8eb4 Ignored 2 tests 2020-03-31 14:59:16 +02:00
Marcin Grzejszczak
b7d8fc2f87 Trying to fix Reactor tests 2020-03-31 14:27:17 +02:00
Marcin Grzejszczak
729df801ab Merge branch '2.2.x' 2020-03-31 14:20:34 +02:00
Marcin Grzejszczak
d325756acc Going back to Junit4 2020-03-31 14:10:56 +02:00
Marcin Grzejszczak
a7858671d6 Fixed the build 2020-03-31 13:43:31 +02:00
Adrian Cole
d0a3e6952b Tries higher read timeout for jenkins 2020-03-26 17:41:00 +08:00
Marcin Grzejszczak
3e8d842de9 Merge branch '2.2.x' 2020-03-26 10:20:01 +01:00
Adrian Cole
1e1e1f04bf Finalizes reactor-netty HttpClient implementations (#1586) 2020-03-26 17:10:01 +08:00
Adrian Cole
dd13f09844 Adds first unit test for HttpClientBeanPostProcessor (#1580) 2020-03-06 11:07:00 +08:00
Adrian Cole
656c4720cb Switches to a less flakey span reporter (#1579) 2020-03-06 10:43:54 +08:00
Adrian Cole
d467cc7529 Merge branch '2.2.x' 2020-03-05 12:46:30 +08:00
Adrian Cole
42add19daa Adds base integration test for reactor clients and adds cancelation tests (#1578) 2020-03-05 12:30:01 +08:00
buildmaster
2674fba171 Bumping versions to 2.2.3.BUILD-SNAPSHOT after release 2020-03-04 16:59:42 +00:00
buildmaster
5dd714da5c Going back to snapshots 2020-03-04 16:59:42 +00:00
buildmaster
151218b30a Update SNAPSHOT to 2.2.2.RELEASE 2020-03-04 16:57:41 +00:00
Marcin Grzejszczak
3ce018bc51 Upgrades to JUnit5; fixes gh-1567 2020-03-03 19:53:57 +01:00
Marcin Grzejszczak
a59bfb00cf Merge branch '2.2.x' 2020-03-03 19:44:56 +01:00
Marcin Grzejszczak
2024e28937 Added example with Stream Bridge 2020-03-03 16:22:18 +01:00
Adrian Cole
27fe606c83 polish 2020-03-02 16:24:59 +08:00
Adrian Cole
eec55b9a6c Adds wiring for HttpRequestParser and HttpResponseParser (#1575) 2020-03-02 09:12:47 +08:00
Adrian Cole
db2d9aeaaa Merge branch '2.2.x' 2020-02-26 16:51:58 +08:00
Adrian Cole
7262790717 Performs minimal work to update to Brave 5.10 (#1573)
A later PR will handle new features/deprecation
2020-02-26 16:43:14 +08:00
Adrian Cole
0446918fcf Ensures spring context is closed in brave tests (#1572) 2020-02-26 15:11:18 +08:00
Adrian Cole
51c9158837 Fixes WebClient propagation errors and adds Brave Tests (#1562)
In many places, the trace context of callbacks was accidentally set to
the client span, not the invocation context. I noticed a hack trying to
work around this. This code fixes all the problems around context. It
also removes some sporadic logging, which was only applied to a few
hooks.

Finally, this adds Brave tests which would have caught the problems
earlier. Notably, there is still more work to do as this will not help
with duplicate instrumentation, which is normal when reactor-netty is
the WebClient's HTTP connector.
2020-02-24 14:34:25 +08:00
Olga Maciaszek-Sharma
4634585c35 Adjust to changes in FeignBlockingLoadBalancer client constructor. 2020-02-20 13:45:44 +01:00
Marcin Grzejszczak
0d237b564f Removed deprecated apis; fixes gh-1564 2020-02-18 13:30:00 +01:00
Adrian Cole
47416a8eef Reduces scope copies when desired context is already current (#1558) 2020-02-13 14:56:47 -08:00
Marcin Grzejszczak
3813cf9dd4 Removes modules in maintenance more.
Zuul, ribbon and hystrix
2020-02-12 11:03:04 +01:00
Marcin Grzejszczak
8f2823814f Should really make tests less brittle this time for reactor 2020-02-10 10:41:20 +01:00
Marcin Grzejszczak
cc2a2ce4b8 Should make tests less brittle 2020-02-10 09:33:08 +01:00
Adrian Cole
905ef2cc6f yolo attempt to deflake build 2020-02-07 16:14:39 +08:00
Adrian Cole
4de484504e refactoring flakey test 2020-02-06 15:36:57 +08:00
Adrian Cole
af04d9d431 Corrects HookRegisteringBeanDefinitionRegistryPostProcessor.setupHooks (#1546)
Probably due to code drift, `HookRegisteringBeanDefinitionRegistryPostProcessor.setupHooks`
was used as an object method, which led to a confusing no-op chain in
tests.

This ensures it is used consistently as a static method, and also
corrects a bean accidentally marked static for testing.
2020-02-04 10:16:55 +08:00
Adrian Cole
241f536aef Uses ConfigurableApplicationContext consistently in Reactor (#1545)
Before, we used ConfigurableApplicationContext or BeanFactory eventhough
we already had a reference to ConfigurableApplicationContext. This uses
the latter consistently, avoiding a state condition that caused more
code.

This also corrects some misnamed tests and adjusts them to verify only
what they are responsible for.
2020-02-03 19:26:38 +08:00
Adrian Cole
8a4002d288 Cleanups of build including upgrade of Brave (#1530)
In efforts to dig deep into benchmarks, I noticed we were a bit out of
date on Brave. Then, noticed some other artifacts could be bumped
safely. Finally, a find/replace on http/https was over zealous and
tripped up XML.

One change to test expectations and Brave is explained here:
https://github.com/openzipkin/brave/blob/master/instrumentation/RATIONALE.md#calling-spanfinish-while-the-context-is-in-scope
2020-01-22 19:31:50 +08:00
Olga Maciaszek-Sharma
d7b7e81235 Gh 1528 instrument feign sc loadbalancer client (#1531)
* Add optional SC LoadBalancer dependency. Create TraceFeignBlockingLoadBalancerClient.

* Instrument Spring Cloud LoadBalancer in TraceFeignObjectWrapper.

* Do not use class in field in order to avoid NoClassDefFound.

fixes #1528
2020-01-21 19:57:23 +01:00
Olga Maciaszek-Sharma
31d4574a1c Fix test naming. 2020-01-20 16:05:31 +01:00
Adrian Cole
58a956b29a Addresses Spring Boot 2.3 drift (#1527) 2020-01-20 16:42:17 +08:00
Adrian Cole
d08e106100 Reduces overhead when using reactor by avoiding redundant context syncs (#1525)
This switches to pass around and use `TraceContext` instead of `Span` in
Reactor's context to take advantage of `maybeScope` which is far cheaper
than `withSpanInScope` when the span is already current. This also kills
some extra scope checks and any other accidental calls noticed.

The performance improvement here, I can't quantify as haven't done any
JMH on it.
2020-01-17 23:50:32 +01:00
Marcin Grzejszczak
5a44385448 Removed the workaround since it got fixed in kafka; fixes gh-1515 2020-01-09 09:24:55 +01:00
Olga Maciaszek-Sharma
73f762285e Minor test refactoring. 2020-01-08 15:41:56 +01:00
Olga Maciaszek-Sharma
199ebb69d0 Fix compatibility in feign-based tests. 2020-01-08 15:13:01 +01:00
Csaba Kos
68f720a2e5 Report HTTP pattern and handler function name for functional WebFlux routes. (#1513) 2020-01-07 17:07:28 +01:00
buildmaster
a31ca0ace3 Bumping versions 2019-12-28 05:29:48 +00:00
Marcin Grzejszczak
b1e3f31dd8 Fixing checkstyle 2019-12-27 11:30:52 +01:00
Marcin Grzejszczak
553faa2a50 Fixing checkstyle 2019-12-27 11:25:54 +01:00
Marcin Grzejszczak
48c9d44a9a Merge branch '2.1.x' 2019-12-27 10:06:51 +01:00
colejnic
b492868546 Instruments manually created load-balanced Feign Clients
fixes gh-1125
2019-12-27 09:36:56 +01:00
buildmaster
1c4a3da588 Bumping versions to 2.2.2.BUILD-SNAPSHOT after release 2019-12-20 13:48:43 +00:00