Commit Graph

2845 Commits

Author SHA1 Message Date
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
Jon Schneider
be14074817 RestTemplate metrics collection join point now returns a value 2015-11-12 10:34:07 -07:00
Dave Syer
024d9946dc Whitespace 2015-11-12 16:23:26 +00:00
Dave Syer
36e4c7cf93 Make metrics aspect conditional on Spring AOP
Also changes pointcut to use the interface so you don't need
proxyTargetClass=true.

Fixes gh-636
2015-11-12 13:53:50 +00:00
Spencer Gibb
ef5785bfb7 Upgrade to Hystrix v1.4.20
fixes gh-635
2015-11-11 15:55:03 -07:00
Spencer Gibb
dc1f28a74e Merge pull request #613 from jmnarloch/feign-no-content-test
* feign-no-content-test:
  Feign handling unparameterized ResponseEntity
2015-11-11 14:00:17 -07:00
Jakub Narloch
cff20c5a6d Feign handling unparameterized ResponseEntity
fixes gh-612
2015-11-11 14:00:04 -07:00
Dave Syer
b001fea325 Re-order configs and add refresh scope for lazy loading
so that Eureka InstanceInfo (which is designed to be immutable)
can effectively be mutated (by using a different instance) after the
dynamic port is available.
2015-11-11 11:09:28 +00:00
Spencer Gibb
3dfb8b5dc1 fix support for registering random ports with eureka.
fixes gh-570 ... again
2015-11-11 11:09:28 +00:00
Ben Klein
31e82a7597 Update spring-cloud-netflix.adoc
Reword to avoid broken AsciiDoc formatting.
2015-11-10 17:03:41 -08:00
Spencer Gibb
38055b586d Allow flexibility with Turbine http.
Allows non-eureka based InstanceDiscovery.
Allows custom InstanceDiscovery.

fixes gh-566
2015-11-10 17:17:09 -07:00
Spencer Gibb
1e716ff2c2 Upgrade eureka to v1.3.4
fixes gh-589
2015-11-10 12:25:05 -07:00
Spencer Gibb
5566749742 Merge pull request #633 from jkschneider/metrics-test-fixes
* metrics-test-fixes:
  Fix flaky Servo tests by avoiding DefaultMonitorRegistry
2015-11-10 09:20:58 -07:00
Jon Schneider
7bf6a85bd3 Fix flaky Servo tests by avoiding DefaultMonitorRegistry 2015-11-10 09:20:37 -07:00
Spencer Gibb
679e659cbc remove findbugs 2015-11-10 09:03:41 -07:00
Spencer Gibb
4d7f40f6e8 ignore failing test for now. 2015-11-09 15:01:58 -07:00
Spencer Gibb
dfec99780a fix failing test on travis. 2015-11-09 14:54:05 -07:00
Spencer Gibb
b117030a47 Merge pull request #615 from jkschneider/metrics
* metrics:
  Expanded metrics support to include Servo, Spectator, and Atlas
2015-11-09 14:11:35 -07:00
Jon Schneider
c61a48735d Expanded metrics support to include Servo, Spectator, and Atlas
* For Java 8 users, Spectator is the recommended metrics library as Servo is now deprecated in favor of Spectator
* Servo support now needs to be specifically enabled via @EnableServo, even if servo-core is included on the classpath
* Added starter modules for both Spectator and Atlas support
* ServoMetricReader defines a convention for mapping tag-based metrics to hiearchical names for rendering by the Actuator /metrics endpoint
2015-11-09 14:10:44 -07:00
Spencer Gibb
e4a4448497 Only deploy snapshots on master not in PR
fixes gh-630
2015-11-09 12:38:25 -07:00
Dave Syer
98d76dfe8c Correct path to magnfiying glass
It still isn't actually used (and would only be used on a link to
a non-existent JSP page), but at least it can render now.

See gh-628
2015-11-09 14:56:38 +00:00
Dave Syer
88cbeb015a Use better icon image for magnifying glass
Fixes gh-628
2015-11-09 14:15:38 +00:00
Spencer Gibb
2cf4a38398 Exclude commons-logging from eureka-client
fixes gh-525
2015-11-04 16:49:49 -07:00
Spencer Gibb
7eb5855815 fix resource filtering so it works with boot 1.3.x
get's eureka branding back.

fixes gh-627
2015-11-04 16:39:04 -07:00
Spencer Gibb
d954a5c525 Merge pull request #621 from ametiste-oss/health-check-without-circuit-fails-fixed
Health check fails on commands without circuit breaker.
2015-11-04 15:26:01 -07:00
Spencer Gibb
509c8e9f13 polish 2015-11-04 14:54:51 -07:00
Spencer Gibb
4fdb85e678 Merge pull request #619 from jmnarloch/feign-parameter-processors
* feign-parameter-processors:
  Feign annotated parameter processors
2015-11-04 14:25:43 -07:00
Jakub Narloch
31d2f65528 Feign annotated parameter processors 2015-11-04 14:12:12 -07:00
Spencer Gibb
50efa8536d add optional DiscoveryClientOptionalArgs
For extensibility by connectors
2015-11-04 13:49:52 -07:00
Konstantin A. Zolotukhin
5d3a0da50e null check for command bound circuit breaker 2015-10-31 13:36:17 +02:00