06cdc91c85
Polish ObservationAutoConfiguration
...
- Use a better name for the "only metrics, no tracing" case
- Use more concrete return types
2 years ago
5db04da275
Use pattern matching for instanceof where appropriate
...
See gh-31475
2 years ago
43c2f1c03c
Polish AutoConfigureObservability changes
...
See gh-31457
2 years ago
aab59c5f2e
Static-import Mockito.mock()
...
See gh-31443
2 years ago
657fa3e64e
Merge branch '2.7.x'
...
Closes gh-31409
2 years ago
7c91ebb1b0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31408
2 years ago
ae6311ddda
Prevent Logback from accidentally being used in Log4J2LoggingSystemTests
...
Update `Log4J2LoggingSystemTests` to exclude Logback and include
'log4j-slf4j-impl'. The `ModifiedClassPathClassLoader` has also been
updated so that it no longer automatically excludes `log4j` artifacts,
instead we now use `@ClassPathExclusions` on the relevant tests.
Fixes gh-19365
2 years ago
85dcbf6100
Merge branch '2.7.x'
...
Closes gh-31385
2 years ago
e0947459b6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31384
2 years ago
9f8a262e6b
Log a warning when a health indicator takes too long to run
...
Update `HealthEndpointSupport` so that it logs a warning if a health
indicator takes too long to respond.
Fixes gh-31231
2 years ago
b536b209ab
Refine assertions on exception messages
2 years ago
42e8f65b80
Move @ConditionalOnClass from methods to inner classes
...
Closes gh-31353
2 years ago
063e56dbff
Polish
2 years ago
d4be484d27
Upgrade to AssertJ 3.23.1
...
Closes gh-31331
2 years ago
3799170c4d
Disable metrics and tracing in web endpoints integration tests
...
See gh-31308
2 years ago
8fab9f290c
Back off tracing auto-configurations if tracing is disabled
...
See gh-31308
2 years ago
b019ff6102
Wavefront sender configuration is no longer an auto-configuration
...
It's now a regular configuration class which is imported from
the Wavefront metrics and tracing auto-configurations
2 years ago
943e9033c0
Add @ConditionalOnEnabledTracing condition
...
See gh-31308
2 years ago
41e9867bc4
Register all ObservationHandler, regardless which context they use
...
Closes #31272
2 years ago
d1647cf68c
Don't back off on user-supplied SpanHandlers
...
Instead the auto-configuration now backs off only on ZipkinSpanHandler.
Closes gh-31273
2 years ago
91bb5aa222
Move auto-config of ReactiveElasticClient to elasticsearch pkg
...
Closes gh-28068
2 years ago
c56783064d
Support management contexts with AOT
...
Refactor child management configuration and add AOT generation support.
A new `ChildManagementContextInitializer` class now performs the child
context initialization and also handles AOT processing concerns.
Closes gh-31163
2 years ago
46c262d3cc
Merge branch '2.7.x'
...
Closes gh-31283
2 years ago
12eb7a8795
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31282
2 years ago
a651061e2c
Remove SpringApplicationHierarchyTests
...
Closes gh-31281
2 years ago
f720b65dfc
Auto-configure JvmCompilationMetrics
...
See gh-31151
3 years ago
4bb5ba2bd0
Merge branch '2.7.x'
3 years ago
935d1264e0
Merge branch '2.6.x' into 2.7.x
3 years ago
3d203d0215
Polish
3 years ago
5dfa5adb75
Merge branch '2.7.x'
...
Closes gh-31178
3 years ago
455ee0ce22
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31177
3 years ago
ee45fd2fc8
Remove redundant throws declarations from internal APIs
...
Closes gh-31176
3 years ago
b3a4982f31
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31174
3 years ago
cbf42dea14
Update deprecation messages to change removal version from 2.8 to 3.0
...
Closes gh-30903
3 years ago
154c84ffe2
Add package-info for o.s.b.a.a.metrics.graphql
...
See gh-31140
3 years ago
f9db6ad237
Merge branch '2.7.x'
...
Closes gh-31152
3 years ago
24dc525127
Fix conditions on auto-configured WebMvcMetricsFilter
...
Closes gh-31150
3 years ago
96c2d08fc4
Remove support for Solr as it is not compatible with Jetty 11
...
Closes gh-31054
3 years ago
f8a41d34aa
Merge branch '2.7.x'
3 years ago
cbf415b850
Merge branch '2.7.x'
3 years ago
285378e4f9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31059
3 years ago
18129a5938
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31058
3 years ago
22d187a38c
Polish "Add missing configuration properties for Statsd"
...
See gh-30898
3 years ago
d90ef6afb3
Add missing configuration properties for Statsd
...
See gh-30898
3 years ago
3c7465cb35
Polish OtlpPropertiesConfigAdapterTests
...
See gh-31057
3 years ago
ed705cc78e
Polish
3 years ago
a496cb9298
Merge branch '2.7.x'
3 years ago
2669f8c343
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30997
3 years ago
655ceefead
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30996
3 years ago
3f6fcac683
Polish "Extend documentation on Datadog metrics"
...
See gh-30879
3 years ago
09db7e4001
Extend documentation on Datadog metrics
...
- Document that an application key must be set to publish metadata
for the exported metrics.
- Point out that using a non-US Datadog site (e.g., EU) requires
changing the `uri` property.
See gh-30879
3 years ago
48c948973d
Polish
3 years ago
d0e55643b1
Polish
...
Closes gh-30993
3 years ago
c2a3652709
Merge branch '2.7.x'
3 years ago
7e88daf288
Update messages for APIs deprecated in 2.7
...
In all likelihood there will not be a 2.9 release so this commit
updates the message for deprecations made in 2.7 to indicate that
removal will not occur until 3.0.
See gh-30903
3 years ago
26405528c6
Polish "Add resourceAttributes property to OtlpProperties"
...
See gh-30984
3 years ago
e3fce8439a
Add resourceAttributes property to OtlpProperties
...
See gh-30984
3 years ago
541ab69aff
Merge branch '2.7.x'
3 years ago
4cd850cfc0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30851
3 years ago
fa327a783d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30850
3 years ago
4fd2e0c916
Polish "Fix typos"
...
See gh-30773
3 years ago
f6d24dc1a8
Fix typos
...
See gh-30773
3 years ago
f7a7e8cb89
Add auto-configuration for OtlpMeterRegistry
...
See gh-30825
3 years ago
9f2114170e
Apply key values rename consistently
...
See gh-30837
3 years ago
77c3b6c899
Polish Micrometer tracing changes
...
See gh-30833
3 years ago
2cebbe10ce
Merge branch '2.7.x'
3 years ago
61cd05f74b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30842
3 years ago
f1b5f36af8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30841
3 years ago
f8e5a534a6
Polish "Polish InfluxMetricsExportAutoConfiguration"
...
See gh-30824
3 years ago
b0d5364efa
Polish InfluxMetricsExportAutoConfiguration
...
See gh-30824
3 years ago
6a65aa4a23
Auto-configure Micrometer's JvmInfoMetrics
...
See gh-30832
3 years ago
6d15e6d4ef
Adapt to breaking API changes in latest Micrometer snapshots
...
See gh-30800
3 years ago
85a4c94dea
Merge branch '2.7.x'
3 years ago
b406971094
Remove hyphen from asserting-party
...
spring.security.saml2.relyingparty.registration.*.asserting-party.* is
now named spring.security.saml2.relyingparty.registration.*.assertingparty.*
Closes gh-30785
3 years ago
afdb651b04
Auto-configure TracingObservationHandler for HTTP server and clients
...
- Auto-configures HttpServerTracingObservationHandler and
HttpClientTracingObservationHandler into Micrometer Tracing. Both
handlers are ordered before the DefaultTracingObservationHandler,
which is only used as a fallback.
- The HttpServerHandler and HttpClientHandler implementations are
auto-configured in the Brave and OpenTelemetry auto-configurations.
Closes gh-30784
3 years ago
c7374fd415
Update copyright year of changed files
3 years ago
7a6ca8ce25
Merge branch '2.7.x'
3 years ago
dd5696b59b
Update copyright year of changed files
3 years ago
36f1249fc6
Polish
3 years ago
bb4bccde6c
Remove deprecated 'identityprovider' property
...
Closes gh-30751
3 years ago
1950d06585
Merge branch '2.7.x'
3 years ago
6c400daa48
Rename 'identityprovider' property to 'asserting-party'
...
Rename spring.security.saml2.relyingparty.registration.*.identity-provider.*
to spring.security.saml2.relyingparty.registration.*.asserting-party.*
The old property names are still supported, but will lead to a warning
in the logs.
Closes gh-30642
3 years ago
2d663f2e94
Upgrade to Spring Data 2021.2.0-RC1
...
Closes gh-30610
3 years ago
b41d4d4f2a
Merge branch '2.7.x'
3 years ago
69045e4eaf
Polish "Allow disabling the Dynatrace instruments"
...
See gh-30637
3 years ago
7a05faf079
Allow disabling the Dynatrace instruments
...
Since Micrometer version 1.9.0, the Dynatrace registry uses specialized
instruments by default, which ensures data is exported in an optimal
format. By using this new flag, users can switch back to the previous
behavior, which uses the original instruments from Micrometer.
See gh-30637
3 years ago
8c68b33240
Polish "Start building against Micrometer 1.10.0 snapshots"
...
See gh-30693
3 years ago
87991d93a5
Start building against Micrometer 1.10.0 snapshots
...
See gh-30693
3 years ago
3860eb211a
Implement auto-configurations for Brave and OpenTelemetry
...
- Configure Zipkin
- Configure Wavefront
- Configure Brave
- Configure OpenTelemetry
- Configure Micrometer Tracing bridges for OpenTelemetry and Brave
- Create the ObservationHandler for tracing with Micrometer
Closes gh-30156
3 years ago
3d5086a42d
Merge branch '2.7.x'
3 years ago
ff40c8b6f5
Use MeterBinders to bind DataSource metrics
...
Closes gh-30282
3 years ago
2c42be9392
Merge branch '2.7.x'
3 years ago
6c04241ad6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30652
3 years ago
9e98ccd8ab
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30651
3 years ago
dfc0f21932
Fix language in WavefrontProperties
...
Closes gh-30649
3 years ago
fe46392144
Merge branch '2.7.x'
3 years ago
27a936e466
Fix Elastic health indicator without RestHighLevelClient
...
Closes gh-28496
3 years ago
d5a92ccb8b
Merge branch '2.7.x'
3 years ago
a7a71da9ef
Polish "Bring back Elasticsearch RestClient auto-configuration"
...
See gh-28496
3 years ago
eb3bf40bdb
Bring back Elasticsearch RestClient auto-configuration
...
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4edhttps://github.com/elastic/elasticsearch-java
3 years ago
77b7f2f1ce
Switch to Spring Framework SNAPSHOTs
...
See gh-30624
3 years ago
44211564a4
Adapt to latest changes in Micrometer 2.0 snapshots
...
See gh-29666
3 years ago
6580f6c742
Align with latest changes in Micrometer 1.9 snapshots
...
See gh-30605
3 years ago
b871a1e457
Merge branch '2.7.x'
3 years ago
48f8021d88
Migrate @Local*Port annotations to spring-boot-test
...
Closes gh-29589
3 years ago
8d18e5fc0e
Merge branch '2.7.x'
3 years ago
b8b903527a
Update tag keys to comply with Micrometer recommendations
...
Closes gh-30536
3 years ago
136189c86f
Merge branch '2.7.x'
3 years ago
f209d77cb2
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30617
3 years ago
d6731805b6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30616
3 years ago
70fa7e5e93
Make properties field final
...
Closes gh-30615
3 years ago
3e67ffd233
Merge branch '2.7.x'
3 years ago
245e602ae0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30573
3 years ago
09daad0a16
Add metadata for management.endpoint.health.probes.add-additional-paths
...
See gh-30562
3 years ago
5ab9112bbc
Add auto-configuration for Micrometer 2.0.0 Observation API
...
- Adds a ObservationRegistry bean
- Add support for ObservationRegistryCustomizers
- Enables timer creation for observations if micrometer-core is on
the classpath
- Registers ObservationPredicate, GlobalTagsProvider and
ObservationHandler on the MeterRegistry
- Applies grouping to the ObservationHandlers: MeterObservationHandler
are added to a FirstMatchingCompositeObservationHandler
- If micrometer-tracing is on the classpath, the
TracingObservationHandler are added to a
FirstMatchingCompositeObservationHandler
Closes gh-29666
3 years ago
9791318e55
Merge branch '2.7.x'
3 years ago
d0bc31a5e9
Add support for Prometheus Exemplars
...
See gh-30472
3 years ago
be3523b1cd
Move metric properties
...
- Moved from 'management.metrics.export.<product>' to
'management.<product>.metrics.export'
- The default enabled property moved from 'management.metrics.export.defaults.enabled'
to 'management.defaults.metrics.export.enabled'
Closes gh-30381
3 years ago
3af3b26f8e
Merge branch '2.7.x'
3 years ago
018281f3d0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30441
3 years ago
cee51783fd
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30440
3 years ago
24e748d5cd
Remove unnecessary entries in additional config metadata
...
Add the 'enabled' fields directly to the classes instead.
Closes gh-30439
3 years ago
e431842668
Merge branch '2.7.x'
3 years ago
45f393b76b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30437
3 years ago
c003d5b533
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30436
3 years ago
0ff8119a1b
Sort entries in additional-spring-configuration metadata alphabetically
...
Closes gh-30434
3 years ago
2088381d4b
Merge branch '2.7.x'
3 years ago
774f61fcb5
Add support for cache2k in memory caching
...
See gh-28498
3 years ago
cabfb98a89
Merge branch '2.7.x'
3 years ago
a14f3ed200
Use a ConfigurationProperties class for JMX properties
...
Closes gh-30327
3 years ago
997f7cbfce
Merge branch '2.7.x'
3 years ago
dfd4097436
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30101
3 years ago
5b2cc74f71
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30100
3 years ago
708e57eafb
Register metrics for wrapped R2DBC ConnectionPools
...
Closes gh-30090
3 years ago
1793cee00f
Start building against Micrometer 2.0.0-M3
...
See gh-29753
3 years ago
bd0829a382
Merge branch '2.7.x'
3 years ago
ff7321cc5a
Polish "Support overriding the default SanitizingFunction"
...
See gh-30006
3 years ago
fb9112c891
Support overriding the default SanitizingFunction
...
See gh-30006
3 years ago
0072cc807c
Suppress deprecation warnings caused by micrometer backwards compatability
3 years ago
7897a913a7
Start building against Micrometer 1.9.0-M4 snapshots
...
Micrometer duplicated the binders in a separate module named
micrometer-binders, and marked the binders in the core module as
deprecated. This commit changes the imports to use the new binders in
the micrometer-binders module. Additionally, the auto-configurations
honor user-supplied beans which use the old binders in the
micrometer-core module.
See gh-30014
3 years ago
5454e2e26a
Merge branch '2.7.x'
3 years ago
9f00c3acf5
Polish
3 years ago
54f1058d63
Merge branch '2.7.x'
3 years ago
9149ae50da
Use @AutoConfiguration for relative ordering on auto-configurations
3 years ago
03e5dcdb3a
Merge branch '2.7.x'
3 years ago
1325153ee9
Move ManagementContextConfiguration from spring.factories
...
The import selector will now, in addition to spring.factories, look for
ManagementContextConfiguration classes in a file called
META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports
The existing ManagementContextConfigurations have been moved from
spring.factories to the new file.
Closes gh-29730
3 years ago
d42f675959
Merge branch '2.7.x'
3 years ago
d7b229d3c7
Rename AutoConfigurationLoader to ImportCandidates
...
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports
See gh-29872
3 years ago
cb69d01e04
Merge branch '2.7.x' into main
3 years ago
42328771ad
Suppress deprecation warnings for WebSecurityConfigurerAdapter
...
Fixes gh-29897
3 years ago
42808ff13c
Merge branch '2.7.x'
...
# Conflicts:
# spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
# spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
# spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
3 years ago
7c96294641
Move our auto-configurations from spring.factories to new file
...
Closes gh-29873
3 years ago
303979fb65
Merge branch '2.7.x'
3 years ago
7d68b58c8f
Load auto-configurations from META-INF/spring-boot
...
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.
Adapts the AutoConfigurationImportSelector to use the new loader.
Adapts the ImportAutoConfigurationImportSelector to use the new loader.
Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.
Updates the documentation for auto-configurations and test slices.
Closes gh-29872
3 years ago
ff4b92a3ba
Update copyright year of changed files
3 years ago
fdb1010cbc
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
3 years ago
8e99788fc8
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
3 years ago
b22e3d51dc
Merge branch '2.7.x'
3 years ago
e3d0f1feee
Adjust IDENTITY in DDLs for H2 2.x compatibility
...
See gh-29200
3 years ago
a282f912e6
Organize imports
...
Organize imports according to updated checkstyle rules.
3 years ago
501d174db0
Merge branch '2.7.x'
3 years ago
ce08b519b1
Merge branch '2.6.x' into 2.7.x
3 years ago
50e0e28155
Merge branch '2.5.x' into 2.6.x
3 years ago
41fb9cf562
Merge branch '2.7.x'
3 years ago
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
3 years ago
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
3 years ago
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
3 years ago
b49418aaaf
Enforce use of BDDMockito
...
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule
See gh-29178
3 years ago
68bd6f91cf
Merge branch '2.7.x'
3 years ago
a94b176c39
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29595
3 years ago
118eb5f74a
Polish AbstractHealthEndpointAdditionalPathIntegrationTests
...
See gh-29593
3 years ago
8125b46ed5
Merge branch '2.7.x' into main
3 years ago
81bbd295e9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29584
3 years ago
0597c6831e
Configure health on additional path only when health exposed
...
Prior to this commit, limiting the exposure to a specific
technology in `ConditionalOnAvailableEndpoint` would not have
any effect because all endpoints would be considered to be available
if the app was running on Cloud Foundry. This caused issues in cases
where beans were meant to be exposed only if the endpoint was actually
exposed.
This commit adds CLOUD_FOUNDRY to the `EndpointExposure`
enum. This allows `ConditionalOnAvailableEndpoint` to limit
by exposure even when the Cloud Foundry platform is active.
Fixes gh-29532
3 years ago
de3b9a4910
Remove code deprecated for removal in 2.x
...
Closes gh-29482
3 years ago
4d03f89a55
Harmonize dependency upgrades with Spring Boot 2.7.0-M1
...
Closes gh-29476
3 years ago
90b8d2190f
Adapt to latest change in Spring Data Elasticsearch
3 years ago
8ec8268a77
Merge branch '2.7.x'
3 years ago
c02faea9c9
Allow WebMvcFilter to be overridden by user configuration
...
Closes gh-28428
3 years ago
5f67546534
Adapt to latest API change in SD Elasticsearch
...
See gh-29292
3 years ago
9e27bddfc7
Start building against Spring Data 2021.2.0-M1 snapshots
...
This commit also upgrades to Elasticsearch 7.16.2
See gh-29223
See gh-29292
3 years ago
894f83fb13
Upgrade to Artemis 2.20.0 and switch to Jakarta EE 9 JMS API
...
Closes gh-29203
3 years ago
89e79e826e
Reinstate support for Apache Artemis
...
See gh-29203
3 years ago
9a05eb63c4
Use built-in basic auth support as it no longer requires JAX-B
...
Closes gh-28829
3 years ago
025fe4fd43
Merge branch '2.7.x'
3 years ago
a780e87e9c
Upgrade to Hazelcast 5.0.2
...
See gh-29265
3 years ago
760dcffd8b
Merge branch '2.7.x'
3 years ago
f09bde2b60
Merge branch '2.6.x' into 2.7.x
3 years ago
dc054943bf
Merge branch '2.7.x'
...
Closes gh-29262
3 years ago
c839ebbce4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29261
3 years ago
8e583f6f73
Apply exclusion rules to child contributors
...
Update `IncludeExcludeGroupMemberPredicate` so that exclusion rules are
also applied to child contributors. The restores the behavior of Spring
Boot 2.5.x where `management.endpoint.health.group.mygroup.exclude=db`
would exclude 'db/one', 'db/two' etc.
Fixes gh-29251
3 years ago
1dbfcf8b57
Reinstate support for Spring Data Couchbase
...
Closes gh-28976
3 years ago
abb622023d
Merge branch '2.7.x'
3 years ago
d24720d958
Polish "Expose OS information as an InfoContributor"
...
See gh-28907
3 years ago
c700f686c6
Expose OS information as an InfoContributor
...
See gh-28907
3 years ago
b94fcd1ad7
Merge branch '2.7.x'
3 years ago
de947e0800
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29190
3 years ago
d234681348
Fix default value for management.info.env.enabled in metadata
...
See gh-29187
3 years ago
09486b8fc7
Merge branch '2.7.x'
3 years ago
2b140950e3
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29176
3 years ago
Moritz Halbritter
dreis2211
Johnny Lim
Phillip Webb
Stephane Nicoll
Andy Wilkinson
Eddú Meléndez
Denis Washington
Georg Pirklbauer
Marcin Grzejszczak
Moritz Halbritter
Filip Hrisafov
Brian Clozel
luozhenyu
Jonatan Ivanov
Jens Wilke
Scott Frederick
Guirong Hu
Henning Poettker
Yanming Zhou
Madhura Bhave