(ranger) 01/01: Merge branch 'master' into RANGER-3923

[madhan]

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit 67dd53692e150844a447f1b2b5b31a4b0b88bf51
Merge: 6e3c22bd3 04c93b3df
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Wed Nov 29 00:41:15 2023 -0800

    Merge branch 'master' into RANGER-3923

 .../ranger/plugin/service/RangerBasePlugin.java    |  6 ++
 .../ranger/plugin/util/PerfDataRecorder.java       | 77 +++++++++++++++++-----
 .../plugin/util/RangerPerfCollectorTracer.java     |  2 +-
 .../ranger/plugin/util/RangerPerfTracer.java       |  5 +-
 4 files changed, 72 insertions(+), 18 deletions(-)

diff --cc 
agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java
index 7d5767235,040b340e3..6edcb12c0
--- 
a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java
+++ 
b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java
@@@ -48,25 -48,21 +48,28 @@@ public class RangerPerfTracer 
        }
  
        public static RangerPerfTracer getPerfTracer(Logger logger, String tag) 
{
 -              String data = "";
 -              String realTag = "";
 -
 -              if (tag != null) {
 -                      int indexOfTagEndMarker = StringUtils.indexOf(tag, 
tagEndMarker);
 -                      if (indexOfTagEndMarker != -1) {
 -                              realTag = StringUtils.substring(tag, 0, 
indexOfTagEndMarker);
 -                              if (!PerfDataRecorder.collectStatistics()) {
 -                                      data = StringUtils.substring(tag, 
indexOfTagEndMarker);
 +              if (logger.isDebugEnabled()) {
 +                      String data    = "";
 +                      String realTag = "";
 +
 +                      if (tag != null) {
 +                              int indexOfTagEndMarker = 
StringUtils.indexOf(tag, tagEndMarker);
 +
 +                              if (indexOfTagEndMarker != -1) {
 +                                      realTag = StringUtils.substring(tag, 0, 
indexOfTagEndMarker);
-                                       data    = StringUtils.substring(tag, 
indexOfTagEndMarker);
++
++                                      if 
(!PerfDataRecorder.collectStatistics()) {
++                                              data = 
StringUtils.substring(tag, indexOfTagEndMarker);
++                                      }
 +                              } else {
 +                                      realTag = tag;
                                }
 -                      } else {
 -                              realTag = tag;
                        }
 +
 +                      return RangerPerfTracerFactory.getPerfTracer(logger, 
realTag, data);
 +              } else {
 +                      return null;
                }
 -              return RangerPerfTracerFactory.getPerfTracer(logger, realTag, 
data);
        }
  
        public static RangerPerfTracer getPerfTracer(Logger logger, String tag, 
String data) {