Skip to content

Commit

Permalink
NH-94685: name change for span stacktrace stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
cleverchuk committed Dec 24, 2024
1 parent ea4a933 commit 02e9da6
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class SpanStacktraceFilter implements Predicate<ReadableSpan> {
filterAttributes.add("db.system");
Set<String> configuredFilterAttributes =
ConfigManager.getConfigOptional(
ConfigProperty.AGENT_SPAN_STACK_TRACE_FILTERS, filterAttributes);
ConfigProperty.AGENT_SPAN_STACKTRACE_FILTERS, filterAttributes);
filterAttributes.addAll(configuredFilterAttributes);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.util.Set;
import java.util.stream.Collectors;

public final class StackTraceFilterParser implements ConfigParser<String, Set<String>> {
public final class StacktraceFilterParser implements ConfigParser<String, Set<String>> {
private static final Gson gson = new GsonBuilder().create();

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion smoke-tests/src/test/java/com/solarwinds/agents/Agent.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> additionalJvmArgs) {
Expand Down

0 comments on commit 02e9da6

Please sign in to comment.