cleanup

Author: zeitlinger

gcp-auth-extension/src/main/java/io/opentelemetry/contrib/gcp/auth/GcpAuthCustomizerProvider.java

@@ -37,7 +37,7 @@
 @AutoService(DeclarativeConfigurationCustomizerProvider.class)
 public class GcpAuthCustomizerProvider implements DeclarativeConfigurationCustomizerProvider {
 
-  static final String SIGNAL_TARGET_WARNING_FIX_SUGGESTION =
+  static final String SIGNAL_TARGET_WARNING_YAML_FIX_SUGGESTION =
       String.format(
           "You may safely ignore this warning if it is intentional, otherwise please configure the '%s' by setting %s in the configuration file.",
           ConfigurableOption.GOOGLE_OTEL_AUTH_TARGET_SIGNALS.getUserReadableName(),
@@ -48,10 +48,8 @@ public class GcpAuthCustomizerProvider implements DeclarativeConfigurationCustom
   public void customize(DeclarativeConfigurationCustomizer customizer) {
     customizer.addModelCustomizer(
         model -> {
-          ConfigProperties configProperties = ConfigPropertiesUtil.resolveModel(model);
-          GoogleCredentials credentials =
-              GcpAuthAutoConfigurationCustomizerProvider.getCredentials();
-          customize(model, credentials, configProperties);
+          customize(model, GcpAuthAutoConfigurationCustomizerProvider.getCredentials(),
+              ConfigPropertiesUtil.resolveModel(model));
 
           return model;
         });
@@ -78,7 +76,7 @@ private static void customizeMeter(
     }
 
     if (shouldConfigureExporter(
-        SIGNAL_TYPE_METRICS, SIGNAL_TARGET_WARNING_FIX_SUGGESTION, configProperties)) {
+        SIGNAL_TYPE_METRICS, SIGNAL_TARGET_WARNING_YAML_FIX_SUGGESTION, configProperties)) {
       for (MetricReaderModel reader : meterProvider.getReaders()) {
         if (reader.getPeriodic() != null) {
           addAuth(meterModelHeaders(reader.getPeriodic().getExporter()), headerMap);
@@ -114,7 +112,7 @@ private static void customizeTracer(
     }
 
     if (shouldConfigureExporter(
-        SIGNAL_TYPE_TRACES, SIGNAL_TARGET_WARNING_FIX_SUGGESTION, configProperties)) {
+        SIGNAL_TYPE_TRACES, SIGNAL_TARGET_WARNING_YAML_FIX_SUGGESTION, configProperties)) {
       for (SpanProcessorModel processor : tracerProvider.getProcessors()) {
         BatchSpanProcessorModel batch = processor.getBatch();
         if (batch != null) {

gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthCustomizerProviderTest.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.contrib.gcp.auth;
 
-import static io.opentelemetry.contrib.gcp.auth.GcpAuthCustomizerProvider.SIGNAL_TARGET_WARNING_FIX_SUGGESTION;
+import static io.opentelemetry.contrib.gcp.auth.GcpAuthCustomizerProvider.SIGNAL_TARGET_WARNING_YAML_FIX_SUGGESTION;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -75,7 +75,7 @@ void declarativeConfig() throws IOException {
 
   @Test
   void fixSuggestion() {
-    assertThat(SIGNAL_TARGET_WARNING_FIX_SUGGESTION)
+    assertThat(SIGNAL_TARGET_WARNING_YAML_FIX_SUGGESTION)
         .isEqualTo(
             "You may safely ignore this warning if it is intentional, "
                 + "otherwise please configure the 'Target Signals for Google Authentication Extension' "