spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-09-17 15:49:00 +00:00
Code Issues Projects Releases Wiki Activity
1,571 Commits 42 Branches 167 Tags
287ce9c0ff45ee27d8ccae7f6f079f706044aa4e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Spencer Gibb cebbcf592e polish 2017-04-18 12:23:56 -06:00
Spencer Gibb 5440aca212 Merge pull request #1829 from Aloren/feature/exceptions-monitoring 
* feature/exceptions-monitoring:
  Implements zuul CounterFactory
 2017-04-05 11:33:40 -06:00
Spencer Gibb 62408af5ea Don't set chunked encoding with GET. 
fixes gh-1824
 2017-04-03 14:04:07 -06:00
Spencer Gibb 37309218ec Links to sample zuul filters. 
For more advanced filter examples.

fixes gh-1748
 2017-03-23 12:40:41 -06:00
Spencer Gibb a8b170f51c Upgrade eureka to v1.6.2 
fixes gh-1786
 2017-03-16 14:47:08 -06:00
Spencer Gibb b7c5b24d43 comment out failing test 2017-03-14 20:06:07 -06:00
Spencer Gibb 44bb4f2cc3 Move load balancer construction test 2017-03-14 19:01:43 -06:00
Spencer Gibb 55a58eaf30 jmx=false for tests 2017-03-14 18:49:12 -06:00
Spencer Gibb 5d3ca843b6 jmx=false for tests 2017-03-14 18:25:44 -06:00
Spencer Gibb ecf12aa0e7 Makes ServerListUpdater respect configuration. 
By default, `LoadBalancerBuilder` built a load-balancer with a `PollingServerListUpdater`. This change introduces a `ServerListUpdater` bean which creates a `PollingServerListUpdater(IClientConfig)` so that `ribbon.ServerListRefreshInterval` is respected.

 fixes gh-1304
 2017-03-14 12:24:38 -06:00
Spencer Gibb cda92f4ba3 Upgrade Hystrix to v1.5.10 
fixes gh-1766
 2017-03-08 19:57:04 -07:00
Spencer Gibb 15e01dfe5d Don't remove content-length header in feign ribbon. 
Previously, when feign used the Ribbon RestClient, an exception was thrown if Content-Length was set. Over time, feign has moved away from RestClient, yet removing the header still happened.

 Fixes gh-1705
 2017-03-06 20:11:03 -07:00
Spencer Gibb 6df7190472 Update docs for REQUEST_URI_KEY in zuul 2017-03-03 15:19:10 -07:00
Spencer Gibb 5212d138f8 Upgrade okhttp3 to 3.6.0 
Also add com.squareup.okhttp3:logging-interceptor dependency management.

fixes gh-1752
 2017-03-03 09:01:11 -07:00
Spencer Gibb 309b280d0d Log warning if local instance fails. 
If DiscoveryClient.getLocalServiceInstance() throws an exception (ie consul isn't available), log a warning and continue. This is useful for dev type environments.

fixes gh-1603
 2017-02-28 10:26:15 -07:00
Spencer Gibb c0fefc4d1a Update feign to version 9.4.0 
fixes gh-1731
 2017-02-24 15:05:42 -07:00
Spencer Gibb 652fe97a1b fix logger 2017-02-20 13:54:54 -07:00
Spencer Gibb e3341a19cd Add @FeignClient(primary) 
Adds the ability to turn off Spring Cloud Netflix making the feign instances as primary.

fixes gh-1016
 2017-02-15 17:46:12 -07:00
Spencer Gibb 8f5e3ad7c0 polish 2017-02-15 17:30:42 -07:00
Spencer Gibb 7237275f5d polish 2017-02-10 10:14:12 -07:00
Spencer Gibb c6a3157fd8 Adds information on RibbonRoutingFilter HTTP Clients 2017-02-08 20:55:08 -07:00
Spencer Gibb 675e4c1031 Adds example zuul filters. 2017-02-08 19:47:57 -07:00
Spencer Gibb d21d03b738 initial zuul developer guide 2017-02-08 18:53:21 -07:00
Spencer Gibb ff70c08fb9 More zuul constant and javadoc updates 2017-02-08 18:52:41 -07:00
Spencer Gibb 506a9a44af Move many zuul strings to FilterConstants. 
Also adds minimal javadoc to classes.

See gh-1435
 2017-02-08 12:09:53 -07:00
Spencer Gibb 10e8634d38 add additional conditional on class in case of webflux 2017-02-08 10:29:32 -07:00
Spencer Gibb a1577127b7 hopefully fix flaky test 2017-02-06 21:11:25 -07:00
Spencer Gibb 5a1f1d2c64 Remove unused import. 2017-02-06 20:20:22 -07:00
Spencer Gibb a2e1836e24 Merge pull request #1656 from sbley/master 
* pull1656:
  Separate adding X-ForwardedProto header
 2017-02-01 15:33:13 -07:00
Spencer Gibb 601e220411 implement Registration.getServiceId() 2017-02-01 13:45:05 -07:00
Spencer Gibb f27defbdf4 Make sure service-registry actuator is activated. 2017-01-25 15:15:46 -07:00
Spencer Gibb 41bf8eadfd Rename RESET_OVERRIDE to CANCEL_OVERRIDE 2017-01-25 14:23:34 -07:00
Spencer Gibb d76bd84466 Handle content-type with charset. 
A new version of httpclient introduced by boot changed the behaviour that previously allowed the charset. It now has to be parsed out and passed to the apache `ContentType` object explicitly.

fixes gh-1649
 2017-01-25 11:47:11 -07:00
Spencer Gibb 5d0b2fae86 Ignore misbehaving test 2017-01-20 13:42:04 -07:00
Spencer Gibb f8a8b3cf31 Fix broken test logic, rather than >= should be <= 2017-01-20 13:41:49 -07:00
Spencer Gibb a5e5f81d88 Changes equals assertion to greaterThanOrEquals. 
Hopefully this fixes flaky tests.
 2017-01-16 11:41:45 -07:00
Spencer Gibb 66da2d8f48 Merge pull request #1586 from Infrag/master 
* pull1586:
  Adds composed @RequestMapping annotations support
 2017-01-13 14:03:52 -07:00
Spencer Gibb bf586ba2cb polish 2017-01-12 14:32:57 -07:00
Spencer Gibb 22248dd9e9 Merge pull request #1591 from tranhungt/gzip_decompression 
* gzip_decompression:
  Disables httpclient auto decompression of encoded data
 2017-01-12 14:31:32 -07:00
Spencer Gibb 3b41b5e15f Remove mocks for application event listeners. 
fixes gh-1616
 2017-01-12 13:39:46 -07:00
Spencer Gibb 8a9c5fe4a1 Update fixes for hystrix stream test 2017-01-09 21:11:31 -07:00
Spencer Gibb c52309ad59 Update to spring-cloud-build 1.3.1.BUILD-SNAPSHOT 2017-01-09 17:22:08 -07:00
Spencer Gibb 8526371d25 Merge pull request #1451 from madgnome/#1341-single-deferred-result 
* #1341-single-deferred-result:
  #1341 SingleDeferredResult should uses RESULT_NONE from DeferredResult instead of having its own empty result.
 2017-01-09 16:44:04 -07:00
Spencer Gibb 6fc5d1aea3 Merge pull request #1485 from eacdy/master 
* pull1485:
  fix spell error
 2017-01-09 16:11:40 -07:00
Spencer Gibb 64b81ff5a4 Update hystrix to 1.5.9 
fixes gh-1600
 2017-01-09 10:11:39 -07:00
Spencer Gibb c380039b3e Add test to make sure eureka.instance.*virtualHostName can be set properly. 2016-12-16 14:00:31 -07:00
Spencer Gibb 08fe5a89e9 Move SendErrorFilter to type error. 
This will clear up empty 200 responses.

fixes gh-1123
 2016-12-12 15:01:32 -07:00
Spencer Gibb 18b9c46a8b update eureka config first bootstrap for service registry 2016-12-12 10:43:05 -07:00
Spencer Gibb 8b089222bd make external configurations optional 2016-12-08 13:47:19 -07:00
Spencer Gibb 5b25c9ad1a Only auto-register if conditions are correct. 
s-c-commons creates an AutoServiceRegistrationProperties bean if enabled.

This commit only auto registers with eureka if that bean is available.
 2016-12-08 12:27:10 -07:00
Spencer Gibb ec80797694 avoid potential NPE 2016-12-08 12:27:10 -07:00
Spencer Gibb 1fe1ea58f6 Don't override values with defaults. 
Defaults were set too late and were overriding values set in the environment.

Specifically, spring.application.name took precedence over eureka.instance.appname.

 fixes gh-1516
 2016-11-30 11:55:57 -07:00
Spencer Gibb b3f1a30027 Move initalizing appname, etc.. to afterPropertiesSet 2016-11-30 11:55:24 -07:00
Spencer Gibb 111a95d262 Fix Eureka Ribbon Auto Config conditions. 
Specifically, add `@ConditionalOnBean(EurekaClient.class)`.

Fixes an issue where eureka and ribbon are on the classpath, eureka.client.enabled=false which would cause a bean not found exception.

fixes gh-1511

(cherry picked from commit d1f8c03)
 2016-11-29 14:56:55 -07:00
Spencer Gibb aec8ec43ef Fix broken test. 2016-11-07 11:24:52 -07:00
Spencer Gibb 93cd1e7a4a Upgrade to eureka 1.6.0 
fixes gh-1345
 2016-11-07 10:52:47 -07:00
Spencer Gibb ea4e5d76e0 Create EurekaServiceRegistry 
Use the new ServiceRegistry interface

Creates a new EurekaRegistration object that aggregates classes needed
for a single registration.
 2016-11-07 10:52:47 -07:00
Spencer Gibb 428ed6c88c Bump to 1.3.0.BUILD-SNAPSHOT 2016-10-27 15:37:59 -06:00
Spencer Gibb 81959b5ef3 Use new FilterRegistrationBean package. 
Breaks Spring Boot 1.3 compatibility, enables 1.5
 2016-10-25 11:24:42 -06:00
Spencer Gibb 8e6b643829 Use new ServletRegistrationBean package. 
Breaks Spring Boot 1.3 compatibility, enables 1.5
 2016-10-20 11:19:54 -06:00
Spencer Gibb ddc1069e86 Move properties to new namespace. 
Moving eureka.server.{expectedNumberOfRenewsPerMin,defaultOpenForTrafficCount} to eureka.instance.registry so relaxed binding can be used. Default to old values for backwards compatibility.
 2016-10-19 12:36:15 -06:00
Spencer Gibb 12fff7c97f Merge pull request #1339 from alenavorozhbieva/master 
* pull1339:
  Support DELETE method body for SimpleHostRoutingFilter
 2016-10-13 09:34:22 -06:00
Spencer Gibb d23aa67f7b Merge pull request #1370 from tiny-dancer/master 
* pull1370:
  Warning for GC Overhead Limit Reached with servo.
 2016-10-11 10:29:19 -06:00
Spencer Gibb aa160940df import order 2016-10-11 10:25:02 -06:00
Spencer Gibb f30e8b7b46 Remove @Autowired from FeignClientFactoryBean 
@Autowired causes NullPointerExceptions because of some unknown lifecycle issues.

fixes gh-1366
 2016-10-06 10:19:46 -06:00
Spencer Gibb ba3923d706 Fix zuul error when there are colons in request param name. 
Previously, parameter names with colons (ie foo:bar), caused an IllegalArgumentException because 41c364002f introduced UriTemplate to properly encode.

fixes gh-1193
 2016-10-05 12:51:28 -06:00
Spencer Gibb 622cc83204 polish 2016-10-04 18:48:28 -06:00
Spencer Gibb 0adbd5662f polish 2016-10-04 18:39:07 -06:00
Spencer Gibb be6f2634b5 Allow OkHttpClient to be customized. 
Moved common functionality to AbstractLoadBalancingClient
 2016-09-23 14:09:41 -06:00
Spencer Gibb 9eed249028 Allow customization of HttpClient. 
Uses ribbon settings to set MaxConnTotal and MaxConnPerRoute. Also allows user to create a custom HttpClient as a constructor argument.

fixes gh-1149
 2016-09-22 19:42:20 -06:00
Spencer Gibb bbff2b24d0 Put Apache Http Client and OkHttpClient in ribbon context. 
This eliminates them being created for every zuul request.

Also makes properties consistent accross modules: ribbon.httpclient.*, ribbon.restclient.* and ribbon.okhttp.*

fixes gh-1150
 2016-09-22 15:46:53 -06:00
Spencer Gibb 758ff920fc Merge pull request #1351 from VanRoy/improve-formbodywrapperfilter-test 
* improve-formbodywrapperfilter-test:
  Add test on FormBodyWrapperFilter to avoid regressions (#1171)
 2016-09-16 14:42:48 -06:00
Spencer Gibb 85eab87dce formatting 2016-09-15 08:34:59 -06:00
Spencer Gibb 498e8a1486 Use default maxSemaphore property. 
Rather than hard code the default maxSemaphores for zuul use the already defined `zuul.semaphore.maxSemaphores` property.

fixes gh-1332
 2016-09-12 09:36:22 -06:00
Spencer Gibb a6785afa5a Exclude commons-logging from archaius starter 
fixes gh-126
 2016-09-07 11:16:51 -06:00
Spencer Gibb c7403361fd polish 2016-09-06 08:40:49 -06:00
Spencer Gibb 048d401309 Merge pull request #1310 from garciafl/master 
* garciafl-master:
  Removes RibbonCommand suffix.
 2016-09-01 09:24:39 -06:00
Spencer Gibb 959b007269 removed duplicate feign ApacheHttpClient configuration 2016-08-31 12:02:25 -06:00
Spencer Gibb 9b550f7293 Support delete with body in zuul where possible. 
The apache http client and ok http client support delete with body, ribbon rest client does not.

fixes gh-949
 2016-08-31 11:43:05 -06:00
Spencer Gibb dc26b1efa8 Merge pull request #1102 from lowzj/request-param-processor 
* lowzj-request-param-processor:
  update RequestParamParameterProcessor to support map param
 2016-08-31 11:05:05 -06:00
Spencer Gibb c5b0ffe310 Document customizing the Ribbon Client using properties 
fixes gh-1188
 2016-08-30 10:17:04 -06:00
Spencer Gibb 1ffa7825ed Add {spring-cloud-version} 2016-08-30 09:58:21 -06:00
Spencer Gibb d95f3cd1c5 Mention starters to include for features. 
fixes gh-1134
 2016-08-30 09:44:18 -06:00
Spencer Gibb 6ba64d97c8 Upgrade feign to 9.3.1 
fixes gh-1303
 2016-08-30 09:22:40 -06:00
Spencer Gibb fa508a2c7e Add warning for eureka healthcheck. 
fixes gh-1276
 2016-08-30 09:14:32 -06:00
Spencer Gibb d04df564f0 Try and fix old static wonkiness in test. 2016-08-29 12:47:35 -06:00
Spencer Gibb 5f192dd6ce Fix NPE when instance has no status page url. 
fixes gh-1285
 2016-08-29 12:29:57 -06:00
Spencer Gibb 6819922d26 Fix MetricsTagProvider for non web apps. 
Guard creating and creation of classes that use it with @ConditionalOnClass(name = "javax.servlet.http.HttpServletRequest")

fixes gh-1302
 2016-08-29 10:43:17 -06:00
Spencer Gibb 43adc84dfd Make moving to https urls consistent. 
This fixes a case where the ribbon property is set `ribbon.IsSecure=false`, but because the eureka secure port was enabled, the uri created by ribbon was prefixed with https when it shouldn't have.

All places where isSecure is need have been consolidated into RibbonUtils.

fixes gh-1270
 2016-08-22 17:16:13 -06:00
Spencer Gibb 8d6aeebb61 Feign URI tests updated to be more inclusive. 
Previously with a `@FeignClient(name="http://bad_hostname")` would pass the start time test and fail later in runtime. The test now fails fast.

fixes gh-1257
 2016-08-22 15:05:59 -06:00
Spencer Gibb 25366c2a37 Add not about zuul route ordering. 
fixes gh-1266
 2016-08-18 11:33:29 -06:00
Spencer Gibb 9ed5621a78 Revert "Adds zuul property to customize Hystrix ExecutionIsolationStrategy" 
This reverts commit 21df6e43a3.
 2016-08-17 09:57:35 -06:00
Spencer Gibb 64fff7edd2 Merge branch 'context-path-prefix-support' of https://github.com/kakawait/spring-cloud-netflix into kakawait-context-path-prefix-support 2016-08-16 12:59:10 -06:00
Spencer Gibb beb84dbe07 Merge branch 'molindo-1108-proxy-headers' 2016-08-16 12:57:10 -06:00
Spencer Gibb 34befdf1d2 Merge branch 'stephlag-zuul_hystrix_threadpool' 2016-08-16 10:44:32 -06:00
Spencer Gibb 674e45f473 Add Client to list of feign objects that can be customized. 2016-08-10 14:13:28 -06:00
Spencer Gibb 0c694a018c Merge pull request #1242 from mikexliu/master 
* pull1242:
  Add @Qualifier customization for @FeignClient
 2016-08-10 12:22:45 -06:00
Spencer Gibb 56c7466e64 Merge branch 'Egencia-master' 2016-08-10 12:01:27 -06:00
Spencer Gibb 4255c5578b Merge pull request #1244 from cah-oster/master 
* pull1244:
  Fixed double-encoding issue in RibbonClientConfiguration
 2016-08-10 11:25:10 -06:00
Spencer Gibb 909a51000f Remove @Ignore 
fixes gh-1157
 2016-08-09 16:50:57 -06:00