Commit Graph

540 Commits (90f4da0dac6b043bea6c5ea1d5610adcf7db03a2)

Author SHA1 Message Date
Phillip Webb bb19d5690c Fix spring-boot-actuator-autoconfigure test logs
Add log4j to `spring-boot-actuator-autoconfigure` test scope so that
we get valid log output.

See gh-14148
6 years ago
Madhura Bhave 6c1915e81f Merge branch '2.0.x' 6 years ago
Madhura Bhave 7af6665a0e Ignore management.server.port for war
Fixes gh-14148
6 years ago
Stephane Nicoll a170bfcc76 Deprecate micrometer meter's enabled flags
This commit deprecates the few 'enabled' flags that control whether
certain meter binders are registered in the context.

Metrics auto-configuration for the JVM, Logback and System-related
information have been moved to individual auto-configurations so that
they can be excluded rather than using the now deprecated flag.

This harmonizes our policy with regards to disabling behaviour,
especially since other similar auto-configurations do not have such
flag.

Closes gh-13408
6 years ago
Stephane Nicoll 45ef926a90 Merge branch '2.0.x' 6 years ago
Stephane Nicoll ff8b8c55c6 Remove reference to "management.metrics.binders.integration.enabled"
Closes gh-14319
6 years ago
Phillip Webb c3de4c84f2 Polish 6 years ago
Madhura Bhave f0d7533e0b Merge branch '2.0.x' 6 years ago
Madhura Bhave 9c82d5c382 Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe
Fixes gh-14161
6 years ago
Andy Wilkinson 8ee4775820 Polish 6 years ago
Stephane Nicoll 1ceb076035 Harmonize Metrics test
This commit harmonizes metrics test to rely on `MetricRun.simple()`
rather than configuring a simple `MeterRegistry` manually. Rather than
applying related auto-configurations automatically, `MetricsRun` only
enable the absolute minimum.

See gh-14255
6 years ago
Stephane Nicoll 3d732e86f4 Merge branch '2.0.x' 6 years ago
Johnny Lim ca57e58ee5 Polish
See gh-14293
6 years ago
Stephane Nicoll 4634811c7c Polish 6 years ago
Stephane Nicoll 7bee9dfc22 Harmonize HTTP client metrics
This commit harmonizes the auto-configurations for RestTemplate and
WebClient in a single `HttpClientMetricsAutoConfiguration`. Doing so
allows to give a better scope for the shared `MeterFilter`.

As a result`WebClientMetricsAutoConfiguration` has moved to the `client`
package.

Closes gh-14269
6 years ago
Stephane Nicoll 6c26315cd1 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 0625443d27 Polish "Limit metrics collection of incoming requests"
Closes gh-14173
6 years ago
Dmytro Nosan 81a6701914 Limit metrics collection of incoming requests
See gh-14173
6 years ago
dreis2211 422a436df1 Polish some Collectors
See gh-13727
6 years ago
Stephane Nicoll dd9209c7d9 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 000cb94323 Polish "Fix String concatenation in a loop"
Closes gh-14153
6 years ago
Hiroaki Yoshida 43acc37587 Fix String concatenation in a loop
See gh-14153
6 years ago
Stephane Nicoll f5d922c712 Upgrade to Spring Integration 5.1.0.M2
Upgrade to M2 broke a test that was looking for a particular bean that
is configured by Spring Integration (`HeaderChannelRegistry`).

It looks like INT-4517 is related to the regression as it registers the
bean too late for the auto-configuration to see it.

This commit changes the condition to a more central bean that is created
very early on.

Closes gh-14142
6 years ago
Stephane Nicoll b60fbe5a1f Merge branch '2.0.x' 6 years ago
Stephane Nicoll b0d388830f Polish test 6 years ago
Vedran Pavic 644ab5f3e4 Align SessionsEndpoint with Spring Session API improvements
This commit aligns SessionsEndpoint with
FindByIndexNameSessionRepository API improvements that simplifies
retrieval of sessions by principal name.

Closes gh-14124
6 years ago
Madhura Bhave d724f154f4 Merge branch '2.0.x' 6 years ago
Madhura Bhave b93c2b9a9f Allow actuator endpoints to be used with mvcMatchers
This commit changes AbstractWebMvcEndpointHandlerMapping to
be a MatchableHandlerMapping. Additionally, EndpointRequest,
now delegates to MvcRequestMatcher for Spring MVC applications.

For all other applications, AntPathRequestMatcher is used as
a delegate.

Closes gh-13962
6 years ago
Johnny Lim 101cc59b7d Polish
Closes gh-14023
6 years ago
Stephane Nicoll a12ca0a0dc Merge branch '2.0.x' 6 years ago
Stephane Nicoll a023bd030a Add configurable timeout for Couchbase health indicator
This commit makes sure to use a configurable timeout to check if the
Couchbase cluster is up, rather than relying on the default that can be
quite long.

Closes gh-13879
6 years ago
Stephane Nicoll 14a9ec8711 Polish 6 years ago
Stephane Nicoll e6b44189e0 Polish "Add global support for JMX unique names"
This commit ensures that the new "spring.jmx.unique-names" property
deprecates the Endpoint's specific property as they share the same goal.

If both are set with an incompatible value, an exception is thrown
inviting the user to update their configuration.

Closes gh-13990
6 years ago
Stephane Nicoll 624c1306fd Merge branch '2.0.x' 6 years ago
Stephane Nicoll 737b4a275b Polish 6 years ago
Stephane Nicoll 0e750f982b Merge branch '2.0.x' 6 years ago
Johnny Lim 7b6b91aae7 Return null immediately when sla is null in convertSla()
Closes gh-13991
6 years ago
Phillip Webb 1b91c0ceb7 Merge branch '2.0.x' 6 years ago
Phillip Webb 0ec22c8bf9 Polish copyright date on changed files 6 years ago
Phillip Webb 80da9cf5eb Merge branch '2.0.x' 6 years ago
Phillip Webb aeb885192e Polish ternary expressions 6 years ago
Phillip Webb a6c9c92f2e Merge branch '2.0.x' 6 years ago
Phillip Webb e6a68b39a3 Fix checkstyle javadoc issues
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.

See gh-13932
6 years ago
Phillip Webb 7fc455654a Fix checkstyle ternary issues
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
6 years ago
Madhura Bhave f2a9030788 Merge branch '2.0.x' 6 years ago
Madhura Bhave e753b530fa EndpointRequest should match links with trailing slash
Fixes gh-13921
6 years ago
Phillip Webb b5b60c2053 Merge branch '2.0.x' 6 years ago
Phillip Webb 9a9111af21 Support path discovery for main dispatcher servlet
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
6 years ago
Phillip Webb d37e717500 Polish 6 years ago
Stephane Nicoll 1e7aa7c4bc Fix Spring Integration imports 6 years ago