[GIT]

Author: subhrashisdas

org.eclipse.jgit.telemetry/src/main/java/org/eclipse/jgit/telemetry/TelemetryAspect.java

@@ -14,58 +14,75 @@ public class TelemetryAspect {
 
     private static final Tracer tracer = GlobalOpenTelemetry.getTracer("appsmith");
     private static final long DEFAULT_THRESHOLD_NS = 1_000_000L;
-    private static final long thresholdNanoseconds = Long.parseLong(
-        System.getenv().getOrDefault("TELEMETRY_THRESHOLD_NANOSECONDS", String.valueOf(DEFAULT_THRESHOLD_NS))
-    );
+    private static final long thresholdNanoseconds = loadThreshold();
 
     @Pointcut("execution(* org.eclipse.jgit..*(..))")
-    public void allAppsmithServerMethods() {}
-
-    @Pointcut("execution(* org.eclipse.jgit.telemetry..*(..))")
-    public void excludedSupportPackages() {}
-
-    @Pointcut("allAppsmithServerMethods() && !excludedSupportPackages()")
-    public void monitoredAppsmithMethods() {}
-
-    @Around("monitoredAppsmithMethods()")
-    public Object traceAppsmithBusinessLogic(ProceedingJoinPoint joinPoint) throws Throwable {
-        long startTime = System.nanoTime();
+    public void monitoredMethods() {}
 
+    @Around("monitoredMethods()")
+    public Object trace(ProceedingJoinPoint joinPoint) throws Throwable {
+        long start = System.nanoTime();
         Object result;
-        Throwable caughtException = null;
+        Throwable error = null;
+
         try {
             result = joinPoint.proceed();
         } catch (Throwable t) {
-            caughtException = t;
+            error = t;
             throw t;
         } finally {
-            long duration = System.nanoTime() - startTime;
+            long duration = System.nanoTime() - start;
             if (duration > thresholdNanoseconds) {
-                String spanName = getSpanName(joinPoint);
+                recordTrace(joinPoint, duration, error);
+            }
+        }
 
-                Span span = tracer.spanBuilder(spanName).startSpan();
+        return result;
+    }
 
-                try (Scope scope = span.makeCurrent()) {
-                    span.setAttribute("execution.time.ns", duration);
-                    if (caughtException != null) {
-                        span.recordException(caughtException);
-                    }
-                    logSpan(span, spanName, duration);
-                } finally {
-                    span.end();
-                }
+    private void recordTrace(ProceedingJoinPoint joinPoint, long duration, Throwable error) {
+        String spanName = getSpanName(joinPoint);
+        Span span = tracer.spanBuilder(spanName).startSpan();
+
+        try (Scope scope = span.makeCurrent()) {
+            span.setAttribute("execution.time.ns", duration);
+            if (error != null) {
+                span.recordException(error);
             }
+            log(span, spanName, duration);
+        } finally {
+            span.end();
         }
+    }
 
-        return result;
+    private void log(Span span, String spanName, long duration) {
+        System.out.println("🚀 " +
+                span.getSpanContext().getTraceId() + " > " +
+                span.getSpanContext().getSpanId() + " > " +
+                spanName + " took: " + duration + " ns");
     }
 
     private String getSpanName(ProceedingJoinPoint joinPoint) {
-        return joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName();
+        return joinPoint.getSignature().getDeclaringTypeName() + "." +
+               joinPoint.getSignature().getName();
     }
 
-    private void logSpan(Span span, String spanName, long duration) {
-        System.out.println("🚀 " + span.getSpanContext().getTraceId() + " > "
-                + span.getSpanContext().getSpanId() + " > " + spanName + " took: " + duration + " ns");
+    private static long loadThreshold() {
+        String raw = System.getenv("TELEMETRY_THRESHOLD_NANOSECONDS");
+
+        if (raw == null) {
+            return DEFAULT_THRESHOLD_NS;
+        }
+
+        raw = raw.trim();
+        if (raw.isEmpty()) {
+            return DEFAULT_THRESHOLD_NS;
+        }
+
+        try {
+            return Long.parseLong(raw);
+        } catch (NumberFormatException e) {
+            return DEFAULT_THRESHOLD_NS;
+        }
     }
 }