Make better use of config options

Author: manuel-alvarez-alvarez

dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletInstrumentation.java

@@ -57,22 +57,25 @@ public void methodAdvice(MethodTransformer transformer) {
         AppSecDispatcherServletInstrumentation.class.getName() + "$AppSecHandlerMappingAdvice");
   }
 
+  @Override
+  public boolean isEnabled() {
+    return super.isEnabled() && Config.get().isApiSecurityEndpointCollectionEnabled();
+  }
+
   public static class AppSecHandlerMappingAdvice {
 
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void afterRefresh(@Advice.Argument(0) final ApplicationContext springCtx) {
-      if (Config.get().isApiSecurityEndpointCollectionEnabled()) {
-        final RequestMappingHandlerMapping handler =
-            springCtx.getBean(RequestMappingHandlerMapping.class);
-        if (handler == null) {
-          return;
-        }
-        final Map<RequestMappingInfo, HandlerMethod> mappings = handler.getHandlerMethods();
-        if (mappings == null || mappings.isEmpty()) {
-          return;
-        }
-        EndpointCollector.get().supplier(new RequestMappingInfoIterator(mappings));
+      final RequestMappingHandlerMapping handler =
+          springCtx.getBean(RequestMappingHandlerMapping.class);
+      if (handler == null) {
+        return;
+      }
+      final Map<RequestMappingInfo, HandlerMethod> mappings = handler.getHandlerMethods();
+      if (mappings == null || mappings.isEmpty()) {
+        return;
       }
+      EndpointCollector.get().supplier(new RequestMappingInfoIterator(mappings));
     }
   }
 }

dd-java-agent/instrumentation/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletWithPathPatternsInstrumentation.java

@@ -57,22 +57,25 @@ public void methodAdvice(MethodTransformer transformer) {
             + "$AppSecHandlerMappingAdvice");
   }
 
+  @Override
+  public boolean isEnabled() {
+    return super.isEnabled() && Config.get().isApiSecurityEndpointCollectionEnabled();
+  }
+
   public static class AppSecHandlerMappingAdvice {
 
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void afterRefresh(@Advice.Argument(0) final ApplicationContext springCtx) {
-      if (Config.get().isApiSecurityEndpointCollectionEnabled()) {
-        final RequestMappingHandlerMapping handler =
-            springCtx.getBean(RequestMappingHandlerMapping.class);
-        if (handler == null) {
-          return;
-        }
-        final Map<RequestMappingInfo, HandlerMethod> mappings = handler.getHandlerMethods();
-        if (mappings == null || mappings.isEmpty()) {
-          return;
-        }
-        EndpointCollector.get().supplier(new RequestMappingInfoWithPathPatternsIterator(mappings));
+      final RequestMappingHandlerMapping handler =
+          springCtx.getBean(RequestMappingHandlerMapping.class);
+      if (handler == null) {
+        return;
+      }
+      final Map<RequestMappingInfo, HandlerMethod> mappings = handler.getHandlerMethods();
+      if (mappings == null || mappings.isEmpty()) {
+        return;
       }
+      EndpointCollector.get().supplier(new RequestMappingInfoWithPathPatternsIterator(mappings));
     }
   }
 }

telemetry/src/main/java/datadog/telemetry/TelemetryRequest.java

@@ -235,8 +235,10 @@ public void writeEndpoints() {
       log.debug("Writing endpoints");
       requestBody.beginEndpoints();
       boolean first = false;
-      while (eventSource.hasEndpoint()) {
+      int remaining = Config.get().getApiSecurityEndpointCollectionMessageLimit();
+      while (eventSource.hasEndpoint() && remaining > 0) {
         final Endpoint event = eventSource.nextEndpoint();
+        remaining--;
         if (event.isFirst()) {
           first = true;
         }