use same fallback logic as agent

open-telemetry · May 16, 2024 · 645dd40 · 645dd40
1 parent 9fce7e5
commit 645dd40
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 35 deletions.
diff --git a/...ry/instrumentation/spring/autoconfigure/instrumentation/jdbc/DataSourcePostProcessor.java b/...ry/instrumentation/spring/autoconfigure/instrumentation/jdbc/DataSourcePostProcessor.java
@@ -37,8 +37,8 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
       return JdbcTelemetry.builder(openTelemetryProvider.getObject())
           .setStatementSanitizationEnabled(
               InstrumentationConfigUtil.isStatementSanitizationEnabled(
-                  configPropertiesProvider.getObject(), "otel.instrumentation.jdbc.statement-sanitizer.enabled")
-            )
+                  configPropertiesProvider.getObject(),
+                  "otel.instrumentation.jdbc.statement-sanitizer.enabled"))
           .build()
           .wrap(dataSource);
     }

diff --git a/...ring/autoconfigure/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java b/...ring/autoconfigure/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java
@@ -33,10 +33,9 @@ public MongoClientSettingsBuilderCustomizer customizer(
         builder.addCommandListener(
             MongoTelemetry.builder(openTelemetry)
                 .setStatementSanitizationEnabled(
-                    InstrumentationConfigUtil.isStatementSanitizationEnabled(config,
-                        "otel.instrumentation.mongo.statement-sanitizer.enabled"))
+                    InstrumentationConfigUtil.isStatementSanitizationEnabled(
+                        config, "otel.instrumentation.mongo.statement-sanitizer.enabled"))
                 .build()
                 .newCommandListener());
   }
-
 }
diff --git a/...mentation/spring/autoconfigure/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java b/...mentation/spring/autoconfigure/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java
@@ -34,8 +34,10 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
       ConnectionFactory connectionFactory = (ConnectionFactory) bean;
       return R2dbcTelemetry.builder(openTelemetryProvider.getObject())
           // there is no instrumentation-specific property, so we use the common one
-          .setStatementSanitizationEnabled(InstrumentationConfigUtil.isStatementSanitizationEnabled(configPropertiesProvider
-                            .getObject(),"otel.instrumentation.common.db-statement-sanitizer.enabled"))
+          .setStatementSanitizationEnabled(
+              InstrumentationConfigUtil.isStatementSanitizationEnabled(
+                  configPropertiesProvider.getObject(),
+                  "otel.instrumentation.common.db-statement-sanitizer.enabled"))
           .build()
           .wrapConnectionFactory(connectionFactory, getConnectionFactoryOptions(connectionFactory));
     }

diff --git a/...pentelemetry/instrumentation/spring/autoconfigure/internal/InstrumentationConfigUtil.java b/...pentelemetry/instrumentation/spring/autoconfigure/internal/InstrumentationConfigUtil.java
@@ -1,10 +1,14 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
 
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 public class InstrumentationConfigUtil {
-  private InstrumentationConfigUtil() {
-  }
+  private InstrumentationConfigUtil() {}
 
   public static boolean isStatementSanitizationEnabled(ConfigProperties config, String key) {
     return config.getBoolean(

diff --git a/...st/java/io/opentelemetry/spring/smoketest/GraalVmNativeMongodbSpringStarterSmokeTest.java b/...st/java/io/opentelemetry/spring/smoketest/GraalVmNativeMongodbSpringStarterSmokeTest.java
@@ -24,6 +24,6 @@
     classes = {OtelSpringStarterSmokeTestApplication.class, SpringSmokeOtelConfiguration.class},
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @EnabledInNativeImage // see JvmMongodbSpringStarterSmokeTest for the JVM test
-@EnabledInGithubActions
+@RequiresDockerComposeEnvVariable
 public class GraalVmNativeMongodbSpringStarterSmokeTest
     extends AbstractMongodbSpringStarterSmokeTest {}
diff --git a/...n/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java b/...n/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java
@@ -65,7 +65,8 @@ static class TestConfiguration {
     public void loadData() {
       jdbcTemplate
           .getObject()
-          .execute("create table customer (id bigint not null, name varchar not null, primary key (id))");
+          .execute(
+              "create table customer (id bigint not null, name varchar not null, primary key (id))");
     }
 
     @Bean

diff --git a/...smoke-testing/src/main/java/io/opentelemetry/spring/smoketest/EnabledInGithubActions.java b/...smoke-testing/src/main/java/io/opentelemetry/spring/smoketest/EnabledInGithubActions.java