From 02e9da6550d80e3b2019d280b8372163fde87c47 Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Tue, 24 Dec 2024 13:15:35 -0500 Subject: [PATCH] NH-94685: name change for span stacktrace stuff --- build.gradle | 2 +- .../opentelemetry/extensions/LambdaConfigurationLoader.java | 2 +- .../opentelemetry/extensions/SpanStacktraceFilter.java | 2 +- ...tackTraceFilterParser.java => StacktraceFilterParser.java} | 2 +- ...eFilterParserTest.java => StacktraceFilterParserTest.java} | 4 ++-- .../extensions/initialize/ConfigurationLoader.java | 4 ++-- smoke-tests/src/test/java/com/solarwinds/agents/Agent.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/{StackTraceFilterParser.java => StacktraceFilterParser.java} (96%) rename custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/{StackTraceFilterParserTest.java => StacktraceFilterParserTest.java} (94%) diff --git a/build.gradle b/build.gradle index 723440ab..8c132905 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ subprojects { opentelemetryJavaagent: property('otel.agent.version'), bytebuddy : "1.15.10", guava : "30.1-jre", - joboe : "10.0.16", + joboe : "10.0.17", agent : swoVersion, // the custom distro agent version autoservice : "1.0.1", caffeine : "2.9.3", diff --git a/custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoader.java b/custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoader.java index b2e5e29b..104a94ef 100644 --- a/custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoader.java +++ b/custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoader.java @@ -64,7 +64,7 @@ public class LambdaConfigurationLoader { ConfigProperty.AGENT_TRIGGER_TRACE_ENABLED.setParser(ModeStringToBooleanParser.INSTANCE); ConfigProperty.AGENT_TRANSACTION_NAMING_SCHEMES.setParser(new TransactionNamingSchemesParser()); ConfigProperty.AGENT_SQL_TAG_DATABASES.setParser(new SqlTagDatabasesParser()); - ConfigProperty.AGENT_SPAN_STACK_TRACE_FILTERS.setParser(new StackTraceFilterParser()); + ConfigProperty.AGENT_SPAN_STACKTRACE_FILTERS.setParser(new StacktraceFilterParser()); } public static void load() throws InvalidConfigException { diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilter.java b/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilter.java index f701cf6c..98b0c480 100644 --- a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilter.java +++ b/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilter.java @@ -32,7 +32,7 @@ public class SpanStacktraceFilter implements Predicate { filterAttributes.add("db.system"); Set configuredFilterAttributes = ConfigManager.getConfigOptional( - ConfigProperty.AGENT_SPAN_STACK_TRACE_FILTERS, filterAttributes); + ConfigProperty.AGENT_SPAN_STACKTRACE_FILTERS, filterAttributes); filterAttributes.addAll(configuredFilterAttributes); } diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/StackTraceFilterParser.java b/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/StacktraceFilterParser.java similarity index 96% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/StackTraceFilterParser.java rename to custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/StacktraceFilterParser.java index 3e5e59cf..e0ef4738 100644 --- a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/StackTraceFilterParser.java +++ b/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/StacktraceFilterParser.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.stream.Collectors; -public final class StackTraceFilterParser implements ConfigParser> { +public final class StacktraceFilterParser implements ConfigParser> { private static final Gson gson = new GsonBuilder().create(); @Override diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/StackTraceFilterParserTest.java b/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/StacktraceFilterParserTest.java similarity index 94% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/StackTraceFilterParserTest.java rename to custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/StacktraceFilterParserTest.java index fb906471..21b3c036 100644 --- a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/StackTraceFilterParserTest.java +++ b/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/StacktraceFilterParserTest.java @@ -27,9 +27,9 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -class StackTraceFilterParserTest { +class StacktraceFilterParserTest { - @InjectMocks private StackTraceFilterParser tested; + @InjectMocks private StacktraceFilterParser tested; @Test void returnListOfStringGivenCommaSeparatedString() throws InvalidConfigException { diff --git a/custom/src/main/java/com/solarwinds/opentelemetry/extensions/initialize/ConfigurationLoader.java b/custom/src/main/java/com/solarwinds/opentelemetry/extensions/initialize/ConfigurationLoader.java index fcd1e8ab..a2bbfbb6 100644 --- a/custom/src/main/java/com/solarwinds/opentelemetry/extensions/initialize/ConfigurationLoader.java +++ b/custom/src/main/java/com/solarwinds/opentelemetry/extensions/initialize/ConfigurationLoader.java @@ -42,7 +42,7 @@ import com.solarwinds.opentelemetry.extensions.NamingScheme; import com.solarwinds.opentelemetry.extensions.RangeValidationParser; import com.solarwinds.opentelemetry.extensions.SqlTagDatabasesParser; -import com.solarwinds.opentelemetry.extensions.StackTraceFilterParser; +import com.solarwinds.opentelemetry.extensions.StacktraceFilterParser; import com.solarwinds.opentelemetry.extensions.TracingModeParser; import com.solarwinds.opentelemetry.extensions.TransactionNameManager; import com.solarwinds.opentelemetry.extensions.TransactionNamingScheme; @@ -102,7 +102,7 @@ public class ConfigurationLoader { ConfigProperty.PROFILER.setParser(ProfilerSettingParser.INSTANCE); ConfigProperty.AGENT_TRANSACTION_NAMING_SCHEMES.setParser(new TransactionNamingSchemesParser()); ConfigProperty.AGENT_SQL_TAG_DATABASES.setParser(new SqlTagDatabasesParser()); - ConfigProperty.AGENT_SPAN_STACK_TRACE_FILTERS.setParser(new StackTraceFilterParser()); + ConfigProperty.AGENT_SPAN_STACKTRACE_FILTERS.setParser(new StacktraceFilterParser()); } public static void load() throws InvalidConfigException { diff --git a/smoke-tests/src/test/java/com/solarwinds/agents/Agent.java b/smoke-tests/src/test/java/com/solarwinds/agents/Agent.java index 79abfba9..02e849e1 100644 --- a/smoke-tests/src/test/java/com/solarwinds/agents/Agent.java +++ b/smoke-tests/src/test/java/com/solarwinds/agents/Agent.java @@ -42,7 +42,7 @@ public Agent(String name, String description) { public Agent(String name, String description, String url) { this(name, description, url, Arrays.asList("-Dio.opentelemetry.context.enableStrictContext=true", "-Dotel.java.experimental.span-stacktrace.min.duration=0ms", - "-Dsw.apm.span.stack.trace.filters=thread.id,os.description,http.request.method")); + "-Dsw.apm.span.stacktrace.filters=thread.id,os.description,http.request.method")); } public Agent(String name, String description, String url, List additionalJvmArgs) {