Merge pull request #14 from newrelic-experimental/elasticrestclient710

fix: Query Size handling by parts

Author: gsidhwani-nr

esrestclient-7.10/src/main/java/com/newrelic/instrumentation/labs/esrestclient/RestClient_Instrumentation.java

@@ -46,20 +46,30 @@ public Response performRequest(Request request) {
             }
 
             String sql = Utils.constructSql(endPoint, payload);
+            String queryToSend = sql;
 
+            if (null != sql) {
+
+                int sqlLength = sql.length();
+                String queryPart = "";
+
+                if (sqlLength > 4094) {
+
+                    queryPart = sql.substring(0, 4093);
+                    queryToSend = queryPart;
+                    // Utils.logPayload(sql);
+                    Utils.logSqlQueryAttributes(segment, sql.substring(4093), 255); // SQL Truncation
+                }
+
+            }
             segment.reportAsExternal(DatastoreParameters.product("Elasticsearch")
                     .collection(Utils.extractIndex(endPoint))
                     .operation(request.getMethod())
                     .noInstance()
                     .noDatabaseName()
-                    .slowQuery(sql, new ESQueryConverter())
+                    .slowQuery(queryToSend, new ESQueryConverter())
                     .build());
 
-            if (null != sql) {
-                // Utils.logPayload(sql);
-                Utils.logSqlQueryAttributes(segment, sql, 4091); // SQL Truncation
-            }
-
             return Weaver.callOriginal();
         } finally {
             segment.end();
@@ -102,21 +112,31 @@ public Cancellable performRequestAsync(Request request, ResponseListener respons
 
             // Construct SQL-like query for slow query logging
             String sql = Utils.constructSql(endPoint, payload);
+            String queryToSend = sql;
 
+            if (null != sql) {
+
+                int sqlLength = sql.length();
+                String queryPart = "";
+
+                if (sqlLength > 4094) {
+
+                    queryPart = sql.substring(0, 4093);
+                    queryToSend = queryPart;
+                    // Utils.logPayload(sql);
+                    Utils.logSqlQueryAttributes(segment, sql.substring(4093), 255); // SQL Truncation
+                }
+
+            }
             // Create datastore parameters for the request
             DatastoreParameters params = DatastoreParameters.product("Elasticsearch")
                     .collection(Utils.extractIndex(endPoint))
                     .operation(request.getMethod())
                     .noInstance()
                     .noDatabaseName()
-                    .slowQuery(sql, new ESQueryConverter())
+                    .slowQuery(queryToSend, new ESQueryConverter())
                     .build();
 
-            if (null != sql) {
-                // Utils.logPayload(sql);
-                Utils.logSqlQueryAttributes(segment, sql, 4091); // SQL Truncation
-            }
-
             // Store parameters for asynchronous processing
             int hash = responseListener.hashCode();
             NRHolder.putParams(hash, params);

esrestclient-7.10/src/main/java/com/newrelic/instrumentation/labs/esrestclient/Utils.java

@@ -68,9 +68,9 @@ public static void logSqlQueryAttributes(Segment segment, String sqlQuery, int s
 
         // Break the SQL query into parts if it exceeds the specified size
         int queryLength = sqlQuery.length();
-        int partNumber = 1;
+        int partNumber = 2;
         if (queryLength > size) {
-            for (int i = 0; (i < queryLength && partNumber < 200); i += size) {
+            for (int i = 0; (i < queryLength && partNumber < 64); i += size) {
                 int end = Math.min(i + size, queryLength);
                 String queryPart = sqlQuery.substring(i, end);
                 // Format the part number with leading zeros