Commit Graph

323 Commits (1774a282b0e9ad782be2546785dbb291b7b678fe)

Author SHA1 Message Date
Andy Wilkinson 66164bff14 Polish 7 years ago
Andy Wilkinson fbb1ba1bb3 Move actuator mappings introspection classes into dedicated packages
Closes gh-9979
7 years ago
Stephane Nicoll 886ee9c870 Polish 7 years ago
Phillip Webb 80bba046a3 Fix broken javadoc import 7 years ago
Phillip Webb bda9b892b3 Add direct WebFlux and WebMvc endpoint support
Add `@ControllerEndpoint` and `@RestControllerEndpoint` annotations that
can be used to develop a Spring-only request mapped endpoint. Both
Spring MVC and Spring WebFlux are supported.

This feature is primarily for use when deeper Spring integration is
required or when existing Spring Boot 1.5 projects want to migrate to
Spring Boot 2.0 without re-writing existing endpoints. It comes at the
expense of portability, since such endpoints will be missing from
Jersey.

Fixes gh-10257
7 years ago
Phillip Webb 340ef52f78 Refactor endpoint path concerns
Create a `PathMappedEndpoint` interface that allows any `ExposedEndpoint`
to provide root path details. The `EndpointPathResolver` interface has
been renamed to `PathMapper` and is now only used during endpoint
discovery.

`EndpointPathProvider` has been replaced with `PathMappedEndpoints`
which simply finds relevant path mapped endpoints.

Fixes gh-10985
7 years ago
Phillip Webb 1d39feffea Overhaul actuator endpoint code
Refactor several areas of the actuator endpoint code in order to make
future extensions easier. The primary goal is to introduce the concept
of an `ExposableEndpoint` that has technology specific subclasses and
can carry additional data for filters to use. Many other changes have
been made along the way including:

* A new EndpointSupplier interface that allows cleaner separation of
  supplying vs discovering endpoints. This allows cleaner class names
  and allows for better auto-configuration since a user can choose to
  provide their own supplier entirely.

* A `DiscoveredEndpoint` interface that allows the `EndpointFilter`
  to be greatly simplified. A filter now doesn't need to know about
  discovery concerns unless absolutely necessary.

* Improved naming and package structure. Many technology specific
  concerns are now grouped in a better way. Related concerns are
  co-located and concepts from one area no longer leakage into another.

* Simplified `HandlerMapping` implementations. Many common concerns have
  been pulled up helping to create simpler subclasses.

* Simplified JMX adapters. Many of the intermediary `Info` classes have
  been removed. The `DiscoveredJmxOperation` is now responsible for
  mapping methods to operations.

* A specific @`HealthEndpointCloudFoundryExtension` for Cloud Foundry.
  The extension logic used to create a "full" health endpoint extension
  has been made explicit.

Fixes gh-11428
Fixes gh-11581
7 years ago
Phillip Webb dc935fba48 Polish 7 years ago
Andy Wilkinson fedc4647e1 Use same InetAddress for client and server in endpoint tests
Previously, the server was created with out an explicitly configured
address. This lead to it using any local address which will prefer
IPv6 (::0) if it's available. By contrast, the client was created
with a base URL that specified localhost as the host. This meant the
the client would prefer to connect to IPv4. Normally this wouldn't
cause a problem as nothing would be listening on the port in the IPv4
stack so the client would then connect to the server being tested
using the IPv6 stack. However, if another process was listening to the
port in the IPv4 stack, the client would connect to the wrong server.
This could lead to an unexpected 404 response (if the wrong server
was an HTTP server) or a hang if it was not.

There's a chance, although I think it's unlikely, that the problem
described above is the cause of gh-10569. I think it's unlikely as
the hang tracked by gh-10569 only occurs when running the WebFlux
endpoint integration tests using Reactor Netty. If it was the problem
described above, there's no reason that I can think of why we
wouldn't have also seen it with the Web MVC endpoint integration
tests.
7 years ago
Stephane Nicoll c926bed6f5 Polish "Fix modifiers order"
Closes gh-11681
7 years ago
igor-suhorukov e2d05607f2 Fix modifiers order
See gh-11681
7 years ago
Phillip Webb f3379668ac Polish 7 years ago
Stephane Nicoll 7002507304 Polish 7 years ago
Stephane Nicoll beaa49a2d6 Polish "Add auto-configuration for RabbitMQ metrics"
Closes gh-10887
7 years ago
Arnaud Cogoluègnes 58c8c4d56a Add auto-configuration for RabbitMQ metrics
See gh-10887
7 years ago
Andy Wilkinson 849baa4c02 Do not require after in audit events endpoint
Closes gh-11605
7 years ago
Andy Wilkinson 54c0cf513b Polish 7 years ago
Johnny Lim e7185ea2b1 Polish
Closes gh-11655
7 years ago
Andy Wilkinson 67a299020b Rework mappings endpoint
Improve the structure of the response and include mappings from
WebFlux and Servlet and Filter registrations in addition to the
mappings from Spring MVC.

Closes gh-9979
7 years ago
Andy Wilkinson f7ddacf937 Update AuditEventRepository javadoc to describe behaviour of after
The behaviour was changed in 2b99962a. This commit updates the
javadoc to hopefully clarify that Instant.isAfter(Instant) is used.

Closes gh-11612
7 years ago
Andy Wilkinson 5b8a2f9675 Improve context hierarchy handling in Actuator endpoints
Previously, a number of Actuator endpoints ignored a context hierarchy
or assumed that it would always be linear. This commit reworks the
affected endpoints so that the no longer assume a linear hierarchy.

A side-effect of a non-linear hierarchy is that there may be multiple
different beans with the same name (in a linear hierarchy, a bean
with the same name as one in an ancestor context, replaces that bean).
The affected endpoints have also been updated so that, when bean names
are used as keys, those keys are grouped by application context. This
prevents a bean in one context from accidentially overwriting a bean
in another context.

Closes gh-11019
7 years ago
Andy Wilkinson 23d8d608c4 Polish 7 years ago
Andy Wilkinson f7e408945e Use Instant for Session creation and last accessed times
Closes gh-10976
7 years ago
Andy Wilkinson 2b99962a85 Replace use of Date with OffsetDateTime and Instant in Actuator
Closes gh-10976
7 years ago
Stephane Nicoll ae3cd75d1a Polish "Upgrade to Micrometer 1.0.0-rc.6"
Closes gh-11598
7 years ago
Jon Schneider ccc820f723 Upgrade to Micrometer 1.0.0-rc.6
See gh-11598
7 years ago
Stephane Nicoll f10210f769 Make MetricsEndpoint response types public
Closes gh-11602
7 years ago
Stephane Nicoll 7d12dc2e02 Polish description
See gh-11428
7 years ago
Stephane Nicoll 4b59d5f517 Rationalize AuditEventRepository contract
Closes gh-11331
7 years ago
Phillip Webb b078698f20 Update copyright year of changed files 7 years ago
Phillip Webb b3ec2c9d1d Polish 7 years ago
Johnny Lim 0f0c6e0729 Polish
Closes gh-11536
7 years ago
Phillip Webb cae02ce0b8 Make WebMvcMetricsFilter lazy
Update `WebMvcMetricsFilter` so that it no longer causes early
initialization of Spring MVC concerns.

Fixes gh-11571
7 years ago
Phillip Webb 25609c060e Polish 7 years ago
Andy Wilkinson 927003e0b7 Polish 7 years ago
Stephane Nicoll 5baedf9275 Polish "Deduplicate tag values in metrics actuator endpoint"
Closes gh-11492
7 years ago
Jon Schneider ebb51d5533 Deduplicate tag values in metrics actuator endpoint
See gh-11492
7 years ago
Stephane Nicoll 1962cbb623 Polish
This is no longer necessary as of micrometer 1.0 rc5
7 years ago
Phillip Webb 6bac365a72 Polish micrometer cache metrics
Change `CacheMeterBinderProvider` to include a cache type
generic which helps to simplify implementations. Also move
and extract a few classes.

See gh-11221
7 years ago
Stephane Nicoll 0515ca0dd0 Auto configure micrometer cache metrics
Closes gh-11221
7 years ago
Madhura Bhave be9291a365 Match trailing slash in actuator endpoints
Fixes gh-11024
7 years ago
Johnny Lim 3c5ccb1166 Polish
Closes gh-11418
7 years ago
Johnny Lim 4cc598ac5e Replace contains() with indexOf()
Closes gh-11373
7 years ago
Johnny Lim 240aaadd83 Fix package name for InfluxDB
Closes gh-11364
7 years ago
Phillip Webb befdbaaaa9 Polish 7 years ago
Stephane Nicoll b7435016fb Improve Couchbase health indicator
This commit improve the couchbase health indicator to list the available
nodes. Doing so improves the reliability of the indicator as accessing
the bucket forces a remote call and better detect the cases where the
broker is down.

Closes gh-7369
7 years ago
Stephane Nicoll 27922ae325 Polish 7 years ago
Stephane Nicoll a33c3eec3f Polish "Add InfluxDb health indicator"
Closes gh-11159
7 years ago
Eddú Meléndez cdbdc1cb7f Add InfluxDb health indicator
See gh-11159
7 years ago
Stephane Nicoll 41720ca93d Improve extension of Neo4jHealthIndicator
This commit makes it easier to extend `Neo4jHealthIndicator` for cases
where a custom cypher needs to be executed.

Closes gh-11120
7 years ago
Phillip Webb 3273859fde Polish 7 years ago
Phillip Webb 5ca608330c Merge branch '1.5.x' 7 years ago
Johnny Lim de72f2ae32 Polish
Closes gh-11327
7 years ago
Andy Wilkinson 04068ee792 Tolerate custom response status in WebMvcTags
Closes gh-11263
7 years ago
Stephane Nicoll 23218add90 Polish 7 years ago
Brian Clozel 97c91eee94 Merge pull request #11316 from dkublik:adding-MetricsClientHttpRequestInterceptor-only-once
* pr/11316:
  Polish
  Avoid duplicate Metrics HTTP interceptor registration
7 years ago
Brian Clozel c82f1016c1 Polish 7 years ago
dawid.kublik@vimn.com 77d4448c0e Avoid duplicate Metrics HTTP interceptor registration
Closes gh-11315
7 years ago
Stephane Nicoll 4eda29a42e Merge branch '1.5.x' 7 years ago
Stephane Nicoll a43dcfec6c Polish "Update documentation references to `/status` endpoint"
Closes gh-11213
7 years ago
Vedran Pavic e88c266285 Update documentation references to `/status` endpoint
See gh-11213
7 years ago
Stephane Nicoll b6609ff392 Polish "Fix NullPointer when requesting a session that does not exist"
Closes gh-11202
7 years ago
petar.tahchiev 35c6dc4e3b Fix NullPointer when requesting a session that does not exist
See gh-11202
7 years ago
Phillip Webb 2c959b8e2a Polish health indicators
Align reactive and non-reactive web extensions and update `showDetails`
so that it only applies to web exposure.

See gh-11113
See gh-11192
7 years ago
Madhura Bhave 9e95483645 Add cloudfoundry health extensions
Fixes gh-11192
7 years ago
Jon Schneider 2e0a915281 Upgrade to micrometer 1.0.0-rc.5
See gh-11071
7 years ago
Phillip Webb 960083bd33 Polish 7 years ago
Stephane Nicoll c4387e1e8a Polish "Add CouchbaseHealthIndicatorTests"
Closes gh-11161
7 years ago
Eddú Meléndez 2e9ca06688 Add CouchbaseHealthIndicatorTests
See gh-11161
7 years ago
Eddú Meléndez 5c216c2029 Clean LdapHealthIndicatorTests
Closes gh-11158
7 years ago
Andy Wilkinson 72b14b8add Merge branch '1.5.x' 7 years ago
Phillip Webb 07f71e889e Move `/application` to `/actuator`
Change the endpoint default path from `/application` to `/actuator`.

Fixes gh-10970
7 years ago
Phillip Webb 31025d9f6c Drop status endpoint
Drop the status endpoint and merge functionality back into the health
endpoint. The `management.endpoint.health.show-details` property can
be used to change if full details, or just the status is displayed.

Fixes gh-11113
7 years ago
Andy Wilkinson 4d1a98b380 Improve exception message that reports clashing endpoint operations
Closes gh-10942
7 years ago
Andy Wilkinson 41c297063b Record metrics for request handled by ParameterizableViewController
Closes gh-10335
7 years ago
Andy Wilkinson 331c7a1c56 Make handler Object available to WebMvcTagsProvider.httpRequestTags
Closes gh-11088
7 years ago
dreis2211 23da409b31 Remove duplicate words
Closes gh-11073
7 years ago
Johnny Lim 1783a072ad Remove explicit constructor super() calls
Closes gh-11068
7 years ago
Andy Wilkinson 4de208bc94 Provide reference documentation for Actuator web endpoints
Closes gh-8042
7 years ago
Johnny Lim e8563c54dd Polish
Closes gh-11050
7 years ago
Johnny Lim cbb483735d Polish
Closes gh-10948
7 years ago
Phillip Webb 9411d17649 Fix malformed javadoc 7 years ago
Phillip Webb fd5c43cdc9 Separate endpoint concerns
Update endpoint code to provide cleaner separation of concerns.
Specifically, the top level endpoint package is no longer aware of
the fact that JMX and HTTP are ultimately used to expose endpoints.
Caching concerns have also been abstracted behind a general purpose
`OperationMethodInvokerAdvisor` interface.

Configuration properties have been refined to further enforce
separation. The `management.endpoint.<name>` prefix provides
configuration for a  single endpoint (including enable and cache
time-to-live). These  properties are now technology agnostic (they
don't include `web` or `jmx` sub properties).

The `management.endpoints.<technology>` prefix provide exposure specific
configuration. For example, `management.endpoints.web.path-mapping`
allow endpoint URLs to be changed.

Endpoint enabled/disabled logic has been simplified so that endpoints
can't be disabled per exposure technology. Instead a filter based
approach is used to allow refinement of what endpoints are exposed over
a given technology.

Fixes gh-10176
7 years ago
Andy Wilkinson cf485ce144 Merge branch '1.5.x' 7 years ago
Andy Wilkinson 1a094598b8 Add an endpoint for retrieving information about scheduled tasks
Closes gh-8831
7 years ago
Andy Wilkinson 806cf32549 Drop redundant web extension for sessions endpoint
Changes made in f1cfad67 mean that the web-specific extension is no
longer required as the infrastructure now automatically produces a
bad request (400) response when a required query parameter is absent.

See gh-10372
7 years ago
Andy Wilkinson c7cac927f7 Bring spring-boot-actuator's README up to date
Closes gh-10686
7 years ago
Andy Wilkinson 2723892be3 Consistently include context id in endpoint responses
Closes gh-10980
7 years ago
Andy Wilkinson 07462be090 Polish 7 years ago
Phillip Webb 06b1b453a6 Limit when SystemEnvironment mapping is used
Update `SpringConfigurationPropertySource` so that the
`SystemEnvironmentPropertyMapper` is only used for the "actual" system
environment property source. This allows SystemEnvironmentProperySource
class to be used for other purposes (for example, Spring Cloud uses it
to as an override source providing decryption).

Only property sources named `systemEnvironment` or ending with
`-systemEnvironment` now have the `SystemEnvironmentPropertyMapper`
applied. The `TestPropertyValues` has been retrofitted to name the
source it adds appropriately.

Fixes gh-10840
7 years ago
Andy Wilkinson 723222aa95 Allow configuredLevel to be null when configuring a logger
Null value is used to indicate that the configured level should be
cleared.

Closes gh-10934
7 years ago
Andy Wilkinson 60afbdc868 Polish 7 years ago
Phillip Webb cf17e5708b Polish Micrometer 1.0.0-rc.3 upgrade
Polish Micrometer 1.0.0-rc.3 upgrade changes.

Closes gh-10906
7 years ago
Jon Schneider 65e6876025 Upgrade to Micrometer 1.0.0-rc.3
Upgrade to Micrometer 1.0.0-rc.3 and refactor existing
auto-configuration to align with updated APIs.

Note that Spring MVC instrumentation has now changed from an interceptor
to a Filter.

See gh-10906
7 years ago
Phillip Webb fa191d8c73 Align ReactiveWebApplicationContext with framework
Refactor `ReactiveWebApplicationContext` implementations to align closer
with the `WebApplicationContext` implementations defined in
Spring Framework.

The following classes are now provided:

  - `AnnotationConfigReactiveWebApplicationContext` -- A refreshable
    reactive web context with support for `@Configuration` classes.

  - `GenericReactiveWebApplicationContext` -- A non-refreshable reactive
    GenericApplicationContext.

  - `ReactiveWebServerApplicationContext` --  A non-refreshable reactive
    GenericApplicationContext with support for server discovery.

  - `AnnotationConfigReactiveWebServerApplicationContext` -- A
    non-refreshable reactive `GenericApplicationContext` with support
    for `@Configuration` classes and server discovery.

These classes roughly align to the following Servlet equivalents:

  - `AnnotationConfigWebApplicationContext` (Spring Framework)
  - `GenericWebApplicationContext` (Spring Framework)
  - `ServletWebServerApplicationContext` (Spring Boot)
  - `AnnotationConfigServletWebServerApplicationContext` (Spring Boot)

An additional `ConfigurableReactiveWebEnvironment` interface as also
been introduced, primarily for `@ConditionalOnWebApplication` to use.

Fixes gh-10852
7 years ago
Phillip Webb 3f00ba3cad Polish 7 years ago
Madhura Bhave d50fe8874f Add CF support for reactive actuators
Closes gh-10780
7 years ago
Phillip Webb c55b5d7111 Polish 7 years ago
Phillip Webb 44d8e09aac Polish endpoint parameter name discovery
Move logic from `ParameterNameMapper` into `ReflectiveOperationInvoker`
in order to reduce the surface area of the public API.

Also rename some classes for consistency.
7 years ago
Stephane Nicoll 350377c3f2 Polish "Handle AbstractReactiveHealthIndicator.doHealthCheck exception"
Closes gh-10822
7 years ago
Nikolay Rybak 99c2fa699e Handle AbstractReactiveHealthIndicator.doHealthCheck exception
Exceptions inside AbstractReactiveHealthIndicator.doHealthCheck()
method, outside of Mono pipeline, could fail whole endpoint
response instead of returning `DOWN` status from indicator.

See gh-10822
7 years ago
Stephane Nicoll 813a6966ef Merge branch '1.5.x' 7 years ago
Stephane Nicoll 555f51bfdb Fix checkstyle violation 7 years ago
Stephane Nicoll 00e0d61ee4 Use ParameterNameDiscoverer to detect operation's parameter names
Closes gh-10117
7 years ago
Stephane Nicoll 56afc25304 Allow to customize the path of a web endpoint
This commit introduces a endpoints.<id>.web.path generic property that
allows to customize the path of an endpoint. By default the path is the
same as the id of the endpoint.

Such customization does not apply for the CloudFoundry specific
endpoints.

Closes gh-10181
7 years ago
Vedran Pavic ac10fa31cd Upgrade to Hazelcast 3.9
Closes gh-10764
7 years ago
Andy Wilkinson 2b426c30a6 Polish “Remove explicit type arguments”
Closes gh-10494
7 years ago
Johnny Lim 6168fae720 Remove explicit type arguments
See gh-10494
7 years ago
Andy Wilkinson a256602c7b Polish 7 years ago
Andy Wilkinson 688da652ac Polish 7 years ago
dreis2211 3b71393e0a Use Assert.state() with Supplier where possible
See gh-10658
7 years ago
Johnny Lim 5aa32b3d0f Polish
Closes gh-10636
7 years ago
Andy Wilkinson 0af4536316 Ensure media types are used consistently across endpoint mappings
Previously, the media types that are consumed and produced by
endpoints were configured in the web stack-specific configuration.
Furthermore, these configured media types were not used for the
discovery "endpoint" that links to all the available endpoints.

This commit introduces EndpointMediaTypes that is configred in a
single, central location and then used to configure the consumed and
produced media types for endpoints exposed via WebFlux, Web MVC, and
Jersey as well as the discovery "endpoint" provided by each.

Closes gh-10659
7 years ago
Andy Wilkinson 1bd44d89d6 Test metrics endpoint using tag available on Java 9 as well as 8
See gh-10524
7 years ago
Phillip Webb 22a6ee03eb Polish MetricsEndpoint
See gh-10535
7 years ago
Jon Schneider 37975836f0 Support composite registries in MetricsEndpoint
Update `MetricsEndpoint` to deal with `CompositeMeterRegistry`
instances.

Closes gh-10535
7 years ago
dreis2211 a76005e8d9 Remove concatenations with empty string
Closes gh-10512
7 years ago
Phillip Webb 748e0779b6 Update copyright year for changed files 7 years ago
Jon Schneider bc05352290 Improve new metrics endpoint
- New repeatable tag query parameter to refine a query by one or more
  tag key/value pairs.
- Selecting a metric by name (and optionally a set of tags) reports
  statistics that are the sum of the statistics on all time series
  containing the name (and tags).

Closes gh-10524
7 years ago
Andy Wilkinson 7fc272df6e Start building against Micrometer snapshots for 1.0.0-rc.2 7 years ago
Phillip Webb da0c4f5520 Increase endpoint integration test timeouts
Allow longer for test responses to be returned.

See gh-9316
7 years ago
Phillip Webb b87f9c11f1 Fix POMs for the updated build/release process
Fix POMs following project relocations and apply CI friendly Maven
conventions.

See gh-9316
7 years ago
Phillip Webb 0ba4830b4f Relocate projects to spring-boot-project
Move projects to better reflect the way that Spring Boot is released.

The following projects are under `spring-boot-project`:

  - `spring-boot`
  - `spring-boot-autoconfigure`
  - `spring-boot-tools`
  - `spring-boot-starters`
  - `spring-boot-actuator`
  - `spring-boot-actuator-autoconfigure`
  - `spring-boot-test`
  - `spring-boot-test-autoconfigure`
  - `spring-boot-devtools`
  - `spring-boot-cli`
  - `spring-boot-docs`

See gh-9316
7 years ago