Commit Graph

860 Commits

Author SHA1 Message Date
Spencer Gibb
c2483cbe4e Upgrade feign to 8.14.2
fixes gh-807
2016-02-02 12:55:30 -07:00
Spencer Gibb
9c3010074d Update readme for code of conduct.
See https://github.com/spring-cloud/spring-cloud-build/issues/26
2016-02-01 19:59:30 -07:00
Spencer Gibb
199c740c17 Merge pull request #802 from herder/patch-1
Fix typo: zule-core -> zuul-core.
2016-02-01 15:22:13 -07:00
Spencer Gibb
63896485b0 Fix broken zuul tests. 2016-02-01 15:01:28 -07:00
Spencer Gibb
01fc27cb49 Temporarily ignore failing test so snapshots can build. 2016-02-01 12:51:35 -07:00
Spencer Gibb
3611edd1a0 Merge pull request #800 from brharrington/spectator-issue-264
* spectator-issue-264:
  fix registration bug in SpectatorMetricServices
2016-02-01 12:33:23 -07:00
Brian Harrington
63b0c8c67d fix registration bug in SpectatorMetricServices
The primary change is to fix a memory leak reported in
Netflix/spectator#264. Each time a gauge was updated it
was creating a new registration and because the map holds
a strong reference these would never get collected.
Further, the aggregate value created by the multiple
registrations was not correct.

In addition I added some test cases around the various
inputs and checked that the results were reflected as
expected in the registry. I noticed the timer values
had a unit of milliseconds, but it isn't immediately
clear if the reported value can ever less than 1.0. The
conversion to long is now delayed until after converting
to nanoseconds so duration values less than 1.0 will now
work instead of just recording 0.

For the histogram I changed to just using a cast to `long`
to avoid boxing to a `Double`. As an FYI for the future,
there is a DoubleDistributionSummary we have experimented
with in spectator-ext-sandbox that might be more appropriate
for this use-case.
2016-02-01 12:20:01 -07:00
Dave Syer
32c0f90999 Remove regex mapper properties from ZuulProperties
It is up to the user to configure a mapper if needed (one is no
longer provided automatically), so it doesn't need to take up
space in ZuulProperties
2016-01-31 16:19:51 +00:00
Dave Syer
82d8a11021 Defensive coding to avoid potential NPE
Fixes gh-803
2016-01-31 16:19:16 +00:00
Dave Syer
2e9ff4c7d7 Make eureka application manager @Lazy
So that it isn't instantated eagerly on startup by the RefreshScope.

Fixes gh-789
2016-01-29 13:13:30 +00:00
Niklas Herder
c95e2f450d Fix typo: zule-core -> zuul-core. 2016-01-29 13:27:33 +01:00
Dave Syer
cb13b9dd77 Reset Zuul state some more
Tests are very sensitive to the Zuul RequestContext which is
thread bound.
2016-01-28 17:48:42 +00:00
Marcin Grzejszczak
7747674b5c Updated e2e script 2016-01-28 13:39:02 +01:00
Dave Syer
29e691a4da Fix some zuul tests (clear request context before test) 2016-01-27 13:53:22 +00:00
Dave Syer
22b08f1a7f Fix Feign Ribbon with Apache HTTP client
The Apcahe client does not allow empty body for PATCH, nor does it
allow a request to be pre-populated with a Content-Length. Spring
Cloud tests were trying to do the former, and Feign allows the latter.
2016-01-27 13:38:48 +00:00
Dave Syer
65ec773066 Fix FeignHttpClientTests 2016-01-27 13:06:02 +00:00
Adrian Ivan
2f905b81ed Detect Zuul vs DispatcherServlet execution
Change SimpleRouteLocator to work with both Zuul and DispatcherServlet

Fixes gh-794
2016-01-27 10:51:56 +00:00
Dave Syer
1534ca41f7 Add dependency management for netty
Fixes gh-710
2016-01-26 16:02:26 +00:00
Dave Syer
7bdab0f23b Relay eureka.environment to Archaius if it is set
Apparently we already support eureka.datacenter as an alias for
archaius.deployment.datacenter and it looks like when that code
was written we intended to support eureka.environment in a similar way.
But it was never finished off, so this change adds the necessary one
line of code.

Fixes gh-791
2016-01-26 14:05:54 +00:00
Dave Syer
82991a7fc2 Make feign client bean id unique (use full classname)
Fixes gh-790
2016-01-26 10:49:21 +00:00
Dave Syer
3c5126c740 Consolidate tests and bootstrap config for config server 2016-01-25 11:43:11 +00:00
Dave Syer
dbb6059558 Simplify config server discovery with DiscoverClient metadata
Since DiscoverClient now supports metadata natively, we can use that and not rely
on Eureka interafces at all.

Fixes gh-787. Also fixes https://github.com/spring-cloud/spring-cloud-config/issues/302
2016-01-25 10:17:57 +00:00
Dave Syer
92a35ba77f Add explicit docs for eureka.hostname in secure app registration
Eureka supports native placeholders, but Spring can also be used.
Added some docs to show how more explicitly.

See gh-761
2016-01-24 08:29:55 +00:00
Spencer Gibb
ddd7979a25 Don't refresh the ipAddress if set by user config.
fixes gh-573
2016-01-20 13:52:58 -07:00
Spencer Gibb
3fb26f69e5 Add ability to disable hystrix metrics
fixes gh-781
2016-01-20 13:06:13 -07:00
Spencer Gibb
0b9fc290d2 Upgrade eureka to 1.3.7
fixes gh-779
2016-01-19 17:18:50 -07:00
Spencer Gibb
e2f6bd0e2e Upgrade Hystrix to v1.4.23
fixes gh-777
2016-01-19 15:28:50 -07:00
Dave Syer
a6e47a0b47 Ensure management.port defaults to server.port for eureka registration
Otherwise apps register the wrong health and status URLs by default. If
there is no explicit management.port we just need a default that is
the same as server.port.
2016-01-19 07:04:38 +00:00
Dave Syer
be0f030ccf Move shared package under eureka 2016-01-19 07:02:37 +00:00
Dave Syer
b46dab3099 Put @Bean EurekaServerConfig in nested class to avoid cycle
A new integration test ill be added in spring-cloud-samples/tests.

Fixes gh-759
2016-01-18 17:35:17 +00:00
Dave Syer
c97f69517d Fix format in javadoc 2016-01-18 17:03:05 +00:00
Dave Syer
053296de93 Ensure request body is not buffered when direct to ZuulServlet
A change in Zuul in NetflixOSS means that it buffers all requests unless
you switch it off at the level of the servlet. And even when you do that
you need to ensure that Spring Cloud doesn't re-introduce a buffer through
the Servlet30RequestWrapper.

This change restores the feature in Spring Cloud Angel that multipart files
posted to /zuul/* go straight through the servlet and are not buffered in
memory.

Fixes gh-773
2016-01-18 16:51:35 +00:00
Dave Syer
249f524ad9 Fix typo in docs 2016-01-16 09:46:46 +00:00
Spencer Gibb
62d340bcfe Support @AliasFor annotation elements in Feign.
fixes gh-766
2016-01-15 17:30:08 -07:00
Dave Syer
9287e66cfc Add ServerProperties in case not a web app (for tests) 2016-01-15 15:34:42 +00:00
Dave Syer
98e1ac7375 Add fullPath as convenience property on Route
More often than not what Route.path was used it had to be concatenated
with the prefix. This change just encapsulates that concern in the
Route itself.
2016-01-15 15:34:42 +00:00
Dave Syer
f9fc8ba8aa Change signature of RouteLocator.getRoutes()
If it returns Routes instead of Strings it's a lot more obvious
what it's supposed.
2016-01-15 15:34:42 +00:00
Dave Syer
2585798ab5 Consolidate RouteLocator features in base class 2016-01-15 15:34:42 +00:00
Marcin Grzejszczak
1d85260ccd Fixed wrong branch of the script for e2e 2016-01-15 12:36:54 +01:00
Marcin Grzejszczak
e4f81fb62e Updated e2e scripts 2016-01-15 12:36:03 +01:00
Marcin Grzejszczak
1e582dea0a Added killing of apps after e2e tests 2016-01-15 10:40:14 +01:00
Spencer Gibb
f00f761996 Support feign hystrix fallbacks.
Added @FeignClient(fallback).

Renamed FeignClientFactory to FeignContext.

fixes gh-762
2016-01-14 16:19:59 -07:00
Spencer Gibb
390f0016e6 Upgrade to Feign 8.14.1
fixes gh-727
2016-01-14 16:19:59 -07:00
Dave Syer
3ecd9cb0cf Move discovery related route locator stuff into a new package 2016-01-14 17:15:30 +00:00
Dave Syer
9161c54c43 Factor out common interface from ProxyRouteLocator
The RouteLocator interface wasn't very useful to anyone in its
1.0.x form. If ProxyRouteLocator features are consolidated into
the RouteLocator interface then users can supply their own
strategies more easily.

Also added RefreshableRouteLocator for implementations that need
to recompute routes when something changes. SimpleRouteLocator
doesn't need to do that because all the routes are in the configuration.
2016-01-14 17:15:30 +00:00
Spencer Gibb
b4cf375044 ignore ipr 2016-01-12 15:53:24 -07:00
Spencer Gibb
b894f8dbb3 Upgrade archaius to v 0.7.3
Added spring-cloud-starter-archaius so downstream projects
like consul and zookeeper don't need to maintain the list of
archaius depenencies.

fixes gh-765
2016-01-12 11:19:16 -07:00
Spencer Gibb
af88007cc3 Merge pull request #745 from jkschneider/metrics-deconflict-services
Servo and Spectator metrics defer to other Counter/GaugeServices
2016-01-12 10:42:47 -07:00
Spencer Gibb
c1e567afc7 Move eureka-client code to separate module.
This move should be transparant to users of spring-cloud-starter-eureka.

fixes gh-579
2016-01-11 16:45:30 -07:00
Marcin Grzejszczak
1ee1a924ba Reverting changes before adding acceptance tests 2016-01-08 22:16:38 +01:00