review improvements

open-telemetry · Apr 11, 2024 · 5fb82c5 · 5fb82c5
1 parent cea2ac1
commit 5fb82c5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/...strumentation/spring/autoconfigure/instrumentation/web/RestTemplateBeanPostProcessor.java b/...strumentation/spring/autoconfigure/instrumentation/web/RestTemplateBeanPostProcessor.java
@@ -24,7 +24,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
       return bean;
     }
 
-    return RestTemplateInterceptor.addIfNotPresent(
+    return RestTemplateInstrumentation.addIfNotPresent(
         (RestTemplate) bean, openTelemetryProvider.getObject());
   }
 }
diff --git a/...entation/web/RestTemplateInterceptor.java → ...tion/web/RestTemplateInstrumentation.java b/...entation/web/RestTemplateInterceptor.java → ...tion/web/RestTemplateInstrumentation.java
@@ -12,9 +12,9 @@
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.web.client.RestTemplate;
 
-class RestTemplateInterceptor {
+class RestTemplateInstrumentation {
 
-  private RestTemplateInterceptor() {}
+  private RestTemplateInstrumentation() {}
 
   @CanIgnoreReturnValue
   static RestTemplate addIfNotPresent(RestTemplate restTemplate, OpenTelemetry openTelemetry) {

diff --git a/...n/spring/autoconfigure/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java b/...n/spring/autoconfigure/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java
@@ -41,6 +41,6 @@ static RestTemplateBeanPostProcessor otelRestTemplateBeanPostProcessor(
   static RestTemplateCustomizer otelRestTemplateCustomizer(
       ObjectProvider<OpenTelemetry> openTelemetryProvider) {
     return restTemplate ->
-        RestTemplateInterceptor.addIfNotPresent(restTemplate, openTelemetryProvider.getObject());
+        RestTemplateInstrumentation.addIfNotPresent(restTemplate, openTelemetryProvider.getObject());
   }
 }
diff --git a/...sts-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java b/...sts-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java
@@ -45,7 +45,6 @@
 import org.awaitility.core.ConditionEvaluationLogger;
 import org.awaitility.core.EvaluatedCondition;
 import org.awaitility.core.TimeoutEvent;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -81,11 +80,11 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class OtelSpringStarterSmokeTest {
 
-  public static final InMemoryMetricExporter METRIC_EXPORTER =
+  private static final InMemoryMetricExporter METRIC_EXPORTER =
       InMemoryMetricExporter.create(AggregationTemporality.DELTA);
   private static final InMemoryLogRecordExporter LOG_RECORD_EXPORTER =
       InMemoryLogRecordExporter.create();
-  public static final InMemorySpanExporter SPAN_EXPORTER = InMemorySpanExporter.create();
+  private static final InMemorySpanExporter SPAN_EXPORTER = InMemorySpanExporter.create();
   private static final Logger logger = LoggerFactory.getLogger(OtelSpringStarterSmokeTest.class);
 
   @Autowired private TestRestTemplate testRestTemplate;
@@ -168,12 +167,7 @@ AutoConfigurationCustomizerProvider propagatorCustomizer() {
     }
   }
 
-  @AfterEach
-  void tearDown() {
-    reset();
-  }
-
-  private static void reset() {
+  private static void resetExporters() {
     SPAN_EXPORTER.reset();
     METRIC_EXPORTER.reset();
     LOG_RECORD_EXPORTER.reset();
@@ -259,7 +253,7 @@ void shouldSendTelemetry() {
   @Test
   @org.junit.jupiter.api.Order(2)
   void restTemplateClient() {
-    reset(); // ignore the telemetry from application startup
+    resetExporters(); // ignore the telemetry from application startup
 
     testRestTemplate.getForObject(OtelSpringStarterSmokeTestController.REST_TEMPLATE, String.class);