[GIT]

Author: subhrashisdas

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

@@ -7,27 +7,25 @@
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+
 
-/**
- * Aspect to create spans for JGit method executions only if parent exists.
- */
 @Aspect
 public class JGitTelemetryAspect {
 
-    private static final Tracer tracer = GlobalOpenTelemetry.getTracer("org.eclipse.jgit");
+    private static final Tracer tracer = GlobalOpenTelemetry.getTracer("appsmith.org.eclipse.jgit");
 
     @Around("execution(* org.eclipse.jgit..*(..))")
-    public Object createSpanForMethod(ProceedingJoinPoint joinPoint) throws Throwable {
-        Span parent = Span.current();
-        // System.out.println("[JGitTelemetryAspect] Parent Span ID: " + parent.getSpanContext().getSpanId());
-        if (!parent.getSpanContext().isValid()) {
-            return joinPoint.proceed();
-        }
+    public Object traceAppsmithBusinessLogic(ProceedingJoinPoint joinPoint) throws Throwable {
+        String spanName = joinPoint.getSignature().getDeclaringTypeName() + "."
+                + joinPoint.getSignature().getName();
 
-        Span span = tracer.spanBuilder(joinPoint.getSignature().toShortString())
-                .startSpan();
+        Span span = tracer.spanBuilder(spanName).startSpan();
 
         try (Scope scope = span.makeCurrent()) {
+            System.out.println("🚀 " + span.getSpanContext().getTraceId() + " > "
+                    + span.getSpanContext().getSpanId() + " > " + spanName);
             return joinPoint.proceed();
         } catch (Throwable t) {
             span.recordException(t);