From 0807d218b4904ad6525232b8de728580005c2238 Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Wed, 22 Jan 2025 11:29:40 +0100 Subject: [PATCH 1/2] Fix inferred spans logging config option docs (#3948) --- .../co/elastic/apm/agent/profiler/ProfilingConfiguration.java | 2 +- docs/configuration.asciidoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apm-agent-plugins/apm-profiling-plugin/src/main/java/co/elastic/apm/agent/profiler/ProfilingConfiguration.java b/apm-agent-plugins/apm-profiling-plugin/src/main/java/co/elastic/apm/agent/profiler/ProfilingConfiguration.java index a58b4e67ea..5af1432f43 100644 --- a/apm-agent-plugins/apm-profiling-plugin/src/main/java/co/elastic/apm/agent/profiler/ProfilingConfiguration.java +++ b/apm-agent-plugins/apm-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 index 17f6cf818e..b059b76835 100644 --- 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 <> @@ -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 From 6cc2a849994f3792a880376941cfa4491d695ff6 Mon Sep 17 00:00:00 2001 From: SylvainJuge <763082+SylvainJuge@users.noreply.github.com> Date: Thu, 23 Jan 2025 11:19:03 +0100 Subject: [PATCH 2/2] remove obsolete tomcat docker image (#3940) --- .../src/test/java/co/elastic/apm/servlet/TomcatIT.java | 1 - 1 file changed, 1 deletion(-) diff --git a/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/TomcatIT.java b/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/TomcatIT.java index d161d0b52c..f321dcc3f8 100644 --- a/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/TomcatIT.java +++ b/integration-tests/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 data() { return Arrays.asList(new Object[][]{ - {"8.5.0-jre8"}, {"9-jre11-slim"}, {"9.0.39-jdk14-openjdk-oracle"}, {"jdk8-adoptopenjdk-openj9"},