Renamed Observed -> Observation
This commit is contained in:
@@ -28,7 +28,7 @@ import org.springframework.boot.ApplicationRunner;
|
||||
*
|
||||
* @author Marcin Grzejszczak
|
||||
*/
|
||||
class ObservedApplicationRunner implements ApplicationRunner, Observation.KeyValuesProviderAware<TaskKeyValuesProvider> {
|
||||
class ObservationApplicationRunner implements ApplicationRunner, Observation.KeyValuesProviderAware<TaskKeyValuesProvider> {
|
||||
|
||||
private final BeanFactory beanFactory;
|
||||
|
||||
@@ -40,7 +40,7 @@ class ObservedApplicationRunner implements ApplicationRunner, Observation.KeyVal
|
||||
|
||||
private TaskKeyValuesProvider keyValuesProvider = new DefaultTaskKeyValuesProvider();
|
||||
|
||||
ObservedApplicationRunner(BeanFactory beanFactory, ApplicationRunner delegate, String beanName) {
|
||||
ObservationApplicationRunner(BeanFactory beanFactory, ApplicationRunner delegate, String beanName) {
|
||||
this.beanFactory = beanFactory;
|
||||
this.delegate = delegate;
|
||||
this.beanName = beanName;
|
||||
@@ -26,18 +26,18 @@ import org.springframework.boot.ApplicationRunner;
|
||||
*
|
||||
* @author Marcin Grzejszczak
|
||||
*/
|
||||
class ObservedApplicationRunnerBeanPostProcessor implements BeanPostProcessor {
|
||||
class ObservationApplicationRunnerBeanPostProcessor implements BeanPostProcessor {
|
||||
|
||||
private final BeanFactory beanFactory;
|
||||
|
||||
ObservedApplicationRunnerBeanPostProcessor(BeanFactory beanFactory) {
|
||||
ObservationApplicationRunnerBeanPostProcessor(BeanFactory beanFactory) {
|
||||
this.beanFactory = beanFactory;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
|
||||
if (bean instanceof ApplicationRunner applicationRunner && !(bean instanceof ObservedApplicationRunner)) {
|
||||
return new ObservedApplicationRunner(this.beanFactory, applicationRunner, beanName);
|
||||
if (bean instanceof ApplicationRunner applicationRunner && !(bean instanceof ObservationApplicationRunner)) {
|
||||
return new ObservationApplicationRunner(this.beanFactory, applicationRunner, beanName);
|
||||
}
|
||||
return bean;
|
||||
}
|
||||
@@ -27,7 +27,7 @@ import org.springframework.boot.CommandLineRunner;
|
||||
*
|
||||
* @author Marcin Grzejszczak
|
||||
*/
|
||||
class ObservedCommandLineRunner implements CommandLineRunner, Observation.KeyValuesProviderAware<TaskKeyValuesProvider> {
|
||||
class ObservationCommandLineRunner implements CommandLineRunner, Observation.KeyValuesProviderAware<TaskKeyValuesProvider> {
|
||||
|
||||
private final BeanFactory beanFactory;
|
||||
|
||||
@@ -39,7 +39,7 @@ class ObservedCommandLineRunner implements CommandLineRunner, Observation.KeyVal
|
||||
|
||||
private TaskKeyValuesProvider keyValuesProvider = new DefaultTaskKeyValuesProvider();
|
||||
|
||||
ObservedCommandLineRunner(BeanFactory beanFactory, CommandLineRunner delegate, String beanName) {
|
||||
ObservationCommandLineRunner(BeanFactory beanFactory, CommandLineRunner delegate, String beanName) {
|
||||
this.beanFactory = beanFactory;
|
||||
this.delegate = delegate;
|
||||
this.beanName = beanName;
|
||||
@@ -26,18 +26,18 @@ import org.springframework.boot.CommandLineRunner;
|
||||
*
|
||||
* @author Marcin Grzejszczak
|
||||
*/
|
||||
class ObservedCommandLineRunnerBeanPostProcessor implements BeanPostProcessor {
|
||||
class ObservationCommandLineRunnerBeanPostProcessor implements BeanPostProcessor {
|
||||
|
||||
private final BeanFactory beanFactory;
|
||||
|
||||
ObservedCommandLineRunnerBeanPostProcessor(BeanFactory beanFactory) {
|
||||
ObservationCommandLineRunnerBeanPostProcessor(BeanFactory beanFactory) {
|
||||
this.beanFactory = beanFactory;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
|
||||
if (bean instanceof CommandLineRunner commandLineRunner && !(bean instanceof ObservedCommandLineRunner)) {
|
||||
return new ObservedCommandLineRunner(this.beanFactory, commandLineRunner, beanName);
|
||||
if (bean instanceof CommandLineRunner commandLineRunner && !(bean instanceof ObservationCommandLineRunner)) {
|
||||
return new ObservationCommandLineRunner(this.beanFactory, commandLineRunner, beanName);
|
||||
}
|
||||
return bean;
|
||||
}
|
||||
@@ -43,19 +43,19 @@ import org.springframework.context.annotation.Configuration;
|
||||
public class ObservationTaskAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
ObservedTaskExecutionListener traceTaskExecutionListener(ObservationRegistry registry,
|
||||
ObservationTaskExecutionListener traceTaskExecutionListener(ObservationRegistry registry,
|
||||
@Value("${spring.application.name:default}") String appName) {
|
||||
return new ObservedTaskExecutionListener(registry, appName);
|
||||
return new ObservationTaskExecutionListener(registry, appName);
|
||||
}
|
||||
|
||||
@Bean
|
||||
static ObservedCommandLineRunnerBeanPostProcessor observedCommandLineRunnerBeanPostProcessor(BeanFactory beanFactory) {
|
||||
return new ObservedCommandLineRunnerBeanPostProcessor(beanFactory);
|
||||
static ObservationCommandLineRunnerBeanPostProcessor observedCommandLineRunnerBeanPostProcessor(BeanFactory beanFactory) {
|
||||
return new ObservationCommandLineRunnerBeanPostProcessor(beanFactory);
|
||||
}
|
||||
|
||||
@Bean
|
||||
static ObservedApplicationRunnerBeanPostProcessor observedApplicationRunnerBeanPostProcessor(BeanFactory beanFactory) {
|
||||
return new ObservedApplicationRunnerBeanPostProcessor(beanFactory);
|
||||
static ObservationApplicationRunnerBeanPostProcessor observedApplicationRunnerBeanPostProcessor(BeanFactory beanFactory) {
|
||||
return new ObservationApplicationRunnerBeanPostProcessor(beanFactory);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -31,15 +31,15 @@ import org.springframework.core.Ordered;
|
||||
* @author Marcin Grzejszczak
|
||||
* @since 3.1.0
|
||||
*/
|
||||
class ObservedTaskExecutionListener implements TaskExecutionListener, Ordered {
|
||||
class ObservationTaskExecutionListener implements TaskExecutionListener, Ordered {
|
||||
|
||||
private static final Log log = LogFactory.getLog(ObservedTaskExecutionListener.class);
|
||||
private static final Log log = LogFactory.getLog(ObservationTaskExecutionListener.class);
|
||||
|
||||
private final ObservationRegistry registry;
|
||||
|
||||
private final String projectName;
|
||||
|
||||
ObservedTaskExecutionListener(ObservationRegistry registry, String projectName) {
|
||||
ObservationTaskExecutionListener(ObservationRegistry registry, String projectName) {
|
||||
this.registry = registry;
|
||||
this.projectName = projectName;
|
||||
}
|
||||
@@ -26,12 +26,12 @@ import org.springframework.cloud.task.repository.TaskExecution;
|
||||
|
||||
import static io.micrometer.core.tck.TestObservationRegistryAssert.then;
|
||||
|
||||
class ObservedTaskExecutionListenerTests {
|
||||
class ObservationTaskExecutionListenerTests {
|
||||
|
||||
@Test
|
||||
void testSuccessfulObservation() {
|
||||
TestObservationRegistry registry = TestObservationRegistry.create();
|
||||
ObservedTaskExecutionListener listener = new ObservedTaskExecutionListener(registry, "my-project");
|
||||
ObservationTaskExecutionListener listener = new ObservationTaskExecutionListener(registry, "my-project");
|
||||
TaskExecution taskExecution = taskExecution();
|
||||
|
||||
listener.onTaskStartup(taskExecution);
|
||||
@@ -46,7 +46,7 @@ class ObservedTaskExecutionListenerTests {
|
||||
@Test
|
||||
void testErrorObservation() {
|
||||
TestObservationRegistry registry = TestObservationRegistry.create();
|
||||
ObservedTaskExecutionListener listener = new ObservedTaskExecutionListener(registry, "my-project");
|
||||
ObservationTaskExecutionListener listener = new ObservationTaskExecutionListener(registry, "my-project");
|
||||
TaskExecution taskExecution = taskExecution();
|
||||
|
||||
listener.onTaskStartup(taskExecution);
|
||||
Reference in New Issue
Block a user