Commit Graph

1372 Commits

Author SHA1 Message Date
Ian Hu
e42f0987bb Avoid hard-coded SCOPED_TARGET_PREFIX usage. (#811)
Co-authored-by: Spencer Gibb <sgibb@pivotal.io>
2021-02-17 11:34:59 -05:00
Olga Maciaszek-Sharma
36d5350661 Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplier.java
2021-02-17 15:44:21 +01:00
Роман Чигвинцев
95a22796eb Fix bug of service instance refetching when repeating health check is activated (#904)
Fixes gh-899

(cherry picked from commit 3d257b43003a02b64c4f7fd97680e7981d0b52f4)
2021-02-17 15:35:39 +01:00
Olga Maciaszek-Sharma
2e71703df5 Merge 2.2.x 2021-02-15 16:44:36 +01:00
buildmaster
3aff1bea0d Bumping versions to 2.2.8.BUILD-SNAPSHOT after release 2021-02-11 13:11:53 +00:00
buildmaster
c8d0e7f13d Going back to snapshots 2021-02-11 13:11:52 +00:00
buildmaster
d74cd35533 Update SNAPSHOT to 2.2.7.RELEASE 2021-02-11 13:09:01 +00:00
Olga Maciaszek-Sharma
5bfd4610de Backport retryable lb exchange filter function (#902) 2021-02-11 12:11:52 +01:00
johnny850807
361a8c2bae Add getSupportedLifecycleProcessors method in BlockingLoadBalancerClient
# Conflicts:
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java
2021-02-10 11:30:13 +01:00
spencergibb
70ec68fade Adds support for boot 2.5.
Adds version in CompatibilityVerifierProperties and reflection check in SpringBootVersionVerifier

Also removes all reflection checks prior to 2.4 since they no longer apply.

Fixes gh-896
2021-02-01 12:51:22 -05:00
spencergibb
44eab8def2 Adds boot 2.4 support in SpringBootVersionVerifier.
The reason errors weren't reported before with boot 2.4 and cloud 2020.0 is because of an error in logic. See gh-895

See also gh-896
2021-02-01 12:41:16 -05:00
spencergibb
5db02e2bee Removes boot 2.3 from CompatibilityVerifierProperties
See gh-896
2021-02-01 12:38:03 -05:00
spencergibb
d18708fd5b Merge branch '2.2.x' 2021-02-01 12:30:49 -05:00
spencergibb
28932e58e9 Fix false positives in SpringBootVersionVerifier
If user was using boot 2.4 with Hoxton, the manifest check would return false, then try the reflection based predicates which would match 2.3 since the 2.3 predicate still holds true in 2.4

Fixes gh-895
2021-02-01 12:30:16 -05:00
buildmaster
9ded607b35 Bumping versions 2021-01-28 16:05:20 +00:00
buildmaster
6240d30237 Bumping versions to 3.0.2-SNAPSHOT after release 2021-01-27 20:31:42 +00:00
buildmaster
20252d8d30 Going back to snapshots 2021-01-27 20:31:42 +00:00
buildmaster
6e213c5919 Update SNAPSHOT to 3.0.1 2021-01-27 20:27:51 +00:00
spencergibb
4be51d36b8 Formatting 2021-01-26 12:02:45 -05:00
spencergibb
ea6598cd3d Merge branch '2.2.x' 2021-01-26 12:01:39 -05:00
spencergibb
eaa2ddaa86 Formatting 2021-01-26 12:01:13 -05:00
spencergibb
8f84a66998 Merge branch '2.2.x' 2021-01-26 11:57:53 -05:00
spencergibb
00d6a364b2 Moves CloudFlux to spring cloud package.
FluxFirstNonEmptyEmitting and Tests used package private classes/interfaces from reactor. These were replaced with the public interfaces they were extending and any default methods copied to the implementation.

LambdaSubscriber was copied to the test where it was used and had similar treatment for its package protected interfaces.

Fixes gh-887
2021-01-26 11:56:39 -05:00
Olga Maciaszek-Sharma
005f6d5487 Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfiguration.java
2021-01-26 17:44:13 +01:00
Olga Maciaszek-Sharma
5839758365 Add CaffeineCacheManager class conditions to LoadBalancerCacheAutoConfiguration. (#891) 2021-01-26 17:37:44 +01:00
Olga Maciaszek-Sharma
a5903d03e0 Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheManager.java
2021-01-26 17:34:39 +01:00
Olga Maciaszek-Sharma
3493612ab4 Use daemon threads with DefaultLoadBalancerCacheManager. (#890) 2021-01-26 17:29:54 +01:00
Ryan Baxter
81b7e1ba0a Use org security policy 2021-01-21 13:54:30 -05:00
spencergibb
eb32ea8f21 Use encrypt.fail-on-error in DecryptEnvironmentPostProcessor
Fixes gh-882
2021-01-11 11:56:36 -05:00
Ryan Baxter
7744a7f6d2 Deprecating @SpringCloudApplication and @EnableCircuitBreaker (#881) 2021-01-07 15:21:02 -05:00
Olga Maciaszek-Sharma
a3486e2d93 Fix property value. Fixes gh-875. 2021-01-07 11:55:29 +01:00
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