Commit Graph

727 Commits

Author SHA1 Message Date
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
Jakub Narloch
966e03ba64 Feign OkHttp client configuration 2015-10-22 12:04:09 -06:00
Dave Syer
22f4b82efa Revert profile and add comment 2015-10-20 09:34:47 -04:00
Dave Syer
eb475769ca Remove confusing profile from settings.xml 2015-10-20 09:27:59 -04:00
Dave Syer
d3000a23e9 Fix ordering problem with Zuul tests 2015-10-20 07:18:29 -04:00
Dave Syer
1fe28af3f0 Fix issue with forward:... routes
We have to ensure that the ZuulController is not mapped on a
forward otherwise we just go back through the same code
path and render nothing.
2015-10-20 06:46:31 -04:00
Spencer Gibb
6d5591020d Upgrade feign to 8.11.0
Adds support for feign-hystrix

fixes gh-606
2015-10-19 10:17:10 -06:00
Spencer Gibb
9e4cad750a Upgrade hystrix to 1.4.18
fixes gh-600
2015-10-19 09:27:33 -06:00
Spencer Gibb
248732e6ff Force isCircuitBreakerOpen to String (if it's a Boolean for example)
see https://github.com/Netflix/Hystrix/pull/927
2015-10-19 09:27:33 -06:00
Dave Syer
cd30bea0c8 Add smarts for local route handling in Zuul proxy
User can provide a url in the route that starts with "forward:"
(instead of "http:" etc.) to handle the request locally.

Also properly ignores ignored routes, so they can be handled locally
(rather than giving up and sending 404).

Fixes gh-536
2015-10-18 09:59:06 -04:00
Dave Syer
43cab5f9b5 Clarify secure application discovery a bit 2015-10-18 09:22:12 -04:00
Spencer Gibb
fa75ddf452 polish 2015-10-14 11:33:57 -06:00
Spencer Gibb
ce4076621a Merge pull request #588 from alexVengrovsk/master
* pull588:
  Add isDebugEnabled() check
2015-10-13 11:07:37 -06:00
alexVengrovsk
914fee9ae4 Add isDebugEnabled() check
It is good thing to make this checks because of expensive concatenation of String objects (debug messages).
2015-10-13 10:43:43 -06:00
Spencer Gibb
a3a7c60925 exclude commons-logging from ribbon
fixes gh-596
2015-10-13 09:57:38 -06:00
Spencer Gibb
8103bdbff8 revert zuul 1.1.0-rc.2 as it isn't published to maven central. 2015-10-12 12:43:26 -06:00
Spencer Gibb
fc20cc7135 Upgrade zuul to v1.1.0-rc.2
fixes gh-591
2015-10-12 12:32:44 -06:00
Spencer Gibb
7fcc559edb Remove blitz4j
fixes gh-527
2015-10-12 12:08:34 -06:00
Spencer Gibb
f878cfcf67 Polish 2015-10-12 11:25:27 -06:00