Merge pull request #324 from DataDog/ark/default_service_name

Remove unknown feature-flag and use generic names as fallback
This commit is contained in:
Andrew Kent 2018-05-22 14:19:50 -07:00 committed by GitHub
commit 176b071300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions

View File

@ -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(".", "_");
}
}