Skip to content

fix: auto-fixes from motley-crew ghost review on bdu/register-mappings #11069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jbachorik wants to merge 4 commits into from
Closed

fix: auto-fixes from motley-crew ghost review on bdu/register-mappings #11069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
246a1af
fix: ghost-fleet auto-fixes on bdu/register-mappings
jbachorik Apr 9, 2026
161c92b
style: apply spotless formatting
jbachorik Apr 9, 2026
c5e684b
refactor: separate experimental content check from block entry guard
jbachorik Apr 9, 2026
4f73d81
revert: restore original experimental block guard
jbachorik Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...gent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,7 @@ public CrashLog parse(String uuid, String crashLog) {
final Matcher m = REGISTER_TO_MEMORY_MAPPING_PARSER.matcher(line);
if (m.lookingAt()) {
currentRegisterToMemoryMapping = m.group(1);
registerToMemoryMapping.put(
currentRegisterToMemoryMapping, line.substring(line.indexOf('=') + 1));
registerToMemoryMapping.put(currentRegisterToMemoryMapping, line.substring(m.end()));
} else if (!currentRegisterToMemoryMapping.isEmpty()) {
registerToMemoryMapping.computeIfPresent(
currentRegisterToMemoryMapping, (key, value) -> value + "\n" + line);
Expand Down
7 changes: 4 additions & 3 deletions ...va-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/RedactUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public final class RedactUtils {
// "Compiled method (c2) ... com.company.Foo::methodName (N bytes)" (PRODUCT — dots)
// "Compiled method (c2) ... com/company/Foo::methodName (N bytes)" (debug — slashes)
private static final Pattern NMETHOD_CLASS =
Pattern.compile("([A-Za-z][A-Za-z0-9$]*(?:[./][A-Za-z][A-Za-z0-9$]*)+)::");
Pattern.compile("([A-Za-z$_][A-Za-z0-9$_]*(?:[./][A-Za-z$_][A-Za-z0-9$_]*)+)::");

// Library path in two formats produced by os::print_location():
// <offset 0x...> in /path/to/lib.so at 0x... (no dladdr symbol)
Expand All @@ -62,11 +62,11 @@ public final class RedactUtils {
// This specifically identifies the inline string value of a java.lang.Class 'name' field
private static final Pattern DOTTED_CLASS_OOP_REF =
Pattern.compile(
"\"([A-Za-z][A-Za-z0-9$]*(?:\\.[A-Za-z][A-Za-z0-9$]*)*)\"(\\{0x[0-9a-fA-F]+\\})");
"\"([A-Za-z$_][A-Za-z0-9$_]*(?:\\.[A-Za-z$_][A-Za-z0-9$_]*)*)\"(\\{0x[0-9a-fA-F]+\\})");

// is an oop: com.company.Class
private static final Pattern IS_AN_OOP =
Pattern.compile("(is an oop: )([A-Za-z][A-Za-z0-9$]*(?:\\.[A-Za-z][A-Za-z0-9$]*)*)");
Pattern.compile("(is an oop: )([A-Za-z$_][A-Za-z0-9$_]*(?:\\.[A-Za-z$_][A-Za-z0-9$_]*)*)");

// Hex-dump bytes in "points into unknown readable memory:" lines.
// Two formats produced by os::print_location():
Expand Down Expand Up @@ -215,6 +215,7 @@ static String redactNmethodClass(String line) {
* java.lang.Class} oop) use {@link #redactRegisterToMemoryMapping} which detects the oop type
* automatically.
*/
// @VisibleForTesting — no production callers; used directly in unit tests
static String redactDottedClassOopRef(String line) {
return redactStringOopRef(line, false);
}
Expand Down
2 changes: 2 additions & 0 deletions dd-trace-api/src/main/java/datadog/trace/api/config/CrashTrackingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* documentation for details.
*/
public final class CrashTrackingConfig {
private CrashTrackingConfig() {}

public static final String CRASH_TRACKING_ENABLED = "crashtracking.enabled";
public static final boolean CRASH_TRACKING_ENABLED_DEFAULT = true;

Expand Down
Loading