Spencer Gibb
4932eef1c9
Adds toObservable function to HystrixCommands.
...
Lets user have full control over how the Observable is created with
sane defaults for eager/non-eager cases.
2017-10-24 14:46:41 -04:00
Spencer Gibb
c6a00c1a71
Move to proper reactor testing
2017-10-24 14:22:31 -04:00
Stephane Maldini
a67a077906
fix overflow issue with hystrix timeout operator ( #2391 )
...
- The fix adds a necessary buffer between the rx-rs adapter and
the timeout operator introduced in AbstractCommand. Unfortunately,
the hystrix operator does not comply with RS backpressure requirements.
It will always request an unbounded demand to a source regardless of
the command consumer demand. With this commit we protect RS adapter and
downstream flow from overflow. Ideally a rework of the operator should
be planned.
2017-10-24 14:01:44 -04:00
JagmohanSharma
798a4bb2b9
https://github.com/spring-cloud/spring-cloud-netflix/issues/2387 ( #2388 )
...
In order to fix issue with TPS in hystrix-dashboard threadpool section, removing average calculation for propertyValue_metricsRollingStatisticalWindowInMilliseconds. This was done for hystrixCommand.js previously but not for hystrixThreadpool.js.
2017-10-24 13:18:34 -04:00
Spencer Gibb
eb07e2b058
remove java version property
2017-10-23 22:15:37 -04:00
Spencer Gibb
a878472a73
Updates to boot 2.0.0 endpoint and properties.
2017-10-23 21:47:37 -04:00
Spencer Gibb
ef508b4223
Merge branch 'master' into 2.0.x
2017-10-23 21:22:20 -04:00
Spencer Gibb
df7f31098c
Going back to snapshots
2017-10-23 17:44:26 -04:00
Spencer Gibb
fa9524f9c9
Update SNAPSHOT to 1.4.0.RC1
2017-10-23 17:39:56 -04:00
Spencer Gibb
1368f059bb
Change contract property name
2017-10-23 17:16:32 -04:00
Spencer Gibb
8701060355
Add workaround for locally failing test.
2017-10-23 17:05:30 -04:00
Spencer Gibb
ee067ed3f2
Merge branch 'raiRaiyan-gh-2303'
2017-10-23 14:43:38 -04:00
Raiyan
b57dedb74a
- Eureka client auto configures the secure port when secure port is enabled
...
- The eureka instance auto registration also changes the secure port when the server port is random (0)
Fixes gh-2303
2017-10-23 14:43:20 -04:00
Spencer Gibb
d7c13adac0
Merge branch 'tiny-dancer-patch-1'
2017-10-23 14:19:13 -04:00
mg
bd2473a7bf
Update spring-cloud-netflix.adoc
...
Update documentation to reflect https://github.com/spring-cloud/spring-cloud-netflix/issues/1048
2017-10-23 14:18:40 -04:00
Gregor Zurowski
de16cb71f1
Add new filters actuator endpoint ( #2244 )
...
* Add new Zuul filters endpoint and refactor routes endpoint
* Refactor FiltersEndpoint
- Extend from AbstractEndpoint and simplify code
- Move tests classes into package endpoint
- Remove usage of Lombok
* Conditionally enable Zuul routes and filters endpoints
* Provide FilterRegistry to FiltersEndpoint via constructor
2017-10-23 14:08:00 -04:00
Spencer Gibb
4995844f04
Upgrade to eureka 1.8.4
...
fixes gh-2386
2017-10-21 17:45:12 -04:00
Nastya Smirnova
ffc431753b
Create TurbineClustersProvider
...
Extract separate class TurbineClustersProvider to be able to provide custom solution for retrieving configured clusters (#2219 )
2017-10-20 21:46:29 -04:00
Spencer Gibb
67f887d870
Update HystrixCommands to use a builder.
...
Otherwise there would be an explosion of overloaded methods.
2017-10-19 15:52:04 -04:00
Spencer Gibb
5a337fd6c1
Move test to correct package
2017-10-19 14:27:58 -04:00
Spencer Gibb
b71ecc1c24
Remove deprecated DiscoveryClient.getLocalServiceInstance()
2017-10-18 11:49:43 -04:00
Spencer Gibb
71bd19d5df
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTests.java
# spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java
2017-10-18 11:36:41 -04:00
Spencer Gibb
28de82e63c
Use updated Registration rather than getLocalServiceInstance()
...
See https://github.com/spring-cloud/spring-cloud-commons/issues/265
2017-10-18 11:34:38 -04:00
Spencer Gibb
b4709f5db5
Update to hystrix-contract.
...
Updates to 2.0.0
2017-10-17 15:07:07 -04:00
Spencer Gibb
b0dccc0f81
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/DefaultMetricsTagProvider.java
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/DeferredResultSubscriber.java
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/ResponseBodyEmitterSubscriber.java
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/RxResponse.java
# spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/support/RibbonCommandContextTest.java
# spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/rx/ObservableReturnValueHandlerTests.java
# spring-cloud-netflix-dependencies/pom.xml
2017-10-17 14:10:22 -04:00
Spencer Gibb
6c65266f05
Formatting spaces->tabs
2017-10-17 13:37:28 -04:00
Spencer Gibb
6ffe2f1af2
Downgrade archaius to 0.7.4 for java 7 compatibility.
...
see https://github.com/Netflix/archaius/pull/522
2017-10-17 13:12:26 -04:00
Dave Syer
5f26d02433
Merge branch 'master' into 2.0.x
2017-10-17 10:47:46 +01:00
Dave Syer
68ce0cf25f
Merge branch 'feature/eureka-stubs'
2017-10-17 10:47:35 +01:00
Dave Syer
0b638884f7
Fix merge in Turbine Stream tests
2017-10-17 10:46:08 +01:00
Dave Syer
b704dc50c3
Add restassured dependency manually
2017-10-17 10:22:15 +01:00
Dave Syer
62b6d6def2
Fix hystrix tests broken by 2.0 migration
2017-10-17 10:19:20 +01:00
Dave Syer
8d886eedfe
Merge branch 'feature/eureka-stubs' into 2.0.x
2017-10-16 21:35:02 +01:00
Spencer Gibb
7cff8ddbd3
Add missing jackson serialization for instanceinfo.
...
Port information was missing from data sent to eureka.
fixes gh-2372
2017-10-16 16:23:51 -04:00
Dave Syer
9d1eed6a82
Add script to build contract utils
2017-10-16 16:54:35 +01:00
Dave Syer
eeadc829b9
Parameterize contract version
2017-10-13 15:17:46 +01:00
Dave Syer
efe040549c
Move contract helper out of the reactor build
2017-10-13 15:17:46 +01:00
Dave Syer
5bc9e65cdd
Add tests for server metadata
2017-10-13 15:17:46 +01:00
Dave Syer
d6a604051f
Split tests up into individual methods
2017-10-13 15:17:46 +01:00
Dave Syer
51a03b30f2
Consolidate stub tests into one place
2017-10-13 15:17:46 +01:00
Dave Syer
561f3b2fbf
Add wiremock verification
2017-10-13 15:17:46 +01:00
Dave Syer
3a7af2c8fe
Generate some stubs, yay!
2017-10-13 15:17:46 +01:00
Dave Syer
26c7c362d2
Add property to tests, parameterizing stubs
2017-10-13 15:17:46 +01:00
Dave Syer
0642ea52c9
Remove unused stubs file
2017-10-13 15:17:46 +01:00
Dave Syer
957e33207e
Stabilise some tests
2017-10-13 15:17:46 +01:00
Dave Syer
a39fe345b5
Remove deprecated annotation
2017-10-13 15:17:46 +01:00
Dave Syer
40e72ddb8c
Tweak assertions a bit
2017-10-13 15:17:46 +01:00
Dave Syer
195c3fd75d
Extract utility class into shared library for contract tests
2017-10-13 15:17:46 +01:00
Dave Syer
c626bccad3
Add rest template to extract SSE events and assert them
...
The message has to be sent after the endpoint starts up, which only
happens after the first request is accepted, so we put that logic
in the response extractor.
2017-10-13 15:17:46 +01:00
Dave Syer
e295188075
Add tests for body of message
2017-10-13 15:17:46 +01:00
