Commit Graph

2845 Commits

Author SHA1 Message Date
Spencer Gibb
a739884207 added preferIpAddress section to eureka and updated ribbon docs to show what beans are created by default and how to override them. 2015-01-29 09:55:17 -07:00
Spencer Gibb
39eb9815b6 Merge branch 'loadbalancer-builder' 2015-01-29 08:27:11 -07:00
Dave Syer
91e3bee54b Update some dependencies 2015-01-29 11:24:20 +00:00
Spencer Gibb
af0b24d1a2 use LoadBalancerBuilder so all parts of the LoadBalancer can be injected via Spring.
This includes support for: ServerList, ServerListFilter, IRule, IPing and IClientConfig.
 Eliminates custom wrapping of ServerList.

 fixes gh-185
2015-01-28 12:33:32 -07:00
Dave Syer
b5bd371d8c Be defiensive about errors getting remote status 2015-01-27 07:29:27 +00:00
Spencer Gibb
01c5b44a18 propagate EnvironmentChangeEvents to archaius dynamic property listenters
fixes gh-144
2015-01-26 22:16:09 -07:00
Spencer Gibb
614ec44c04 update sidecare enabled property, make eureka portion of config conditional on eureka on classpath so other DiscoveryClient impls can use it. 2015-01-26 22:01:21 -07:00
Spencer Gibb
d78982973e add support for feign RequestInterceptors
fixes gh-159
2015-01-26 21:45:18 -07:00
Spencer Gibb
6435b73f40 remove EurekaHeartbeatEvent 2015-01-26 21:16:14 -07:00
Spencer Gibb
81bc83312c removed TODOs that are out of date 2015-01-26 20:48:39 -07:00
Spencer Gibb
01abd6d123 removed in favor of github issues 2015-01-26 20:45:06 -07:00
Spencer Gibb
5c84080d62 Upgrade netflix archaius to 0.6.5
fixes gh-179
2015-01-26 15:44:41 -07:00
Spencer Gibb
32a9033661 upgrade to netflix eureka to 1.1.147
fixes gh-180
2015-01-26 15:30:06 -07:00
Spencer Gibb
49b81607a3 upgrade to netflix hystrix to 1.4.0-RC6
fixes gh-182
2015-01-26 15:04:28 -07:00
Spencer Gibb
e265a5e3c8 upgrade to netflix feign 7.1.0.
Add feign-slf4j support.

fixes gh-178
2015-01-26 14:54:01 -07:00
Dave Syer
b2301434d2 Align with API changes from config client 2015-01-25 11:49:13 +00:00
Spencer Gibb
cdf34fddb1 Auto configure EurekaClientAutoConfiguration after NoopDiscoveryClientAutoConfiguration 2015-01-23 10:55:37 -07:00
Dave Syer
d04800597c De-tangle zuul packages
The main problem here was the ZuulProperties being used everywhere. I also
took the opportunity to thin out the top level zuul package and keep the
web and route locator pieces in sub-packages for readability.

Fixes gh-172
2015-01-23 09:10:37 +00:00
Dave Syer
6b01e61dec Untangle ribbon/eureka
A cleaner separation of ribbon and the eureka-dependent ribbon
configuration is achieved by adding a BeanPostProcessor to do the
ServerList wrapping, instead of doing it for every single ribbon
client.

See gh-172
2015-01-23 08:57:58 +00:00
Spencer Gibb
ea4ea4a54d proxy DiscoveryHeartbeatEvent's from parent to child be publishing a EurekaHeartbeatEvent and having zuul listen for EurekaHeartbeatEvent as well.
fixes gh-171
2015-01-22 16:08:05 -07:00
Dave Syer
f18aeab873 Replace some of the log/printStackTraces with ignores
Fixes gh-153
2015-01-22 07:08:55 +00:00
Spencer Gibb
a45c0ccec8 change printStackTrace to commons log statements
fixes gh-153
2015-01-21 19:26:54 -07:00
Dave Syer
c31f700bae Use serviceId as prefix for RibbonCommand hystrix command key
Fixes gh-160
2015-01-19 16:13:13 +00:00
Spencer Gibb
a0b73fe7c7 migrate from slf4j to commons logging
fixes gh-147
2015-01-15 14:31:20 -07:00
Spencer Gibb
e7331098fa change protected and package scope fields to private
fixes gh-149
2015-01-15 12:02:19 -07:00
Spencer Gibb
84554725db Merge branch 'philwebb-polish' 2015-01-15 11:05:24 -07:00
Spencer Gibb
f1bd9bdfaa Merge branch 'polish' of https://github.com/philwebb/spring-cloud-netflix into philwebb-polish
Conflicts:
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClient.java
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientScan.java
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java
	spring-cloud-netflix-turbine-amqp/src/test/java/org/springframework/cloud/netflix/turbine/amqp/AggregatorTest.java
2015-01-15 11:04:47 -07:00
Dave Syer
5847175344 Rename Turbine port listener class and add tests 2015-01-15 16:07:06 +00:00
Dave Syer
e2e09c4616 Default turbine.amqp.port to server.port and allow Actuator endpoints
This change adds an ApplicationListener that sets some high priority
properties in the Environment to allow server.port and management.port
to keep their usual meaning, but have server.port apply only to turbine.
Actuator endpoints can be enabled with management.port (different to
server.port otherwise there will be a conflict between Netty and Tomcat).

Fixes gh-143, fixes gh-140
2015-01-15 15:34:58 +00:00
Dave Syer
0e4eb9ef1f Use @ConditionalOnProperty where possible 2015-01-15 14:07:52 +00:00
Dave Syer
90d7e5df7a Correct Javadocs in *FeignClient
Fixes gh-151
2015-01-15 13:52:37 +00:00
Dave Syer
89ca05bf3e Remove printStackTrace() in test app 2015-01-15 13:46:49 +00:00
Dave Syer
17484fad3a Use Enum.valueOf() instead of case switch
Fixes gh-156
2015-01-15 13:35:15 +00:00
Phillip Webb
8b6307e703 Use BDD Mockito 2015-01-14 14:57:26 -08:00
Phillip Webb
3ea0f8d283 Polish 2015-01-14 14:49:23 -08:00
Phillip Webb
9d823513c3 Add copyright headers 2015-01-14 13:24:18 -08:00
Phillip Webb
6a7676a93f Apply eclipse formatting and cleanup 2015-01-14 13:10:41 -08:00
Phillip Webb
911627c09d Add eclipse formatting and cleanup configuration 2015-01-14 13:09:14 -08:00
Phillip Webb
be436279cf Polish POM files 2015-01-14 13:04:26 -08:00
Spencer Gibb
6e078a88e8 make messageConverters lazy in SpringDecoder and SpringEncoder
fixes gh-129
2015-01-14 09:36:27 -07:00
Spencer Gibb
8fb85f26ea add a test to make sure that proxy paths with /another/level/** works 2015-01-13 21:51:09 -07:00
Spencer Gibb
3d91dae0c4 only forward if response is not committed. 2015-01-08 14:52:27 -07:00
Spencer Gibb
95541e0102 only run SendErrorFilter once (fixes recursive forwarding if /error fails) 2015-01-08 12:13:27 -07:00
Spencer Gibb
64e5a2e0ba protect against a null RequestDispatcher 2015-01-07 11:54:27 -07:00
Spencer Gibb
758d86e793 integration tests for s-c-n-hystrix-amqp and s-c-n-turbine-amqp 2015-01-06 20:47:26 -07:00
Spencer Gibb
a57c358702 prefix hystrix metric same with context id and add ability to disable.
fixes gh-135

created hystrix.stream.amqp.send-id to allow disabling of sending the context id as the metric id.  Turbine AMQP then defaults to serviceId:host:port

fixes gh-131
2015-01-06 16:35:36 -07:00
Spencer Gibb
c992066ac0 only create the /routes endpoint if actuator is on the classpath 2015-01-06 09:59:21 -07:00
Dave Syer
da6da6d76c Re-organise headers in the /trace of Zuul requests
Now they match better what the vanilla /trace data does in terms of
object and field names.
2015-01-06 16:41:03 +00:00
Dave Syer
242886916f Fix test in build server VM 2015-01-04 09:01:45 +00:00
Dave Syer
a5d2d2abe5 Add configuration properties for Eureka dashboard
Not used by the app itself, but will show up in metadata reports
and in tooling, so useful for documentation purposes.

See gh-125
2015-01-03 16:30:38 +00:00