# This is a combination of 2 commits.

# This is the 1st commit message:

Removing statements that log sensitive information and exceptions since they would be sent over the wire by the telemetry logging API

Changing statements so they use placeholders instead of adding strings

# This is the commit message #2:

linter applied

Update dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/common/ServiceSupport.java

Co-authored-by: Santiago M. Mola <[email protected]>

processing PR comments

Processing PR comments

This statement doesn't need the placeholder

Author: DDJavierSantos

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -640,7 +640,7 @@ private static synchronized void registerDeadlockDetectionEvent() {
   private static synchronized void initializeJmxSystemAccessProvider(
       final ClassLoader classLoader) {
     if (log.isDebugEnabled()) {
-      log.debug("Initializing JMX system access provider for " + classLoader.toString());
+      log.debug("Initializing JMX system access provider for {}", classLoader);
     }
     try {
       final Class<?> tracerInstallerClass =
@@ -1036,7 +1036,7 @@ private static boolean isFeatureEnabled(AgentFeature feature) {
     }
   }
 
-  /** @see datadog.trace.api.ProductActivationConfig#fromString(String) */
+  /** @see datadog.trace.api.ProductActivation#fromString(String) */
   private static boolean isAppSecFullyDisabled() {
     // must be kept in sync with logic from Config!
     final String featureEnabledSysprop = AgentFeature.APPSEC.systemProp;

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java

@@ -81,7 +81,7 @@ public static AgentJarIndex readIndex(JarFile agentJar) {
         return new AgentJarIndex(prefixes, ClassNameTrie.readFrom(in));
       }
     } catch (Throwable e) {
-      log.error("Unable to read " + AGENT_INDEX_FILE_NAME, e);
+      log.error("Unable to read {}", AGENT_INDEX_FILE_NAME, e);
       return null;
     }
   }

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java

@@ -868,7 +868,7 @@ private static void populateStandardProperties(
         try {
           builder.port(Integer.parseInt(portNumber));
         } catch (final NumberFormatException e) {
-          ExceptionLogger.LOGGER.debug("Error parsing portnumber property: " + portNumber, e);
+          ExceptionLogger.LOGGER.debug("Error parsing portnumber property: {}", portNumber, e);
         }
       }
 
@@ -877,7 +877,7 @@ private static void populateStandardProperties(
         try {
           builder.port(Integer.parseInt(portNumber));
         } catch (final NumberFormatException e) {
-          ExceptionLogger.LOGGER.debug("Error parsing portNumber property: " + portNumber, e);
+          ExceptionLogger.LOGGER.debug("Error parsing portNumber property: {}", portNumber, e);
         }
       }
     }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java

@@ -121,8 +121,10 @@ private void readExcludeFiles(String commaSeparatedFileNames) {
                   }
                 });
       } catch (IOException ex) {
-        log.warn("Error reading exclude file '{}' for Instrument-The-World: ", fileName, ex);
-      }
+        log.warn(
+            "Error reading exclude file '{}' for Instrument-The-World. Exception: {}",
+            fileName,
+            ex.getMessage());      }
     }
   }
 
@@ -328,7 +330,7 @@ private byte[] writeClassFile(ClassLoader loader, String classFilePath, ClassNod
     try {
       classNode.accept(writer);
     } catch (Throwable t) {
-      log.error("Cannot write classfile for class: {}", classFilePath, t);
+      log.error("Cannot write classfile for class: {} Exception: ", classFilePath, t.getMessage());
     }
     byte[] data = writer.toByteArray();
     dumpInstrumentedClassFile(classFilePath, data);

dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java

@@ -31,7 +31,7 @@ public class JMXFetch {
   public static final List<String> DEFAULT_CONFIGS =
       Collections.singletonList("jmxfetch-config.yaml");
 
-  private static final int DELAY_BETWEEN_RUN_ATTEMPTS = 5000;
+  private static final int SLEEP_AFTER_JMXFETCH_EXITS = 5000;
 
   public static void run(final StatsDClientManager statsDClientManager) {
     run(statsDClientManager, Config.get());
@@ -95,7 +95,6 @@ private static void run(final StatsDClientManager statsDClientManager, final Con
             // App should be run as daemon otherwise CLI apps would not exit once main method exits.
             .daemon(true)
             .embedded(true)
-            .exitWatcher(new TraceConfigExitWatcher())
             .confdDirectory(jmxFetchConfigDir)
             .yamlFileList(jmxFetchConfigs)
             .targetDirectInstances(true)
@@ -109,7 +108,7 @@ private static void run(final StatsDClientManager statsDClientManager, final Con
 
     if (config.isJmxFetchMultipleRuntimeServicesEnabled()) {
       ServiceNameCollectingTraceInterceptor serviceNameProvider =
-          ServiceNameCollectingTraceInterceptor.INSTANCE;
+          new ServiceNameCollectingTraceInterceptor();
       GlobalTracer.get().addTraceInterceptor(serviceNameProvider);
 
       configBuilder.serviceNameProvider(serviceNameProvider);
@@ -132,9 +131,10 @@ public void run() {
                   if (!appConfig.getExitWatcher().shouldExit()) {
                     try {
                       final int result = app.run();
-                      log.error("jmx collector exited with result: " + result);
+                      log.error("jmx collector exited with result: {}", result);
                     } catch (final Exception e) {
                       log.error("Exception in jmx collector thread", e);
+
                     }
                   }
                   // always wait before next attempt

dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java

@@ -159,7 +159,7 @@ public static synchronized void run(final boolean isStartingFirst, ClassLoader a
         log.warn(e.getMessage());
         log.debug("", e);
       } catch (final ConfigurationException e) {
-        log.warn("Failed to initialize profiling agent! " + e.getMessage());
+        log.warn("Failed to initialize profiling agent! {}", e.getMessage());
         log.debug("Failed to initialize profiling agent!", e);
       }
     }

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentCLI.java

@@ -128,7 +128,7 @@ private static void recursiveDependencySearch(Consumer<File> invoker, File origi
 
   private static void unzipJar(Consumer<File> invoker, File file) throws IOException {
     try (JarFile jar = new JarFile(file)) {
-      log.debug("Finding entries in file:" + file.getName());
+      log.debug("Finding entries in file: {}", file.getName());
 
       jar.stream()
           .forEach(

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/KnownTypesIndex.java

@@ -70,7 +70,7 @@ public static KnownTypesIndex readIndex() {
         }
         return new KnownTypesIndex(multipleIdTable, ClassNameTrie.readFrom(in));
       } catch (Throwable e) {
-        log.error("Problem reading " + KNOWN_TYPES_INDEX_NAME, e);
+        log.error("Problem reading {}", KNOWN_TYPES_INDEX_NAME, e);
       }
     }
     return buildIndex(); // fallback to runtime generation when testing

dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringConcatExample.java

@@ -11,7 +11,7 @@ public class StringConcatExample implements BiFunction<String, String, String> {
   public String apply(final String first, final String second) {
     LOGGER.debug("Before apply");
     final String result = first.concat(second);
-    LOGGER.debug("After apply " + result);
+    LOGGER.debug("After apply {}", result);
     return result;
   }
 }

dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusConstantsExample.java

@@ -11,7 +11,7 @@ public class StringPlusConstantsExample implements TriFunction<String, String, S
   public String apply(final String first, final String second, final String third) {
     LOGGER.debug("Before apply");
     final String result = first + " " + second + " " + third;
-    LOGGER.debug("After apply " + result);
+    LOGGER.debug("After apply {}", result);
     return result;
   }
 }

dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusExample.java

@@ -11,7 +11,7 @@ public class StringPlusExample implements TriFunction<String, String, String, St
   public String apply(final String first, final String second, final String third) {
     LOGGER.debug("Before apply");
     final String result = first + second + third;
-    LOGGER.debug("After apply " + result);
+    LOGGER.debug("After apply {}", result);
     return result;
   }
 }

dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusLoadWithTagsExample.java

@@ -11,7 +11,7 @@ public class StringPlusLoadWithTagsExample implements TriFunction<String, String
   public String apply(final String first, final String second, final String third) {
     LOGGER.debug("Before apply");
     final String result = first + " \u0002 " + second + " \u0001 " + third;
-    LOGGER.debug("After apply " + result);
+    LOGGER.debug("After apply {}", result);
     return result;
   }
 }

dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java

@@ -184,7 +184,7 @@ private void distributeSubConfigurations(
       try {
         listener.onNewSubconfig(newConfig.get(key), reconfiguration);
       } catch (Exception rte) {
-        log.warn("Error updating configuration of app sec module listening on key " + key, rte);
+        log.warn("Error updating configuration of app sec module listening on key {}", key, rte);
       }
     }
   }

dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java

@@ -72,7 +72,7 @@ public void onRender(final AgentSpan span, final HttpServletRequest req) {
           "jsp.requestURL", (new URI(req.getRequestURL().toString())).normalize().toString());
     } catch (final URISyntaxException uriSE) {
       LoggerFactory.getLogger(HttpJspPage.class)
-          .debug("Failed to get and normalize request URL: " + uriSE.getMessage());
+          .debug("Failed to get and normalize request URL: {}", uriSE.getMessage());
     }
   }
 }

dd-trace-core/src/main/java/datadog/trace/common/writer/TraceStructureWriter.java

@@ -64,7 +64,7 @@ public TraceStructureWriter(String outputFile, boolean debugLog) {
             argsDebugLog = true;
             break;
           default:
-            log.warn("Illegal TraceStructureWriter argument '" + args[i] + "'");
+            log.warn("Illegal TraceStructureWriter argument '{}'", args[i]);
             break;
         }
       }

dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java

@@ -85,7 +85,7 @@ public DDEvpProxyApi build() {
 
       final HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0);
 
-      log.debug("proxiedApiUrl: " + proxiedApiUrl);
+      log.debug("proxiedApiUrl: {}", proxiedApiUrl);
       return new DDEvpProxyApi(client, proxiedApiUrl, subdomain, retryPolicyFactory);
     }
   }

dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java

@@ -736,7 +736,7 @@ private void registerClassLoader(final ClassLoader classLoader) {
         addTraceInterceptor(interceptor);
       }
     } catch (final ServiceConfigurationError e) {
-      log.warn("Problem loading TraceInterceptor for classLoader: " + classLoader, e);
+      log.warn("Problem loading TraceInterceptor for classLoader: {}", classLoader, e);
     }
   }
 

dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/CorrelationIdInjectors.java

@@ -38,7 +38,7 @@ private static void enableInjector(String className, InternalTracer tracer) {
       Class<?> injectorClass = Class.forName(className);
       injectorClass.getConstructor(InternalTracer.class).newInstance(tracer);
     } catch (ReflectiveOperationException e) {
-      log.warn("Failed to enable injector " + className + ".", e);
+      log.warn("Failed to enable injector {}.", className, e);
     }
   }
 

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -799,7 +799,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
         tmpApiKey =
             new String(Files.readAllBytes(Paths.get(apiKeyFile)), StandardCharsets.UTF_8).trim();
       } catch (final IOException e) {
-        log.error("Cannot read API key from file {}, skipping", apiKeyFile, e);
+        log.error(
+            "Cannot read API key from file {}, skipping. Exception {}", apiKeyFile, e.getMessage());
       }
     }
     site = configProvider.getString(SITE, DEFAULT_SITE);

internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java

@@ -249,7 +249,7 @@ public BitSet getIntegerRange(final String key, final BitSet defaultValue) {
     try {
       return value == null ? defaultValue : ConfigConverter.parseIntegerRangeSet(value, key);
     } catch (final NumberFormatException e) {
-      log.warn("Invalid configuration for " + key, e);
+      log.warn("Invalid configuration for {}", key, e);
       return defaultValue;
     }
   }

remote-config/src/main/java/datadog/remoteconfig/state/ProductState.java

@@ -80,7 +80,7 @@ public boolean apply(
       try {
         callListenerCommit(hinter);
       } catch (Exception ex) {
-        log.error("Error committing changes for product" + product, ex);
+        log.error("Error committing changes for product {}", product, ex);
       }
     }