From e91a27706885f5c222b918e4bcd2d20c8f0d9c85 Mon Sep 17 00:00:00 2001 From: xi xia Date: Wed, 1 Dec 2021 09:28:42 -0800 Subject: [PATCH] refactor query parameter use --- .../newrelic/agent/sql/DefaultSlowQueryListener.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/newrelic-agent/src/main/java/com/newrelic/agent/sql/DefaultSlowQueryListener.java b/newrelic-agent/src/main/java/com/newrelic/agent/sql/DefaultSlowQueryListener.java index cc5f44f9f4..7e56688e68 100644 --- a/newrelic-agent/src/main/java/com/newrelic/agent/sql/DefaultSlowQueryListener.java +++ b/newrelic-agent/src/main/java/com/newrelic/agent/sql/DefaultSlowQueryListener.java @@ -57,7 +57,7 @@ public void noticeTracer(Tracer tracer, SlowQueryDatastoreParameters slow // This allows transaction traces to show slow queries directly in the trace details //todo: obfuscatedQueryString isn't correct, it could be Raw or Obfuscated. The queryConverter // has conditional obfuscation, respecting recrod_sql setting. - tracer.setAgentAttribute(SqlTracer.SQL_OBFUSCATED_PARAMETER_NAME, obfuscatedQueryString); + tracer.setAgentAttribute(SqlTracer.SQL_OBFUSCATED_PARAMETER_NAME, query); DatastoreConfig datastoreConfig = ServiceFactory.getConfigService().getDefaultAgentConfig().getDatastoreConfig(); boolean allUnknown = slowQueryDatastoreParameters.getHost() == null @@ -77,16 +77,16 @@ public void noticeTracer(Tracer tracer, SlowQueryDatastoreParameters slow slowQueryInfoCache = new BoundedConcurrentCache<>(MAX_SQL_TRACERS); } - SlowQueryInfo existingInfo = slowQueryInfoCache.get(obfuscatedQueryString); + SlowQueryInfo existingInfo = slowQueryInfoCache.get(query); if (existingInfo != null) { // Aggregate tracers by SQL. existingInfo.aggregate(tracer); - slowQueryInfoCache.putReplace(obfuscatedQueryString, existingInfo); + slowQueryInfoCache.putReplace(query, existingInfo); } else { - SlowQueryInfo sqlInfo = new SlowQueryInfo(null, tracer, queryString, obfuscatedQueryString, + SlowQueryInfo sqlInfo = new SlowQueryInfo(null, tracer, query, query, tracer.getTransactionActivity().getTransaction().getAgentConfig().getSqlTraceConfig()); sqlInfo.aggregate(tracer); - slowQueryInfoCache.putIfAbsent(obfuscatedQueryString, sqlInfo); + slowQueryInfoCache.putIfAbsent(query, sqlInfo); } } }