Commit Graph

1823 Commits (b6a0d673329cc6673c5e0c27130f3fcddc1ef737)

Author SHA1 Message Date
Stephane Nicoll 7e97495cdf Expose Jolokia directly rather than via an endpoint
Jolokia is a 100% web concern and does not fit in the Endpoint
infrastructure. This commit removes `JolokiaMvcEndpoint` and exposes
the servlet directly instead while still being part of the
management context. As such, the Jolokia servlet is exposed beneath
the management context path and will move to a separate port when
the management port is not the same as the main server port.

Closes gh-9843
7 years ago
Andy Wilkinson 5351ceb673 Correct name of ManagementContextConfiguration in spring.factories
Closes gh-7545
7 years ago
Andy Wilkinson 0aa39d0279 Improve the package structure of spring-boot-actuator module
Closes gh-7545
7 years ago
Andy Wilkinson 63cd0afadb Merge branch '1.5.x' 7 years ago
Johnny Lim ee3de15e37 Add more ConditionalOnClass checks in HealthIndicatorAutoConfiguration
Closes gh-9940
7 years ago
Andy Wilkinson 7c52bb3a37 Improve the structure of the Liquibase endpoint's response
Closes gh-9974
7 years ago
Andy Wilkinson f38cb7b5d8 Improve structure of Flyway endpoint response, add missing properties
Closes gh-9973
7 years ago
Andy Wilkinson abf39915e8 Polish 7 years ago
Andy Wilkinson e9aeb9ad63 Polish 7 years ago
Madhura Bhave 3d878e642a Remove unused properties from tests 7 years ago
Madhura Bhave ea087b9bac Move liquibase config properties to spring.liquibase
Closes gh-9897
7 years ago
Madhura Bhave f9e316306a Move Flyway config properties to spring.flyway
Closes gh-9896
7 years ago
Andy Wilkinson bb55f49396 Remove concept of sensitivity from Actuator's endpoints
Closes gh-9924
7 years ago
Andy Wilkinson 8f42007aa1 Improve the structure of the response from the env endpoint
Closes gh-9864
7 years ago
Phillip Webb e1602fe59a Polish 7 years ago
Andy Wilkinson 37bef961ea Merge branch '1.5.x' 7 years ago
Andy Wilkinson 5a8a86375d Sanitize individual env entry that is matched exactly
Closes gh-9918
See gh-8282
7 years ago
Andy Wilkinson 9f75da9a8f Simplify the Actuator's hypermedia support
This commit replaces the Acuator's support for hypermedia with a
single endpoint that returns HAL-formatted links to all of the
available endpoints. This is done without requiring Spring HATEOAS
to be on the classpath in a similar manner to the existing
CloudFoundry discovery endpoint.

Closes gh-9901
7 years ago
Andy Wilkinson 4a61e45644 Require separate management port to use management context path of /
Closes gh-9898
7 years ago
Andy Wilkinson fb3d79c750 Drop support for self-hosted Actuator docs
Closes gh-9899
7 years ago
Phillip Webb 30ff329e3d Polish 7 years ago
Stephane Nicoll 92e48f6ee2 Fix build failure
This test definitely doesn't need Aspect processing since the project
doesn't have a dependency on `aspectjweaver`

Closes gh-9880
7 years ago
Stephane Nicoll b9b284d3d0 Merge branch '1.5.x' 7 years ago
Stephane Nicoll 5c13b8bf50 Separate custom schema configuration for Liquibase test
Unfortunately, creating the schema in code did not offer the right
condition to reproduce the error scenario. This commit restore the
initial intent, but separating the configuration and cleaning the
created context properly.

See gh-9862
7 years ago
Stephane Nicoll 7736cb1dc5 Fix test so that it doesn't leave a datasource hanging around
Closes gh-9862
7 years ago
Stephane Nicoll edee342d80 Merge branch '1.5.x' 7 years ago
Stephane Nicoll 7e21178f63 Polish "Use configured schema in Liquibase endpoint"
Closes gh-9862
7 years ago
Craig Andrews 3e13970fe0 Use configured schema in Liquibase endpoint
This commit makes sure that the Liquibase endpoint uses the configured
schema.

See gh-98£62
7 years ago
Phillip Webb 9127c48fb5 Fixup warnings 7 years ago
Spring Buildmaster 17a5bb0be4 Next development version 7 years ago
Phillip Webb 07556cda51 Restructure `boot.test.context` package
Split up `org.springframework.boot.test.context` into distinct packages
for `runner` and `assertj`.

See gh-9875
7 years ago
Phillip Webb 497457c397 Rename ApplicationContextTester -> Runner
Rename `ApplicationContextTester` and related classes to
`ApplicationContextRunner` and refactor existing tests to use correctly
named variables.

See gh-9875
7 years ago
Spring Buildmaster 41c5c0e7c9 Next development version 7 years ago
Emanuel Campolo 2626a3a795 Use lambdas when possible
Replace anonymous inner classes with lambda declarations (when possible
using method references).

See gh-9781
7 years ago
Emanuel Campolo 798fe5ed53 Collapse catch clauses
Use multi-catch for exceptions whenever possible.

See gh-9781
7 years ago
Emanuel Campolo 4a189bdee7 Replace Collections.sort() with direct sort call
Replace existing `Collections.sort(...)` calls with `.sort(...)`
directly on the collection instance.

See gh-9781
7 years ago
Emanuel Campolo 04fdec6f8b Replace explicit generics with diamond operator
Where possible, explicit generic declarations to use the Java 8 diamond
operator.

See gh-9781
7 years ago
Andy Wilkinson 6df1be3f1a Merge branch '1.5.x' 7 years ago
Johnny Lim d18e452fcd Use currentHealth consistently in getHealth()
Closes gh-9832
7 years ago
Andy Wilkinson d9837d7d1c Merge branch '1.5.x' 7 years ago
Andy Wilkinson bbc34a676c Polish "Handle possible regexes defensively in NamePatternFilter"
Closes gh-9730
7 years ago
dbego c29d1c756a Handle possible regexes defensively in NamePatternFilter
Previously, if a name contained part of a regex but wasn't actually
a regex, a PatternSyntaxException would be thrown and the request
would fail.

This commit updates NamePatternFilter to catch PatternSyntaxException
and treat the regex-like input as a name insteead.

See gh-9730
7 years ago
Phillip Webb e1ef2a591f Fixup tests to use new ApplicationContextTester
Update existing tests that previously use `ContextLoader` to the newly
introduced `*ApplicationContextTester` classes.

See gh-9634
7 years ago
Phillip Webb 9db72450da Merge branch '1.5.x' 7 years ago
Phillip Webb 68910f2b8f Polish 7 years ago
Phillip Webb cd23de6ed5 Add more HealthIndicatorAutoConfiguration ordering
Update HealthIndicatorAutoConfiguration to ensure that it is configured
after ActiveMQAutoConfiguration.

Fixes gh-9793
7 years ago
Stephane Nicoll 43e1df7752 Merge branch '1.5.x' 7 years ago
孙健 1745a5ee6f Fix metric check in case of duplicate metric
Closes gh-9497
7 years ago
Madhura Bhave b58923a42d Merge branch '1.5.x' 7 years ago
Madhura Bhave 0f8a819af9 Enable cors in default management security config
Fixes gh-9548
7 years ago
Phillip Webb 8e3baf3130 Polish 7 years ago
Stephane Nicoll cb13c98649 Polish 7 years ago
Stephane Nicoll fa71051ec6 Polish "Upgrade to Infinispan 9.0.3.Final"
Closes gh-9688
7 years ago
Stephane Nicoll ef5c2afcc9 Polish 7 years ago
Andy Wilkinson dd0ce54425 Improve the type-safety of ContextLoader for servlet and reactive web 7 years ago
Phillip Webb eb17aa06f9 Merge branch '1.5.x' 7 years ago
Phillip Webb aa57ca7e18 Polish 7 years ago
Andy Wilkinson 6db4330328 Prevent Elasticsearch from configuring Netty's available processors 7 years ago
Stephane Nicoll de2cdd8528 Use lettuce rather than Jedis for actuator tests 7 years ago
Stephane Nicoll 6e32f49630 Migrate HealthIndicatorAutoConfigurationTests to ContextLoader 7 years ago
Stephane Nicoll f2fe2c4dd5 Polish 7 years ago
Stephane Nicoll 8ea38d1cbe Merge branch '1.5.x' 8 years ago
Stephane Nicoll 88d16ddf6b Add missing class check
Closes gh-9602
8 years ago
Stephane Nicoll 01272fa0cc Polish "Add health indicator for Neo4j"
Closes gh-9557
8 years ago
Eric Spiegelberg 4c97dcb53a Add health indicator for Neo4j
See gh-9557
8 years ago
Andy Wilkinson 39c1757a96 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 7a04708c41 Make sure the HealthMvcEndpoint is thread-safe
Previously, HealthMvcEndpoint stored the cached Health and its last
access time in two separate fields. Neither field was volatile and
no synchronization was used. This meant that there were potential
visibility problems. In a possible worst case scenario one field may
see the updated access time but an old health so it would incorrectly
believe that the old health was up-to-date and return it.

This commit reworks the endpoint to store the cached health and the
time at which it was created in a single, volatile field. This ensures
that the cached health and its creation time will be visible across
threads. Note that a race between threads when the cache is stale is
still possible. This race may result in multiple calls to the
delegate but these should be harmless.

Closes gh-9454
8 years ago
Stephane Nicoll 75274d3024 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 3f70638f1c Polish "Use getUsableSpace() in DiskSpaceHealthIndicator"
Closes gh-9544
8 years ago
Huang YunKun 158416fdd0 Use getUsableSpace() in DiskSpaceHealthIndicator
See gh-9544
8 years ago
Andy Wilkinson 4a030d5a7a Drop support for auto-configuring an embedded Elasticsearch node
Elastic have announced [1] that embedded Elasticsearch is no longer
supported. This commit brings us into line with that announcement by
removing the auto-configuration that would create an Elasticsearch
Node and NodeClient.

To use the Elasticsearch auto-configuration, a user must now provide
the address of one or more cluster nodes
(via the spring.elastisearch.cluster-nodes property) which will then
be used to create a TransportClient.

See gh-9374

[1] https://www.elastic.co/blog/elasticsearch-the-server
8 years ago
Phillip Webb b94bb00fa1 Remove need for attached test-jar artifacts
Remove test-jar artifacts from Maven projects and relocate classes. The
majority of utilities now live in the `spring-boot-testsupport` module.

This update will help us to deploy artifacts using the standard Maven
deploy plugin in the future (which doesn't support the filtering of
individual artifacts).

Fixes gh-9493
8 years ago
Andy Wilkinson f7e9ec5f42 Minimise our usage of SocketUtils.findAvailableTcpPort
Closes gh-9382
8 years ago
Spring Buildmaster 05d4d0281c Next Development Version 8 years ago
Andy Wilkinson a72c1b2cba Merge branch '1.5.x' 8 years ago
Andy Wilkinson 9579e95868 Handle explicit disablement of management SSL correctly
Closes gh-9423
8 years ago
Phillip Webb 2c7dd9f519 Polish 8 years ago
Phillip Webb b9fd99e268 Polish 8 years ago
Stephane Nicoll 605dee4700 Allow to reset a log level
This commit ensures that `setLogLevel` on the `LoggingSystem` accepts
a `null` level. A `null` level means any customization sets on that
level should be removed and the default configuration should be used
instead.

Effectively, the level of the parent logger is going to be used when
`setLevel` is called with `null` for a given logger.

Most JMX clients do not accept to pass `null` for an argument so an
empty String is translated to null in that specific case.

Closes gh-8776
8 years ago
Stephane Nicoll bdf2b2e810 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 9fc90a809f Add missing @Test annotations 8 years ago
Andy Wilkinson 5ef29653c7 Polish 8 years ago
Madhura Bhave d745b69630 Replace usages of EnvironmentTestUtils 8 years ago
Phillip Webb 05111a17b8 Polish 8 years ago
Andy Wilkinson d5438c299c Polish "Use try-with-resources to close resources automatically"
- Apply code formatting
- Use try-with-resources in many other places that were missed in the
  pull request

Closes gh-8045
8 years ago
rajadilipkolli 3e797c326a Use try-with-resources to close resources automatically
See gh-8045
8 years ago
Andy Wilkinson 9192db692b Use WebRequest rather than RequestAttributes in ErrorAttributes
This change aligns ErrorAttributes with ResponseEntityExceptionHandler
which takes a WebRequest as a parameter of its handleException method.
WebRequest extends RequestAttributes and provides access to much more
than just the request's attributes. For example request headers and
parameters are available from WebRequest.

Closes gh-7952
Closes gh-6555
8 years ago
Stephane Nicoll 895f06fdfa Polish 8 years ago
Rocky Shang 51d4e88537 Display unconditional classes in auto-config endpoint
Closes gh-9227
8 years ago
Stephane Nicoll 1a00692b27 Merge branch '1.5.x' 8 years ago
Stephane Nicoll d4a0fe5ff9 Polish "Fix configuration properties output for actuator"
Closes gh-9052
8 years ago
Wesley Stratton 7d6293f79d Fix configuration properties output for actuator
See gh-9052
8 years ago
Stephane Nicoll a1adcd9919 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 4cc515054e Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll a59000354c Support for TransactionAwareCacheDecorator
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.

Closes gh-8984
8 years ago
Eddú Meléndez ce0b1b242b Modify return on post /loggers to HTTP 204
This commit alter the return http status code from 200 to 204.

Closes gh-8919
8 years ago
Phillip Webb 302f038e84 Polish 8 years ago
Andy Wilkinson ee499b029a Merge branch '1.5.x' 8 years ago
Gytis Trikleris 00823d41a9 Log a warning if a health indicator throws an exception
Closes gh-9110
8 years ago
Stephane Nicoll 0e7b037750 Fix build failure 8 years ago
Phillip Webb fa4de13519 Rework ConfigurationPropertySources
Rework the ConfigurationPropertySources and related adapter classes to
help with performance. The ConfigurationPropertySources class now only
monitors for updates when `.attach` is used. The `.get` methods now
return the adapted version, but no longer checks to see if sources have
been added or removed on each call.

This commit also fixes a few caching issues and makes both the
`PropertyMapper` implementations true static singletons.

See gh-9000
8 years ago
Phillip Webb fd2e3b3505 Merge branch '1.5.x' 8 years ago
Phillip Webb 931ce15d7f Update copyright header dates 8 years ago
Phillip Webb 4a7dcc8786 Formatting 8 years ago
Stephane Nicoll 275bff39aa Remove deprecated code
Closes gh-8891
8 years ago
Madhura Bhave ba8bdd2683 Fix actuator path used in tests 8 years ago
Madhura Bhave 2519d73f5e Merge branch '1.5.x' 8 years ago
Madhura Bhave 3d836f7730 Fix test pollution 8 years ago
Madhura Bhave 189e07e9f3 Support values other than String in /env
Fixes gh-9079
8 years ago
Stephane Nicoll 2b4f2c6aba Making sure to stop embedded web servers in tests
Closes gh-9012
8 years ago
Stephane Nicoll 5121b848e1 Making sure to stop embedded web servers in tests
Closes gh-9012
8 years ago
Phillip Webb 8133b7f245 Merge branch '1.5.x' 8 years ago
Phillip Webb 4d4d03ab2c Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb 4a95b2f174 Polish 8 years ago
Stephane Nicoll 64dae5ec3a Merge branch '1.5.x' 8 years ago
Stephane Nicoll 035e27b1d1 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 8e5bf4b22a Polish CachePublicMetrics
CachePublicMetrics wasn't explicitly tested and was still using field
injection. This commit improves the situation in preparation of the fix
for gh-8984
8 years ago
Phillip Webb 6cdb02050d Reduce InMemoryAuditEventRepository default capacity
Lower the default capacity used in `InMemoryAuditEventRepository` from
4000 to 1000. This should help reduce memory consumption.

Fixes gh-9056
8 years ago
Stephane Nicoll f42998f5ca Revert "Refine validator and MVC validator configuration"
This commit reverts c9561f0 and 69a8c0d and effectivly fixes gh-8979 but
reintroduces the issue reported in gh-8495.
8 years ago
Madhura Bhave 6184e4154e Test correct binding in '/info' endpoint
Add a test to ensure that the updated configuration properties work
correctly binds environment sources in the `/info` endpoint.

Closes gh-7388
8 years ago
Madhura Bhave 866cf1dda7 Use new configuration properties in actuator
Update `spring-boot-actuator` to use the new configuration properties
support.

See gh-9000
8 years ago
Phillip Webb 45dd9f7144 Polish 8 years ago
Phillip Webb df82060cad Formatting 8 years ago
Stephane Nicoll 800eb010b1 Change the default JDBC connection pool to Hikari
Closes gh-6013
8 years ago
Vedran Pavic 720e801a76 Make Audit events MVC endpoint `after` parameter required
Closes gh-9002
8 years ago
Phillip Webb 06558675bb Polish 8 years ago
Madhura Bhave c2e5fd031a Replace usage of WebMvcConfigurerAdapter
Closes gh-8964
8 years ago
Spring Buildmaster 9768b0a8c2 Next Development Version 8 years ago
Phillip Webb 99a3ec8b74 Merge branch '1.5.x' 8 years ago
Phillip Webb 5f3d5fbec1 Remove public "skip path extension" constant
Remove the public constant to make it clearer that skipping path
extensions is really an internal Spring Boot concern.

See gh-8765
8 years ago
Spring Buildmaster d719d2cbbc Next Development Version 8 years ago
Phillip Webb 81fef71fcb Merge branch '1.5.x' 8 years ago
Phillip Webb c9561f031c Refine validator and MVC validator configuration
Update `ValidationAutoConfiguration` and `WebMvcAutoConfiguration` to
ensure as much as possible that only a single Validator bean of each
type is registered.

Validation auto-configuration now does the following:
- If no validator is found: Registers a `LocalValidatorFactoryBean`
  (providing both Spring and JSR validation)
- If the user defines a Spring & JSR validator: Backs off
- If the user defines only a JSR validator: Adapts it to a Spring
  validator (without exposing another JSR implementation)

WebMvcAutoConfiguration auto-configuration has been updated to make
MVC validation follow common Spring Boot patterns:
- If not validator beans are found (due to the user excluding
  ValidationAutoConfiguration) a new `mvcValidator` bean will be
  registered.
- If a single validator bean is found it will be used for MVC
  validation.
- If multiple validator beans are defined it will either use the one
  named `mvcValidator` or it will register a new `mvcValidator` bean

Any automatically registered `mvcValidator` bean will not implement
the JSR validator interface.

Finally, it is no longer possible to provide an MVC validator via a
`WebMvcConfigurer`.

Fixes gh-8495
8 years ago
Phillip Webb 9166bb5fae Polish 8 years ago
Phillip Webb 75f8e8a593 Fix actuator path used in tests
Fixup path changes that were missed during 1.5.x merge.
8 years ago
Phillip Webb 724be85b95 Polish 8 years ago
Stephane Nicoll b100caa041 Fix import 8 years ago
Phillip Webb 94209e2883 Merge branch '1.5.x' 8 years ago
Andy Wilkinson b9be0e3e0f Skip actuator path extension content negotiation
Allow `PathExtensionContentNegotiationStrategy` to be bypassed by
actuator endpoints. Prior to this commit calling `/loggers/com.aaa.cab`
would return a HTTP 406 response due to `.cab` being a known extension.

Fixes gh-8765
8 years ago
Phillip Webb 8eb79b3c0f Polish 8 years ago
Stephane Nicoll 56c68ca6cf Merge branch '1.5.x' 8 years ago
Stephane Nicoll 6c14420221 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 9a5346f29c Polish "Fix statsd metrics collection for names with ":""
Closes gh-8906
8 years ago
Odín del Río 9e705c83c8 Fix statsd metrics collection for names with ":"
Statsd server is ignoring malformed metrics. This change introduces
a basic sanitizing to metric names for avoid losing those metrics.

See gh-8906
8 years ago
Phillip Webb 383640d5ec Merge branch '1.5.x' 8 years ago
Phillip Webb f46d799f31 Polish 8 years ago
Madhura Bhave 757be57d48 Merge branch '1.5.x' 8 years ago
Madhura Bhave 3fe0b844a6 Make HealthMvcEndpoint conditional on missing bean 8 years ago
Madhura Bhave bcd79dd992 Move all actuators under `/application`
Context path can be configured via `management.context-path`.

Closes gh-6886
8 years ago
Stephane Nicoll b9d1f5e097 Harmonize Solr status health details
This commit renames the `solrStatus` property of the Solr health indicator
to `status` and its type. This is now an integer corresponding to the
status Solr sent rather than a String that can be "OK" when all is well.

Closes gh-8878
8 years ago