suppress methods/fields according to comments

kevinfwl · kevinfwl · commit 9688aabeebdc · 2021-03-03T12:39:37.000-05:00
diff --git a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java
@@ -16,6 +16,8 @@
 import java.util.Scanner;
 import java.util.SortedSet;
 import java.util.TreeSet;
+
+import de.thetaphi.forbiddenapis.SuppressForbidden;
 import lombok.extern.slf4j.Slf4j;
 import org.datadog.jmxfetch.App;
 import org.datadog.jmxfetch.AppConfig;
@@ -138,6 +140,7 @@ private static String getReporter(final Config config) {
     return "statsd:" + host + ":" + port;
   }
 
+  @SuppressForbidden
   private static List<String> getInternalMetricFiles() {
     try (final InputStream metricConfigsStream =
         JMXFetch.class.getResourceAsStream("metricconfigs.txt")) {
@@ -152,12 +155,7 @@ private static List<String> getInternalMetricFiles() {
       while (scanner.hasNext()) {
         String config = scanner.next();
         integrationName.clear();
-
-        if (config.endsWith(".yaml")) {
-          integrationName.add(config.substring(0, config.length() - ".yaml".length()));
-        } else {
-          integrationName.add(config);
-        }
+        integrationName.add(config.replace(".yaml", ""));
 
         if (Config.get().isJmxFetchIntegrationEnabled(integrationName, false)) {
           final URL resource = JMXFetch.class.getResource("metricconfigs/" + config);
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java
@@ -11,27 +11,29 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.HttpClientDecorator;
-import datadog.trace.util.Strings;
+import de.thetaphi.forbiddenapis.SuppressForbidden;
+
 import java.net.URI;
 
 public class AwsSdkClientDecorator extends HttpClientDecorator<Request, Response> {
 
   static final CharSequence COMPONENT_NAME = UTF8BytesString.createConstant("java-aws-sdk");
 
+  @SuppressForbidden
   private final QualifiedClassNameCache cache =
       new QualifiedClassNameCache(
           new Function<Class<?>, CharSequence>() {
             @Override
             public String apply(Class<?> input) {
-              return Strings.replace(input.getSimpleName(), "Request", "");
+              return input.getSimpleName().replace("Request", "");
             }
           },
           Functions.SuffixJoin.of(
               ".",
               new Function<CharSequence, CharSequence>() {
                 @Override
                 public CharSequence apply(CharSequence serviceName) {
-                  return Strings.replace(String.valueOf(serviceName), "Amazon", "").trim();
+                  return String.valueOf(serviceName).replace( "Amazon", "").trim();
                 }
               }));
 
diff --git a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MessageExtractAdapter.java b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MessageExtractAdapter.java
@@ -8,11 +8,14 @@
 import java.util.Enumeration;
 import javax.jms.JMSException;
 import javax.jms.Message;
+
+import de.thetaphi.forbiddenapis.SuppressForbidden;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class MessageExtractAdapter implements AgentPropagation.ContextVisitor<Message> {
 
+  @SuppressForbidden
   private static final boolean USE_LEGACY_DASH_REPLACEMENT =
       Config.get().isJmsLegacyDashReplacement();
 
