Commit Graph

774 Commits

Author SHA1 Message Date
Dave Syer
493caec5df Fix ribbon client factory to search context hierarchy
We need to use BeanFactoryUtils to search the context hierarchy
for custom instances.

Fixes gh-733
2015-12-17 17:07:14 +00:00
Spencer Gibb
7d78a3c347 Merge pull request #724 from jkschneider/metric-poller
Add Servo metric poller and @EnableAtlas test
2015-12-16 12:21:54 -07:00
Spencer Gibb
3f45391d29 Merge pull request #723 from jkschneider/atlas-docs
Update docs to indicate the need for spring-cloud-starter-atlas
2015-12-16 12:20:29 -07:00
Spencer Gibb
502f955091 Merge pull request #722 from jkschneider/atlas-metric-observer
Minor improvements to error messages for netflix.atlas.uri problems
2015-12-16 12:19:38 -07:00
Spencer Gibb
4720b78db5 Merge pull request #699 from stephaneLeroy/master
* pull699:
  Add Zuul Proxy regex serviceId to route mapping
2015-12-16 12:10:56 -07:00
Stéphane Leroy
4a52a7f889 Add Zuul Proxy regex serviceId to route mapping
fixes gh-693
2015-12-16 12:10:22 -07:00
Marcin Grzejszczak
9f9948707a Added scripts to run e2e tests 2015-12-16 18:23:09 +01:00
Jon Schneider
1cd363f33f Add Servo metric poller and @EnableAtlas test 2015-12-15 23:20:07 -08:00
Jon Schneider
4325b7e363 Update docs to indicate the need for spring-cloud-starter-atlas for Atlas 2015-12-15 22:17:13 -08:00
Jon Schneider
e994971bec Minor improvements to error messages for netflix.atlas.uri problems 2015-12-15 21:29:20 -08:00
Spencer Gibb
0ddfb42d4d Merge pull request #694 from snussbaumer/gh-691
* gh-691:
  Enable configuration of the way HttpClient handles redirects
2015-12-15 15:52:06 -07:00
Sébastien Nussbaumer
15f940054d Enable configuration of the way HttpClient handles redirects
RibbonLoadBalancingHttpClient being IClientConfigAware, it is now
initialized within initWithNiwsConfig. The values of the config keys
FollowRedirects, ConnectTimeout and ReadTimeout are now respected.

Fixes gh-691
2015-12-15 15:43:21 -07:00
Spencer Gibb
b108de33ed Merge pull request #713 from kakawait/gh-583
* gh-583:
  Removing multiple successive slashes
2015-12-15 14:38:12 -07:00
kakawait
982288ec04 Removing multiple successive slashes
Eliminates zuul URISyntaxException if route has trailing slash.

fixes gh-583
2015-12-15 14:37:52 -07:00
Spencer Gibb
804abb6d6d Move test to same package as class testing 2015-12-15 14:00:21 -07:00
Spencer Gibb
8f6cd86e56 Merge pull request #704 from hscholz/master
* pull704:
  Explicitly set target to feign client name.
2015-12-14 15:15:48 -07:00
hscholz
abd32fbfd0 Explicitly set target to feign client name.
fixes gh-703
2015-12-14 15:15:27 -07:00
Spencer Gibb
2acd353c7d Allow Feign Hystrix support to be disabled.
fixes gh-717
2015-12-14 14:39:35 -07:00
Spencer Gibb
456f2c0a99 Merge pull request #670 from jkschneider/metrics-docs
Servo, Spectator, and Atlas docs
2015-12-12 11:22:58 -07:00
Jon Schneider
ad6e61dd47 Servo, Spectator, and Atlas docs 2015-12-11 20:17:46 -08:00
Spencer Gibb
810b17ae06 Guard for null entity.
redefine isSuccess to 2xx status code series.

fixes gh-687
2015-12-03 11:00:11 -07:00
Dave Syer
a43d9d86df Add null check in annotation processing for Feign
Allows POST with a @RequestBody

Fixes gh-689
2015-12-03 17:14:54 +00:00
Spencer Gibb
57206c639d Upgrade to Hystrix 1.4.21
fixes gh-685
2015-12-02 14:07:31 -07:00
Spencer Gibb
1ede1458b9 Get RequestInterceptors from feign context.
Rather than pulling them from the generic context.

fixes gh-683
2015-12-02 11:36:48 -07:00
Spencer Gibb
f38e43a4b6 polish 2015-12-02 10:35:53 -07:00
Spencer Gibb
cb8b9363f6 Merge pull request #671 from alexVengrovsk/update-debug
Add isDebugEnabled() for logging operations
2015-11-30 13:22:50 -07:00
alexVengrovsk
8957a40328 Update InstanceRegistry.java 2015-11-30 16:23:24 +02:00
Dave Syer
1129872061 Default status page and health URLs if possible and where needed
If the management.port is explicitly set to something other than the
server.port, we can use it to set the status page and health URL
default values. (They can still be overridden by config properties.)

If management.port=0 there's not much we can do because we don't know
the port number yet when the instance config is created.

Fixes gh-425
2015-11-30 09:29:09 +00:00
Dave Syer
f2fee74880 Excludes aspectjrt from javanica
The aspectjweaver jar includes all of aspectjrt, and the former is
used at runtime in a number of places (tests fail if you remove
it). Both are not needed so we have picked one (the other one than
recommended in gh-666).

Fixes gh-666
2015-11-26 15:33:09 +00:00
Spencer Gibb
1090f2817a Upgrade zuul to v1.1.0
fixes gh-591
2015-11-24 16:37:25 -07:00
Spencer Gibb
d23a57d13b Don't extend EurekaBootStrap.
EurekaBootStrap implements ServletContextListener which causes problems because of early instantiation.

fixes gh-664
2015-11-23 16:32:31 -07:00
Spencer Gibb
c93a19c0d1 Merge pull request #625 from liebowitz/master
* pull625:
  Refactor SimpleHostRoutingFilter
2015-11-23 14:34:24 -07:00
Greg Liebowitz
940921ac15 Refactor SimpleHostRoutingFilter
Removed deprecated HttpClient APIs, exposed method to override client, fixed ignoredHeaders
2015-11-23 14:33:39 -07:00
Spencer Gibb
452f494c21 Merge pull request #661 from micheal-swiggs/multiple_monitoring
* multiple_monitoring:
  Enables hystrix monitoring of multiple services on a single server.
2015-11-23 12:30:15 -07:00
Micheal Swiggs
03a005033d Enables hystrix monitoring of multiple services on a single server. 2015-11-22 08:47:43 +00:00
Spencer Gibb
f46e8e8e1f Merge pull request #543 from ChristianLohmann/create-httpclient-ribbon-command
* create-httpclient-ribbon-command:
  an Apache http client zuul ribbon command
2015-11-20 16:37:42 -07:00
Christian Lohmann
18dff8527d an Apache http client zuul ribbon command
This is an implementation of a RibbonCommand and a factory which makes
use of a loadbalancing http client based on apache's http-components
http-client.
With this command/factory it is possible to route PATCH http requests
via zuul/ribbon as well.

fixes gh-412
2015-11-20 16:37:18 -07:00
Spencer Gibb
81b430dbb4 polish 2015-11-20 15:34:39 -07:00
Spencer Gibb
3994a3e439 Merge pull request #655 from Oreste-Luci/master
* pull655:
  Add support for placeholders in @FeignClient definitions
2015-11-20 15:26:47 -07:00
Oreste Luci
94d4bdfcc3 Add support for placeholders in @FeignClient definitions
Includes name and url attributes.

fixes gh-414
2015-11-20 14:25:38 -07:00
Spencer Gibb
4721bee8f2 allow EurekaServerConfig to be overridden.
fixes gh-657
2015-11-20 10:48:51 -07:00
Spencer Gibb
415cd1d83c Remove unneeded hardcoded initializers. 2015-11-19 08:33:39 -07:00
Spencer Gibb
bd12fa47d7 Upgrade to rxjava 1.0.14
fixes gh-651
2015-11-18 14:19:45 -07:00
Spencer Gibb
a7d425deba Upgrade to feign 8.12.1
fixes gh-623
2015-11-17 17:03:26 -07:00
Spencer Gibb
06a4e0996b added ribbon.http.client.enabled conditional 2015-11-17 09:22:01 -07:00
Dave Syer
06b50c9fe0 Revert to snapshots 2015-11-17 12:27:43 +00:00
Dave Syer
05f75e70da Update to 1.1.0.M3 2015-11-17 12:27:01 +00:00
Dave Syer
db2e87f1b6 Switch log to debug from info
Logging each request in the proxy is too verbose and inconsistent
with other Spring MVC logging.
2015-11-13 11:51:32 +00:00
Dave Syer
db4c82c39c Add @deprecated Javadocs 2015-11-13 11:51:32 +00:00
Spencer Gibb
713e6b8461 Merge pull request #639 from jkschneider/metrics-aop-fix
* metrics-aop-fix:
  RestTemplate metrics collection join point now returns a value
2015-11-12 10:41:23 -07:00