Changes in ApolloAuditScope for managing last active span.

Author: Arsh255

apollo-audit/apollo-audit-impl/src/main/java/com/ctrip/framework/apollo/audit/context/ApolloAuditScope.java

@@ -18,11 +18,13 @@
 
 public class ApolloAuditScope implements AutoCloseable {
 
-  private ApolloAuditSpan activeSpan;
+  private final ApolloAuditSpan activeSpan;
+  private final ApolloAuditScope previousScope;
   private String lastSpanId;
 
-  public ApolloAuditScope(ApolloAuditSpan activeSpan) {
+  public ApolloAuditScope(ApolloAuditSpan activeSpan, ApolloAuditScope previousScope) {
     this.activeSpan = activeSpan;
+    this.previousScope = previousScope;
     this.lastSpanId = null;
   }
 
@@ -32,7 +34,9 @@ public ApolloAuditSpan activeSpan() {
 
   @Override
   public void close() {
-    // Closing span becomes parent-scope's last span, managed externally
+    if (previousScope != null) {
+      previousScope.setLastSpanId(activeSpan.spanId());
+    }
   }
 
   public String getLastSpanId() {
@@ -42,4 +46,8 @@ public String getLastSpanId() {
   public void setLastSpanId(String lastSpanId) {
     this.lastSpanId = lastSpanId;
   }
+
+  public ApolloAuditScope getPreviousScope() {
+    return previousScope;
+  }
 }

apollo-audit/apollo-audit-impl/src/main/java/com/ctrip/framework/apollo/audit/context/ApolloAuditScopeManager.java

@@ -20,31 +20,29 @@
 
 public class ApolloAuditScopeManager {
 
-  private ApolloAuditScope scope;
+  private ApolloAuditScope currentScope;
 
-  public ApolloAuditScopeManager() {}
+  public ApolloAuditScopeManager() {
+  }
 
   public ApolloAuditScope activate(ApolloAuditSpan span) {
-    // Directly manage the scope, no need to reference the scope's previous parent
-    this.scope = new ApolloAuditScope(span);
-    return this.scope;
+    this.currentScope = new ApolloAuditScope(span, currentScope);
+    return currentScope;
   }
 
-  public void deactivate() {
-    if (this.scope != null) {
-      this.scope.close();  // Close the scope, but no need for reference to parent scope
+  public void deactivate() throws IOException {
+    if (currentScope != null) {
+      ApolloAuditScope previousScope = currentScope.getPreviousScope();
+      currentScope.close();
+      currentScope = previousScope;  // Restore previous scope after closing
     }
   }
 
   public ApolloAuditSpan activeSpan() {
-    return getScope() == null ? null : getScope().activeSpan();
+    return currentScope == null ? null : currentScope.activeSpan();
   }
 
   public ApolloAuditScope getScope() {
-    return scope;
-  }
-
-  public void setScope(ApolloAuditScope scope) {
-    this.scope = scope;
+    return currentScope;
   }
 }

apollo-audit/apollo-audit-impl/src/test/java/com/ctrip/framework/apollo/audit/component/ApolloAuditLogApiJpaImplTest.java

@@ -16,6 +16,7 @@
  */
 package com.ctrip.framework.apollo.audit.component;
 
+import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -104,10 +105,13 @@ public void testAppendAuditLog() {
     activeSpan.setOpName(opName);
     activeSpan.setContext(new ApolloAuditSpanContext(traceId, spanId));
 
-    // Create the ApolloAuditScope using the active span
-    ApolloAuditScope scope = new ApolloAuditScope(activeSpan);
+    // Create an ApolloAuditScopeManager to manage scopes
+    ApolloAuditScopeManager scopeManager = new ApolloAuditScopeManager();
 
-    // Mock the behavior of the tracer to return the scope when startActiveSpan is called
+    // Activate a new audit scope
+    ApolloAuditScope scope = scopeManager.activate(activeSpan);
+
+    // Mock the behavior of the tracer to return a scope when startActiveSpan is called
     Mockito.when(tracer.startActiveSpan(Mockito.eq(create), Mockito.eq(opName), Mockito.eq(description)))
             .thenReturn(scope);
 
@@ -119,14 +123,16 @@ public void testAppendAuditLog() {
     Mockito.verify(tracer, Mockito.times(1))
             .startActiveSpan(Mockito.eq(create), Mockito.eq(opName), Mockito.eq(description));
 
-    // Verify that the scope returned has the correct values
+    // Verify that the returned scope has the correct values
+    assertTrue(returnedScope!=null);
     assertEquals(create, returnedScope.activeSpan().getOpType());
     assertEquals(opName, returnedScope.activeSpan().getOpName());
     assertEquals(traceId, returnedScope.activeSpan().traceId());
     assertEquals(spanId, returnedScope.activeSpan().spanId());
   }
 
 
+
   @Test
   public void testAppendDataInfluenceCaseCreateOrUpdate() {
     {

apollo-audit/apollo-audit-impl/src/test/java/com/ctrip/framework/apollo/audit/component/ApolloAuditScopeManagerTest.java

@@ -16,6 +16,7 @@
  */
 package com.ctrip.framework.apollo.audit.component;
 
+import static org.junit.Assert.assertNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
@@ -40,16 +41,18 @@ public class ApolloAuditScopeManagerTest {
   public void testActivate() {
     ApolloAuditSpan mockSpan = mock(ApolloAuditSpan.class);
 
-    // Create an ApolloAuditScope directly using the mock span
-    ApolloAuditScope activeScope = new ApolloAuditScope(mockSpan);
-
-    // Call the activate method of ApolloAuditScopeManager (manager)
+    // Create an ApolloAuditScopeManager instance
     ApolloAuditScopeManager manager = new ApolloAuditScopeManager();
-    manager.setScope(activeScope);  // Set the scope manually since there's no manager dependency
 
-    // Verify the scope has been set
+    // Activate the span using the manager, which should create a new scope
+    ApolloAuditScope activeScope = manager.activate(mockSpan);
+
+    // Verify that the active scope is correctly set in the manager
     assertEquals(activeScope, manager.getScope());
     assertEquals(mockSpan, activeScope.activeSpan());
+
+    // Verify that the previous scope is null (since it's the first activation)
+    assertNull(activeScope.getPreviousScope());
   }