Skip to content

Commit e827295

Browse files
committed
./gradlew spotlessApply
1 parent acd7c8c commit e827295

File tree

7 files changed

+8
-10
lines changed

7 files changed

+8
-10
lines changed

instrumentation/spring/spring-boot-autoconfigure-4.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import io.opentelemetry.api.OpenTelemetry;
1111
import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
1212
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
13-
import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
14-
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
1513
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
1614
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
1715
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1816
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
17+
import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
18+
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
1919
import org.springframework.context.annotation.Bean;
2020
import org.springframework.context.annotation.Configuration;
2121

instrumentation/spring/spring-boot-autoconfigure-4.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ class R2dbcInstrumentingPostProcessor implements BeanPostProcessor {
3030

3131
@Override
3232
public Object postProcessAfterInitialization(Object bean, String beanName) {
33-
if (bean instanceof ConnectionFactory connectionFactory && !ScopedProxyUtils.isScopedTarget(beanName)) {
33+
if (bean instanceof ConnectionFactory connectionFactory
34+
&& !ScopedProxyUtils.isScopedTarget(beanName)) {
3435
return R2dbcTelemetry.builder(openTelemetryProvider.getObject())
3536
.setStatementSanitizationEnabled(
3637
InstrumentationConfigUtil.isStatementSanitizationEnabled(

instrumentation/spring/spring-boot-autoconfigure-4.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
1010
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
1111
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
12+
import jakarta.annotation.PreDestroy;
1213
import java.util.Comparator;
1314
import java.util.Optional;
14-
import jakarta.annotation.PreDestroy;
1515
import org.slf4j.Logger;
1616
import org.slf4j.LoggerFactory;
1717
import org.springframework.boot.context.event.ApplicationReadyEvent;

instrumentation/spring/spring-boot-autoconfigure-4.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsBeanRegistrationExcludeFilter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics;
77

8-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.Java17RuntimeMetricsProvider;
98
import org.springframework.beans.factory.aot.BeanRegistrationExcludeFilter;
109
import org.springframework.beans.factory.support.RegisteredBean;
1110

instrumentation/spring/spring-boot-autoconfigure-4.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import org.springframework.beans.factory.ObjectProvider;
1212
import org.springframework.boot.autoconfigure.AutoConfiguration;
1313
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
14-
import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration;
1514
import org.springframework.boot.restclient.RestClientCustomizer;
15+
import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration;
1616
import org.springframework.context.annotation.Bean;
1717
import org.springframework.context.annotation.Configuration;
1818
import org.springframework.web.client.RestClient;

instrumentation/spring/spring-boot-autoconfigure-4.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestTemplateBeanPostProcessor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
3131
}
3232

3333
return RestTemplateInstrumentation.addIfNotPresent(
34-
restTemplate,
35-
openTelemetryProvider.getObject(),
36-
configPropertiesProvider.getObject());
34+
restTemplate, openTelemetryProvider.getObject(), configPropertiesProvider.getObject());
3735
}
3836
}

instrumentation/spring/spring-boot-autoconfigure-4.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/SpringConfigProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public Duration getDuration(String name) {
224224
.getDuration(name);
225225
}
226226

227-
@SuppressWarnings({ "unchecked", "StatementSwitchToExpressionSwitch" })
227+
@SuppressWarnings({"unchecked", "StatementSwitchToExpressionSwitch"})
228228
@Override
229229
public Map<String, String> getMap(String name) {
230230
Map<String, String> otelSdkMap = otelSdkProperties.getMap(name);

0 commit comments

Comments
 (0)