Merge remote-tracking branch 'elastic/main' into app-server-it-invest…

…igation
elastic · Jan 23, 2025 · b77696d · b77696d
2 parents 4c8be4f + 6cc2a84
commit b77696d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/...-profiling-plugin/src/main/java/co/elastic/apm/agent/profiler/ProfilingConfiguration.java b/...-profiling-plugin/src/main/java/co/elastic/apm/agent/profiler/ProfilingConfiguration.java
@@ -60,7 +60,7 @@ public class ProfilingConfiguration extends ConfigurationOptionProvider {
         .key("profiling_inferred_spans_logging_enabled")
         .configurationCategory(PROFILING_CATEGORY)
         .description("By default, async profiler prints warning messages about missing JVM symbols to standard output. \n" +
-            "Set this option to `true` to suppress such messages")
+                     "Set this option to `false` to suppress such messages")
         .dynamic(true)
         .tags("added[1.37.0]")
         .buildWithDefault(true);

diff --git a/docs/configuration.asciidoc b/docs/configuration.asciidoc
@@ -2818,7 +2818,7 @@ NOTE: This feature is not available on Windows and on OpenJ9
 ==== `profiling_inferred_spans_logging_enabled` (added[1.37.0])
 
 By default, async profiler prints warning messages about missing JVM symbols to standard output. 
-Set this option to `true` to suppress such messages
+Set this option to `false` to suppress such messages
 
 <<configuration-dynamic, image:./images/dynamic-config.svg[] >>
 
@@ -4857,7 +4857,7 @@ Example: `5ms`.
 # profiling_inferred_spans_enabled=false
 
 # By default, async profiler prints warning messages about missing JVM symbols to standard output. 
-# Set this option to `true` to suppress such messages
+# Set this option to `false` to suppress such messages
 #
 # This setting can be changed at runtime
 # Type: Boolean

diff --git a/...s/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/TomcatIT.java b/...s/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/TomcatIT.java
@@ -40,7 +40,6 @@ public TomcatIT(final String tomcatVersion) {
     @Parameterized.Parameters(name = "Tomcat {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(new Object[][]{
-            {"8.5.0-jre8"},
             {"9-jre11-slim"},
             {"9.0.39-jdk14-openjdk-oracle"},
             {"jdk8-adoptopenjdk-openj9"},