merge from spring cloud commons master. #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This allows apps with spring.main.web-application-type={REACTIVE|SERVLET} to function properly without error.
fixes gh-678
…into srempfer-466
* Swaps deprecated ConditionalOnEnabledEndpoint for updated annotation. Swaps with ConditionalOnAvailableEndpoint * Migrates to new OutputCaptureRule * Migrates to new OutputCaptureRule * Add health check loadBalancing implementation. * Make isAlive() method protected. Co-authored-by: Spencer Gibb <spencer@gibb.tech>
#684) * Add info on SimpleDiscoveryClient in the docs. Remove redundant parameter. * Remove warning after discussion.
# 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
* 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.
* Do not pass response body to LB lifecycle beans. * Fix argument name.
* 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.
…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.
# Conflicts: # spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java
* 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.
It is registered in TextEncryptorConfigBootstrapper for later use in other ConfigData implementations.
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
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
merge from spring cloud commons master.