add observation support

Author: alexcheng1982

chain-workflow/src/main/java/com/javaaidev/agenticpatterns/chainworkflow/ChainStepAgent.java

@@ -1,6 +1,7 @@
 package com.javaaidev.agenticpatterns.chainworkflow;
 
 import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
+import io.micrometer.observation.ObservationRegistry;
 import java.lang.reflect.Type;
 import java.util.Map;
 import org.jspecify.annotations.Nullable;
@@ -10,12 +11,15 @@
 public abstract class ChainStepAgent<Req, Res> extends TaskExecutionAgent<Req, Res> implements
     Ordered {
 
-  protected ChainStepAgent(ChatClient chatClient) {
-    super(chatClient);
+  protected ChainStepAgent(ChatClient chatClient,
+      @Nullable ObservationRegistry observationRegistry) {
+    super(chatClient, observationRegistry);
   }
 
-  protected ChainStepAgent(ChatClient chatClient, @Nullable Type responseType) {
-    super(chatClient, responseType);
+  protected ChainStepAgent(ChatClient chatClient,
+      @Nullable Type responseType,
+      @Nullable ObservationRegistry observationRegistry) {
+    super(chatClient, responseType, observationRegistry);
   }
 
   protected abstract Res call(Req request, Map<String, Object> context,

chain-workflow/src/main/java/com/javaaidev/agenticpatterns/chainworkflow/ChainWorkflowAgent.java

@@ -1,24 +1,29 @@
 package com.javaaidev.agenticpatterns.chainworkflow;
 
-import com.javaaidev.agenticpatterns.taskexecution.NoLLMTaskExecutionAgent;
+import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
+import io.micrometer.observation.ObservationRegistry;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 import org.jspecify.annotations.Nullable;
 import org.springframework.ai.chat.client.ChatClient;
 
 public class ChainWorkflowAgent<Request, Response> extends
-    NoLLMTaskExecutionAgent<Request, Response> {
+    TaskExecutionAgent<Request, Response> {
 
   private final List<ChainStepAgent<Request, Response>> stepAgents = new ArrayList<>();
 
-  protected ChainWorkflowAgent(ChatClient chatClient) {
-    super(chatClient);
+  protected ChainWorkflowAgent(
+      ChatClient chatClient,
+      @Nullable ObservationRegistry observationRegistry) {
+    super(chatClient, null, observationRegistry);
   }
 
-  public ChainWorkflowAgent(ChatClient chatClient,
-      @Nullable Type responseType) {
-    super(chatClient, responseType);
+  public ChainWorkflowAgent(
+      ChatClient chatClient,
+      @Nullable Type responseType,
+      @Nullable ObservationRegistry observationRegistry) {
+    super(chatClient, responseType, observationRegistry);
   }
 
   public void addStep(ChainStepAgent<Request, Response> stepAgent) {
@@ -27,8 +32,16 @@ public void addStep(ChainStepAgent<Request, Response> stepAgent) {
 
   @Override
   public Response call(@Nullable Request request) {
+    return instrumentedCall(request, this::doCall);
+  }
+
+  private Response doCall(@Nullable Request request) {
     var chain = new WorkflowChain<>(stepAgents);
     return chain.callNext(request, null);
   }
 
+  @Override
+  protected String getPromptTemplate() {
+    return "";
+  }
 }

evaluator-optimizer/src/main/java/com/javaaidev/agenticpatterns/evaluatoroptimizer/EvaluatorOptimizerAgent.java

@@ -1,9 +1,13 @@
 package com.javaaidev.agenticpatterns.evaluatoroptimizer;
 
+import com.javaaidev.agenticpatterns.taskexecution.NoLLMTaskExecutionAgent;
 import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
+import io.micrometer.observation.ObservationRegistry;
+import java.lang.reflect.Type;
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.ai.chat.client.ChatClient;
 
 /**
  * Evaluator-Optimizer Agent, refer to the <a
@@ -12,13 +16,42 @@
  * @param <Request>
  * @param <Response>
  */
-public abstract class EvaluatorOptimizerAgent<Request, Response> {
+public abstract class EvaluatorOptimizerAgent<Request, Response> extends
+    NoLLMTaskExecutionAgent<Request, Response> {
 
-  protected TaskExecutionAgent<Request, Response> initialResultAgent = buildInitialResultAgent();
+  protected ChatClient generationChatClient;
+  protected ChatClient evaluationChatClient;
+
+  protected EvaluatorOptimizerAgent(ChatClient generationChatClient,
+      ChatClient evaluationChatClient) {
+    this(generationChatClient, evaluationChatClient, null, null);
+  }
+
+  public EvaluatorOptimizerAgent(ChatClient generationChatClient,
+      ChatClient evaluationChatClient, @Nullable ObservationRegistry observationRegistry) {
+    this(generationChatClient, evaluationChatClient, null, observationRegistry);
+  }
+
+  protected EvaluatorOptimizerAgent(ChatClient generationChatClient,
+      ChatClient evaluationChatClient, @Nullable Type responseType,
+      @Nullable ObservationRegistry observationRegistry) {
+    super(responseType, observationRegistry);
+    this.generationChatClient = generationChatClient;
+    this.evaluationChatClient = evaluationChatClient;
+    initAgents();
+  }
+
+  private void initAgents() {
+    initialResultAgent = buildInitialResultAgent(generationChatClient, observationRegistry);
+    evaluationAgent = buildEvaluationAgent(evaluationChatClient, observationRegistry);
+    optimizationAgent = buildOptimizationAgent(generationChatClient, observationRegistry);
+  }
+
+  protected TaskExecutionAgent<Request, Response> initialResultAgent;
   @Nullable
-  protected TaskExecutionAgent<Response, Evaluation> evaluationAgent = buildEvaluationAgent();
+  protected TaskExecutionAgent<Response, Evaluation> evaluationAgent;
   @Nullable
-  protected TaskExecutionAgent<OptimizationInput<Response>, Response> optimizationAgent = buildOptimizationAgent();
+  protected TaskExecutionAgent<OptimizationInput<Response>, Response> optimizationAgent;
 
   private static final Logger LOGGER = LoggerFactory.getLogger(EvaluatorOptimizerAgent.class);
 
@@ -36,23 +69,31 @@ protected int getMaxIterations() {
    *
    * @return the agent, see {@linkplain TaskExecutionAgent}
    */
-  protected abstract TaskExecutionAgent<Request, Response> buildInitialResultAgent();
+  protected abstract TaskExecutionAgent<Request, Response> buildInitialResultAgent(
+      ChatClient chatClient, @Nullable ObservationRegistry observationRegistry);
 
   /**
    * Build the agent to evaluate the result
    *
    * @return the agent, see {@linkplain TaskExecutionAgent}
    */
-  protected abstract TaskExecutionAgent<Response, Evaluation> buildEvaluationAgent();
+  protected abstract TaskExecutionAgent<Response, Evaluation> buildEvaluationAgent(
+      ChatClient chatClient, @Nullable ObservationRegistry observationRegistry);
 
   /**
    * Build the agent to optimize the result
    *
    * @return the agent, see {@linkplain TaskExecutionAgent}
    */
-  protected abstract TaskExecutionAgent<OptimizationInput<Response>, Response> buildOptimizationAgent();
+  protected abstract TaskExecutionAgent<OptimizationInput<Response>, Response> buildOptimizationAgent(
+      ChatClient chatClient, @Nullable ObservationRegistry observationRegistry);
 
+  @Override
   public Response call(@Nullable Request request) {
+    return instrumentedCall(request, this::doCall);
+  }
+
+  private Response doCall(@Nullable Request request) {
     var initialResult = initialResultAgent.call(request);
     if (evaluationAgent == null || optimizationAgent == null) {
       return initialResult;

evaluator-optimizer/src/main/java/com/javaaidev/agenticpatterns/evaluatoroptimizer/PromptBasedEvaluatorOptimizerAgent.java

@@ -1,7 +1,7 @@
 package com.javaaidev.agenticpatterns.evaluatoroptimizer;
 
-import com.javaaidev.agenticpatterns.core.TypeResolver;
 import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
+import io.micrometer.observation.ObservationRegistry;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
@@ -17,18 +17,18 @@
 public abstract class PromptBasedEvaluatorOptimizerAgent<Request, Response> extends
     EvaluatorOptimizerAgent<Request, Response> {
 
-  @Nullable
-  protected Type responseType = null;
 
-  private void tryResolveType() {
-    responseType = TypeResolver.resolveType(this.getClass(),
-        PromptBasedEvaluatorOptimizerAgent.class,
-        1);
+  protected PromptBasedEvaluatorOptimizerAgent(ChatClient generationChatClient,
+      ChatClient evaluationChatClient) {
+    this(generationChatClient, evaluationChatClient, null, null);
   }
 
-  protected abstract ChatClient getGenerationChatClient();
-
-  protected abstract ChatClient getEvaluationChatClient();
+  protected PromptBasedEvaluatorOptimizerAgent(ChatClient generationChatClient,
+      ChatClient evaluationChatClient,
+      @Nullable Type responseType,
+      @Nullable ObservationRegistry observationRegistry) {
+    super(generationChatClient, evaluationChatClient, responseType, observationRegistry);
+  }
 
   protected abstract String getInitialResultPromptTemplate();
 
@@ -39,8 +39,9 @@ private void tryResolveType() {
 
   public class GenerateInitialResultAgent extends TaskExecutionAgent<Request, Response> {
 
-    public GenerateInitialResultAgent(@Nullable Type responseType) {
-      super(getGenerationChatClient(), responseType);
+    public GenerateInitialResultAgent(ChatClient chatClient, @Nullable Type responseType,
+        @Nullable ObservationRegistry observationRegistry) {
+      super(chatClient, responseType, observationRegistry);
     }
 
     @Override
@@ -55,9 +56,9 @@ protected String getPromptTemplate() {
   }
 
   @Override
-  protected TaskExecutionAgent<Request, Response> buildInitialResultAgent() {
-    tryResolveType();
-    return new GenerateInitialResultAgent(responseType);
+  protected TaskExecutionAgent<Request, Response> buildInitialResultAgent(ChatClient chatClient,
+      @Nullable ObservationRegistry observationRegistry) {
+    return new GenerateInitialResultAgent(chatClient, responseType, observationRegistry);
   }
 
   protected abstract String getEvaluationPromptTemplate();
@@ -69,9 +70,9 @@ protected TaskExecutionAgent<Request, Response> buildInitialResultAgent() {
 
   public class EvaluateAgent extends TaskExecutionAgent<Response, Evaluation> {
 
-
-    protected EvaluateAgent() {
-      super(getEvaluationChatClient());
+    protected EvaluateAgent(ChatClient chatClient,
+        @Nullable ObservationRegistry observationRegistry) {
+      super(chatClient, Evaluation.class, observationRegistry);
     }
 
     @Override
@@ -86,8 +87,9 @@ protected String getPromptTemplate() {
   }
 
   @Override
-  protected TaskExecutionAgent<Response, Evaluation> buildEvaluationAgent() {
-    return new EvaluateAgent();
+  protected TaskExecutionAgent<Response, Evaluation> buildEvaluationAgent(ChatClient chatClient,
+      @Nullable ObservationRegistry observationRegistry) {
+    return new EvaluateAgent(chatClient, observationRegistry);
   }
 
   protected abstract String getOptimizationPromptTemplate();
@@ -99,8 +101,9 @@ protected TaskExecutionAgent<Response, Evaluation> buildEvaluationAgent() {
 
   public class OptimizeAgent extends TaskExecutionAgent<OptimizationInput<Response>, Response> {
 
-    public OptimizeAgent(@Nullable Type responseType) {
-      super(getGenerationChatClient(), responseType);
+    public OptimizeAgent(ChatClient chatClient, @Nullable Type responseType,
+        @Nullable ObservationRegistry observationRegistry) {
+      super(chatClient, responseType, observationRegistry);
     }
 
     @Override
@@ -116,8 +119,8 @@ protected String getPromptTemplate() {
   }
 
   @Override
-  protected TaskExecutionAgent<OptimizationInput<Response>, Response> buildOptimizationAgent() {
-    tryResolveType();
-    return new OptimizeAgent(responseType);
+  protected TaskExecutionAgent<OptimizationInput<Response>, Response> buildOptimizationAgent(
+      ChatClient chatClient, @Nullable ObservationRegistry observationRegistry) {
+    return new OptimizeAgent(chatClient, responseType, observationRegistry);
   }
 }

examples/src/main/java/com/javaaidev/agenticpatterns/examples/chainworkflow/ArticleWritingAgent.java

@@ -7,6 +7,7 @@
 import com.javaaidev.agenticpatterns.examples.chainworkflow.ArticleWritingAgent.ArticleWritingRequest;
 import com.javaaidev.agenticpatterns.examples.chainworkflow.ArticleWritingAgent.ArticleWritingResponse;
 import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
+import io.micrometer.observation.ObservationRegistry;
 import java.util.List;
 import java.util.Map;
 import org.jspecify.annotations.Nullable;
@@ -18,10 +19,12 @@ public class ArticleWritingAgent extends
   private final ArticleGenerationAgent articleGenerationAgent;
   private final ArticleImprovementChainAgent articleImprovementChainAgent;
 
-  protected ArticleWritingAgent(ChatClient chatClient) {
-    super(chatClient, ArticleWritingResponse.class);
-    articleGenerationAgent = new ArticleGenerationAgent(chatClient);
-    articleImprovementChainAgent = new ArticleImprovementChainAgent(chatClient);
+  protected ArticleWritingAgent(ChatClient chatClient,
+      @Nullable ObservationRegistry observationRegistry) {
+    super(chatClient, ArticleWritingResponse.class, observationRegistry);
+    articleGenerationAgent = new ArticleGenerationAgent(chatClient, observationRegistry);
+    articleImprovementChainAgent = new ArticleImprovementChainAgent(chatClient,
+        observationRegistry);
   }
 
   @Override
@@ -56,8 +59,9 @@ private record ArticleImprovementResponse(String article) {
   private static class ArticleGenerationAgent extends
       TaskExecutionAgent<ArticleWritingRequest, ArticleWritingResponse> {
 
-    protected ArticleGenerationAgent(ChatClient chatClient) {
-      super(chatClient, ArticleWritingResponse.class);
+    protected ArticleGenerationAgent(ChatClient chatClient,
+        @Nullable ObservationRegistry observationRegistry) {
+      super(chatClient, ArticleWritingResponse.class, observationRegistry);
     }
 
     @Override
@@ -79,8 +83,10 @@ protected String getPromptTemplate() {
   private static class ArticleImprovementChainAgent extends
       ChainWorkflowAgent<ArticleImprovementRequest, ArticleImprovementResponse> {
 
-    protected ArticleImprovementChainAgent(ChatClient chatClient) {
-      super(chatClient, ArticleImprovementResponse.class);
+    protected ArticleImprovementChainAgent(
+        ChatClient chatClient,
+        @Nullable ObservationRegistry observationRegistry) {
+      super(chatClient, ArticleImprovementResponse.class, observationRegistry);
       initStepAgents();
     }
 
@@ -106,7 +112,8 @@ private void initStepAgents() {
               """
       );
       for (int i = 0; i < instructions.size(); i++) {
-        addStep(new ArticleImprovementAgent(chatClient, instructions.get(i), i));
+        addStep(
+            new ArticleImprovementAgent(chatClient, observationRegistry, instructions.get(i), i));
       }
     }
   }
@@ -118,8 +125,9 @@ private static class ArticleImprovementAgent extends
     private final String instruction;
     private final int order;
 
-    protected ArticleImprovementAgent(ChatClient chatClient, String instruction, int order) {
-      super(chatClient, ArticleImprovementResponse.class);
+    protected ArticleImprovementAgent(ChatClient chatClient,
+        @Nullable ObservationRegistry observationRegistry, String instruction, int order) {
+      super(chatClient, ArticleImprovementResponse.class, observationRegistry);
       this.instruction = instruction;
       this.order = order;
     }

examples/src/main/java/com/javaaidev/agenticpatterns/examples/chainworkflow/ArticleWritingConfiguration.java

@@ -1,5 +1,6 @@
 package com.javaaidev.agenticpatterns.examples.chainworkflow;
 
+import io.micrometer.observation.ObservationRegistry;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.advisor.SimpleLoggerAdvisor;
 import org.springframework.context.annotation.Bean;
@@ -10,7 +11,9 @@ public class ArticleWritingConfiguration {
 
   @Bean
   public ArticleWritingAgent articleWritingAgent(ChatClient.Builder chatClientBuilder,
-      SimpleLoggerAdvisor simpleLoggerAdvisor) {
-    return new ArticleWritingAgent(chatClientBuilder.defaultAdvisors(simpleLoggerAdvisor).build());
+      SimpleLoggerAdvisor simpleLoggerAdvisor,
+      ObservationRegistry observationRegistry) {
+    return new ArticleWritingAgent(chatClientBuilder.defaultAdvisors(simpleLoggerAdvisor).build(),
+        observationRegistry);
   }
 }