Commit Graph

1341 Commits

Author SHA1 Message Date
spencergibb
5bbe5331b7 Use existing PropertyUtils.bootstrapEnabled().
This will take into account if the bootstrap marker class is present and bring parity between ConditionalOnBootstrapDisabled and TextEncryptorConfigBootstrapper
2021-01-06 18:07:54 -05:00
spencergibb
e4e7d3652e Removes spring-hateoas version.
Pinned to a milestone.

Fixes gh-879
2021-01-06 18:04:22 -05:00
buildmaster
f721168bdb Bumping versions 2020-12-22 16:05:15 +00:00
buildmaster
2e76164fc1 Bumping versions to 3.0.1-SNAPSHOT after release 2020-12-21 19:03:43 +00:00
buildmaster
9a5c2f95c4 Going back to snapshots 2020-12-21 19:03:42 +00:00
buildmaster
ab37a182f0 Update SNAPSHOT to 3.0.0 2020-12-21 18:59:37 +00:00
Spencer Gibb
699664f040 Merge pull request #872 from spring-cloud/rebinder
Creates TextEncryptorBindHandler for Binder decryption.

It is registered in TextEncryptorConfigBootstrapper for later use in
other ConfigData implementations.

Creates DecryptEnvironmentPostProcessor. 

This is used if bootstrap and legacy processing are not enabled.

EnvironmentDecryptApplicationInitializer is only is if bootstrap and legacy processing are enabled.

Fixes gh-815

@spencergibb
2020-12-20 11:16:18 -05:00
spencergibb
f77a6ec372 Creates DecryptEnvironmentPostProcessor.
This is used if bootstrap and legacy processing are not enabled.

EnvironmentDecryptApplicationInitializer is only is if bootstrap and legacy processing are enabled.

Fixes gh-815
2020-12-20 11:14:36 -05:00
Marcin Grzejszczak
7211cdd2e8 Creates TextEncryptorBindHandler for Binder decryption.
It is registered in TextEncryptorConfigBootstrapper for later use in
other ConfigData implementations.
2020-12-20 11:12:15 -05:00
Ryan Baxter
1c2f8c07ef making getDiscoveryClients public in ReactiveCompositeDiscoveryClient 2020-12-19 13:31:11 -05:00
Olga Maciaszek-Sharma
c6bfc2d827 Merge remote-tracking branch 'origin/master' 2020-12-18 17:58:35 +01:00
Olga Maciaszek-Sharma
8125db910a Add missing LB properties to configuration-metadata. 2020-12-18 17:58:20 +01:00
Olga Maciaszek-Sharma
a40258394a Lb micrometer stats (#871)
* Add stats lifecycle bean. Add onStartRequest method to LoadBalancerLifecycle. Add loadbalancer.Request field to CompletionContext.

* Add TimedRequestContext interface. Make RetryableRequestContext extend RequestDataContext. Improve generating metrics. Add utility class for working with tags. Ensure tags are not null.

* Add separate meters depending on CompletionContext.Status.

* Modify registered metrics. Add adapter for BlockingLoadBalancerClient requests. Add autoconfiguration.

* Make new config conditional on MeterRegistry class.

* Rename lifecycle bean. Do not log request if 0 timestamp.

* Fix onStartRequest call arguments for BlockingLoadBalancerClient.

* Fix onStartRequest and onComplete calls for RetryLoadBalancerInterceptor.

* Only register timed request once. Add tests.

* Adjust tags logic. Add more tests.

* Add more tests.

* Refactor. Add javadocs.

* Refactor.

* Refactor.

* Retrieve client response data if possible in BlockingLoadBalancerClient.

* Refactor.

* Fix docs after review.

* Make previousServiceInstanceMutable.

* Change argument order for CompletionContext constructors. Remove duplicated start time setting.
2020-12-18 17:46:53 +01:00
Marcin Grzejszczak
1f0f750707 Moves classes from spring-cloud-security to spring-cloud-commons 2020-12-18 17:21:10 +01:00
buildmaster
18b7e0cc9d Bumping versions 2020-12-14 16:05:07 +00:00
buildmaster
29728ceb09 Going back to snapshots 2020-12-11 21:51:11 +00:00
buildmaster
215a24b5dc Update SNAPSHOT to 3.0.0-RC1 2020-12-11 21:49:40 +00:00
Olga Maciaszek-Sharma
188fab7b32 Fix after merge. 2020-12-11 17:41:29 +01:00
Olga Maciaszek-Sharma
c04e4a2aed Merge remote-tracking branch 'origin/2.2.x' 2020-12-11 17:34:41 +01:00
Olga Maciaszek-Sharma
65201f8f61 Add RandomLoadBalancer, along with tests and docs. (#868)
# Conflicts:
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java
2020-12-11 17:33:42 +01:00
Olga Maciaszek-Sharma
ddd370c57d Add function-based health check. Add restTemplate-based health-check beans to default config (#866)
* Switch to a function-based HealthCheckServiceInstanceListSupplier.

* Handle exception for restTemplate based function. Add default blocking health-check configuration.

* Add docs.
2020-12-11 17:20:57 +01:00
Olga Maciaszek-Sharma
c6bd75eb5d Move LoadBalancerProperties to the parent package. 2020-12-10 16:43:30 +01:00
Olga Maciaszek-Sharma
8969d5d1e1 Remove deprecations. 2020-12-10 12:31:45 +01:00
Olga Maciaszek-Sharma
8739f8c233 Fix adding cookies. Update docs. 2020-12-09 20:02:11 +01:00
Olga Maciaszek-Sharma
3faeb77f55 Add HttpServerRequest-based constructor to RequestData. (#865)
* Add HttpServerRequest-based constructor to RequestData. Add HttpServerResponse-based constructor to ResponseData.

* Also get request cookies from headers.

* Handle cookie pattern not found.

* Fix adding cookie.
2020-12-09 18:07:42 +01:00
Olga Maciaszek-Sharma
28e096573a Fix generics. 2020-12-09 14:14:15 +01:00
Olga Maciaszek-Sharma
dce413ae66 Do not pass response body to LB lifecycle beans. (#864)
* Do not pass response body to LB lifecycle beans.

* Fix argument name.
2020-12-09 13:37:58 +01:00
Olga Maciaszek-Sharma
0f98419c47 Request based sticky session (#860)
* Implement first draft for sticky-session load-balancing.

* Make setting instance cookie opt-in.

* Add tests.

* Make adding request cookie opt-in.

* Add docs and javadocs.

* Add default configuration with blocking discovery client.

* Fix docs after review.
2020-12-07 13:08:06 +01:00
Olga Maciaszek-Sharma
c3223934f8 Merge remote-tracking branch 'origin/2.2.x' 2020-12-04 19:00:39 +01:00
Olga Maciaszek-Sharma
c1128e5065 Fix @since info. 2020-12-04 18:59:34 +01:00
Olga Maciaszek-Sharma
2a1a50848f Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	docs/src/main/asciidoc/spring-cloud-commons.adoc
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java
#	spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTests.java
2020-12-04 18:57:33 +01:00
Olga Maciaszek-Sharma
843cb79649 Support same service instance preference (#862)
* Draft initial implementation.

* Rename default configuration property. Check previously chosen instance for equality.

* Verify previous service instance for null. Add tests.

* Add docs.

* Add javadocs.

* Fix javadocs after review.
2020-12-04 18:18:10 +01:00
buildmaster
3d645bbc57 Going back to snapshots 2020-12-01 22:32:07 +00:00
buildmaster
b5801856a3 Update SNAPSHOT to 3.0.0-M6 2020-12-01 22:30:40 +00:00
Olga Maciaszek-Sharma
5a3c2b7364 Add ServerHttpRequestContext. (#857) 2020-12-01 17:08:33 +01:00
Olga Maciaszek-Sharma
c65dfbca6b Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	docs/src/main/asciidoc/_configprops.adoc
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerProperties.java
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplier.java
#	spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java
2020-12-01 11:31:55 +01:00
Olga Maciaszek-Sharma
cbedae2e82 Allow refetching instances for healthcheck (#855)
* Allow refetching instances by HealthCheckServiceInstanceListSupplier.

* Add docs and javadocs.

* Fix docs after review.
2020-12-01 11:14:14 +01:00
Dave Syer
7287a3c767 Re-implement /pause endpoint
A new interface PauseHandler provides a callback for /pause and
/resume. The only implementation provided out of the box is for
Spring Integration's Pausable (so it will work with Spring Cloud
Stream Kafka for instance).

Fixes gh-788
2020-12-01 09:47:59 +00:00
buildmaster
48d315fa5b Bumping versions 2020-11-19 16:05:15 +00:00
buildmaster
4215a9a046 Going back to snapshots 2020-11-17 18:24:16 +00:00
buildmaster
99f2a754d8 Update SNAPSHOT to 3.0.0-M5 2020-11-17 18:22:45 +00:00
buildmaster
ad00eaeeae Bumping versions 2020-11-17 16:04:58 +00:00
spencergibb
f6a3988ed6 Merge branch '2.2.x' 2020-11-16 16:38:04 -05:00
spencergibb
18109085aa formatting 2020-11-16 16:35:52 -05:00
spencergibb
17a82c21aa Move properties to parameter.
Fixes gh-850
2020-11-16 16:34:31 -05:00
buildmaster
97189b4142 Bumping versions 2020-11-16 16:05:02 +00:00
Olga Maciaszek-Sharma
f5a5bef06f Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-commons-dependencies/pom.xml
#	spring-cloud-commons/pom.xml
#	spring-cloud-context-integration-tests/pom.xml
#	spring-cloud-context-webflux-integration-tests/pom.xml
#	spring-cloud-context/pom.xml
#	spring-cloud-loadbalancer/pom.xml
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java
#	spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfigurationTests.java
#	spring-cloud-starter-loadbalancer/pom.xml
#	spring-cloud-starter/pom.xml
#	spring-cloud-test-support/pom.xml
2020-11-16 13:19:56 +01:00
Olga Maciaszek-Sharma
17e9a2af38 Remove LB caching from default health-check config, since HealthCheckServiceInstanceListSupplier has a separate caching mechanism. Fixes gh-849. 2020-11-16 13:11:35 +01:00
Olga Maciaszek-Sharma
7f23cb852f Add Reactive retries for SC LoadBalancer (#847)
* Implement retry logic.

* Fix retrying on next instance when RetryExhausted in same instance.

* Fix retrying on next instance when RetryExhausted in same instance.

* Fix retrying on next instance when RetryExhausted in same instance.

* Move duplicated methods to utility class. Fix checkstyle.

* Fix test.

* Add more tests.

* Fix test.

* Add autoConfiguration.

* Refactor and add javadocs.

* Add javadocs.

* Use RetryAwareServiceInstanceListSupplier with reactive retries.

* Update properties.

* Fix the docs.

* Rename utility class.

* Verify interactions in order.
2020-11-12 11:49:33 +01:00
buildmaster
259df6f4ee Bumping versions to 2.2.7.BUILD-SNAPSHOT after release 2020-11-09 09:32:26 +00:00