mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '3.0.x'
Closes gh-34867
This commit is contained in:
commit
a031bf4d58
@ -116,6 +116,7 @@ dependencies {
|
|||||||
optional("org.springframework:spring-webflux")
|
optional("org.springframework:spring-webflux")
|
||||||
optional("org.springframework:spring-webmvc")
|
optional("org.springframework:spring-webmvc")
|
||||||
optional("org.springframework.amqp:spring-rabbit")
|
optional("org.springframework.amqp:spring-rabbit")
|
||||||
|
optional("org.springframework.batch:spring-batch-core")
|
||||||
optional("org.springframework.data:spring-data-cassandra") {
|
optional("org.springframework.data:spring-data-cassandra") {
|
||||||
exclude group: "org.slf4j", module: "jcl-over-slf4j"
|
exclude group: "org.slf4j", module: "jcl-over-slf4j"
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,48 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2023 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.boot.actuate.autoconfigure.observation.batch;
|
||||||
|
|
||||||
|
import io.micrometer.observation.ObservationRegistry;
|
||||||
|
|
||||||
|
import org.springframework.batch.core.configuration.annotation.BatchObservabilityBeanPostProcessor;
|
||||||
|
import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@link EnableAutoConfiguration Auto-configuration} for instrumentation of Spring Batch
|
||||||
|
* Jobs.
|
||||||
|
*
|
||||||
|
* @author Mark Bonnekessel
|
||||||
|
* @since 3.0.6
|
||||||
|
*/
|
||||||
|
@AutoConfiguration(after = ObservationAutoConfiguration.class)
|
||||||
|
@ConditionalOnBean(ObservationRegistry.class)
|
||||||
|
@ConditionalOnClass({ ObservationRegistry.class, BatchObservabilityBeanPostProcessor.class })
|
||||||
|
public class BatchObservationAutoConfiguration {
|
||||||
|
|
||||||
|
@ConditionalOnMissingBean
|
||||||
|
@Bean
|
||||||
|
public static BatchObservabilityBeanPostProcessor batchObservabilityBeanPostProcessor() {
|
||||||
|
return new BatchObservabilityBeanPostProcessor();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2023 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto-configuration for Spring Batch observations.
|
||||||
|
*/
|
||||||
|
package org.springframework.boot.actuate.autoconfigure.observation.batch;
|
@ -68,6 +68,7 @@ org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetri
|
|||||||
org.springframework.boot.actuate.autoconfigure.metrics.export.stackdriver.StackdriverMetricsExportAutoConfiguration
|
org.springframework.boot.actuate.autoconfigure.metrics.export.stackdriver.StackdriverMetricsExportAutoConfiguration
|
||||||
org.springframework.boot.actuate.autoconfigure.metrics.export.statsd.StatsdMetricsExportAutoConfiguration
|
org.springframework.boot.actuate.autoconfigure.metrics.export.statsd.StatsdMetricsExportAutoConfiguration
|
||||||
org.springframework.boot.actuate.autoconfigure.metrics.export.wavefront.WavefrontMetricsExportAutoConfiguration
|
org.springframework.boot.actuate.autoconfigure.metrics.export.wavefront.WavefrontMetricsExportAutoConfiguration
|
||||||
|
org.springframework.boot.actuate.autoconfigure.observation.batch.BatchObservationAutoConfiguration
|
||||||
org.springframework.boot.actuate.autoconfigure.observation.graphql.GraphQlObservationAutoConfiguration
|
org.springframework.boot.actuate.autoconfigure.observation.graphql.GraphQlObservationAutoConfiguration
|
||||||
org.springframework.boot.actuate.autoconfigure.metrics.integration.IntegrationMetricsAutoConfiguration
|
org.springframework.boot.actuate.autoconfigure.metrics.integration.IntegrationMetricsAutoConfiguration
|
||||||
org.springframework.boot.actuate.autoconfigure.metrics.jdbc.DataSourcePoolMetricsAutoConfiguration
|
org.springframework.boot.actuate.autoconfigure.metrics.jdbc.DataSourcePoolMetricsAutoConfiguration
|
||||||
|
@ -0,0 +1,51 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2023 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.boot.actuate.autoconfigure.observation.batch;
|
||||||
|
|
||||||
|
import io.micrometer.observation.tck.TestObservationRegistry;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import org.springframework.batch.core.configuration.annotation.BatchObservabilityBeanPostProcessor;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfigurations;
|
||||||
|
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests for {@link BatchObservationAutoConfiguration}.
|
||||||
|
*
|
||||||
|
* @author Mark Bonnekessel
|
||||||
|
*/
|
||||||
|
class BatchObservationAutoConfigurationTests {
|
||||||
|
|
||||||
|
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
|
||||||
|
.withBean(TestObservationRegistry.class, TestObservationRegistry::create)
|
||||||
|
.withConfiguration(AutoConfigurations.of(BatchObservationAutoConfiguration.class));
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void backsOffWhenObservationRegistryIsMissing() {
|
||||||
|
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(BatchObservationAutoConfiguration.class))
|
||||||
|
.run((context) -> assertThat(context).doesNotHaveBean(BatchObservabilityBeanPostProcessor.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void beanIsPresentWhenSpringBatchIsPresent() {
|
||||||
|
this.contextRunner
|
||||||
|
.run((context) -> assertThat(context).hasSingleBean(BatchObservabilityBeanPostProcessor.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -858,12 +858,22 @@ NOTE: Only caches that are configured on startup are bound to the registry.
|
|||||||
For caches not defined in the cache’s configuration, such as caches created on the fly or programmatically after the startup phase, an explicit registration is required.
|
For caches not defined in the cache’s configuration, such as caches created on the fly or programmatically after the startup phase, an explicit registration is required.
|
||||||
A `CacheMetricsRegistrar` bean is made available to make that process easier.
|
A `CacheMetricsRegistrar` bean is made available to make that process easier.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
[[actuator.metrics.supported.spring-batch]]
|
||||||
|
==== Spring Batch Metrics
|
||||||
|
|
||||||
|
See the {spring-batch-docs}monitoring-and-metrics.html[Spring Batch reference documentation].
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[[actuator.metrics.supported.spring-graphql]]
|
[[actuator.metrics.supported.spring-graphql]]
|
||||||
==== Spring GraphQL Metrics
|
==== Spring GraphQL Metrics
|
||||||
|
|
||||||
See the {spring-graphql-docs}[Spring GraphQL reference documentation].
|
See the {spring-graphql-docs}[Spring GraphQL reference documentation].
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[[actuator.metrics.supported.jdbc]]
|
[[actuator.metrics.supported.jdbc]]
|
||||||
==== DataSource Metrics
|
==== DataSource Metrics
|
||||||
Auto-configuration enables the instrumentation of all available `DataSource` objects with metrics prefixed with `jdbc.connections`.
|
Auto-configuration enables the instrumentation of all available `DataSource` objects with metrics prefixed with `jdbc.connections`.
|
||||||
|
Loading…
Reference in New Issue
Block a user