Skip to content

Remove unknown feature-flag and use generic names as fallback #324

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

Merged
realark merged 1 commit into from
May 22, 2018
Merged

Remove unknown feature-flag and use generic names as fallback #324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 2 additions & 14 deletions dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/JDBCMaps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,13 @@ public class JDBCMaps {
public static final Map<PreparedStatement, String> preparedStatements =
Collections.synchronizedMap(new WeakHashMap<PreparedStatement, String>());

private static final boolean RENAME_UNKNOWN =
Boolean.valueOf(getPropOrEnv("dd.trace.rename.unknown"));

public static final String DB_QUERY = RENAME_UNKNOWN ? "DB Query" : "Unknown Query";
public static final String DB_QUERY = "DB Query";

@Data
public static class DBInfo {
public static DBInfo DEFAULT =
new DBInfo("null", RENAME_UNKNOWN ? "database" : "unknown", null);
public static DBInfo DEFAULT = new DBInfo("null", "database", null);
private final String url;
private final String type;
private final String user;
}

private static String getPropOrEnv(final String name) {
return System.getProperty(name, System.getenv(propToEnvName(name)));
}

private static String propToEnvName(final String name) {
return name.toUpperCase().replace(".", "_");
}
}