Skip to content

armgit / ax

Public Imported from GitHub
0

Agent Executor (AX) is Google's open agentic orchestration runtime

Go

slog: Initialize structured JSON logging for serve and axepp (#61)

anj-sceaa29cf5ecd
diff --git a/.gitignore b/.gitignore
index 74d57c1..5c71552 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,6 @@ examples/sandbox_agent/cloudbuild.yaml
tasklog/*
python/__pycache__
python/proto/__pycache__
-axepp
+/axepp
__pycache__/
examples/a2a_agent/output/*
diff --git a/cmd/ax/serve.go b/cmd/ax/serve.go
index 91ef964..cbe182c 100644
--- a/cmd/ax/serve.go
+++ b/cmd/ax/serve.go
@@ -16,7 +16,7 @@ package main
import (
"fmt"
- "log"
+ "log/slog"
"os"
"os/signal"
"syscall"
@@ -45,6 +45,9 @@ func init() {
func runServe(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
+ // Initialize structured logging (JSON to stdout)
+ slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, nil)))
+
cfg, err := newConfig(cmd, serveConfigFile)
if err != nil {
return err
@@ -70,10 +73,10 @@ func runServe(cmd *cobra.Command, args []string) error {
go func() {
<-sigChan
- log.Println("\nReceived interrupt, shutting down...")
+ slog.InfoContext(ctx, "Received interrupt, shutting down...")
srv.GracefulStop()
}()
- log.Printf("Starting AX server at %s...\n", cfg.Server.Address)
+ slog.InfoContext(ctx, "Starting AX server", slog.String("address", cfg.Server.Address))
if err := srv.Serve(cfg.Server.Address); err != nil {
return fmt.Errorf("error serving: %w", err)
}
diff --git a/cmd/axepp/main.go b/cmd/axepp/main.go
index ba19a63..207cd0f 100644
--- a/cmd/axepp/main.go
+++ b/cmd/axepp/main.go
@@ -25,7 +25,6 @@ import (
"crypto/x509"
"flag"
"fmt"
- "log"
"log/slog"
"net"
"os"
@@ -82,7 +81,7 @@ func runSession(ctx context.Context, sc ateapipb.ControlClient, sessionID string
destinationIP := resp.GetActor().GetAteomPodIp()
destrinationAddr := net.JoinHostPort(destinationIP, *axPort)
- log.Printf("Redirecting to address: %s", destrinationAddr)
+ slog.InfoContext(ctx, "Redirecting request to backend", slog.String("address", destrinationAddr))
var headers []*corepb.HeaderValueOption
@@ -174,7 +173,8 @@ func main() {
if *grpcServerCredBundle != "" {
bundleBytes, err := os.ReadFile(*grpcServerCredBundle)
if err != nil {
- log.Fatalf("Failed to read bundle: %v", err)
+ slog.Error("Failed to read bundle", slog.Any("error", err))
+ os.Exit(1)
}
certPool := x509.NewCertPool()
if ok := certPool.AppendCertsFromPEM(bundleBytes); ok {
@@ -185,7 +185,8 @@ func main() {
clientCreds := credentials.NewTLS(clientTLSConfig)
conn, err := grpc.NewClient(scAddress, grpc.WithTransportCredentials(clientCreds))
if err != nil {
- log.Fatalf("did not connect: %v", err)
+ slog.Error("did not connect to substrate control", slog.Any("error", err))
+ os.Exit(1)
}
defer conn.Close()
@@ -193,15 +194,17 @@ func main() {
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port))
if err != nil {
- log.Fatalf("Failed to listen on :%d: %v", *port, err)
+ slog.Error("Failed to listen", slog.Int("port", *port), slog.Any("error", err))
+ os.Exit(1)
}
s := grpc.NewServer()
as := &authServer{sc: sc}
authv3.RegisterAuthorizationServer(s, as)
- log.Printf("ax Envoy Authorization Service (ext_authz) listening on %v", lis.Addr())
+ slog.Info("ax Envoy Authorization Service (ext_authz) listening", slog.Any("address", lis.Addr()))
if err := s.Serve(lis); err != nil {
- log.Fatalf("Failed to serve gRPC server: %v", err)
+ slog.Error("Failed to serve gRPC server", slog.Any("error", err))
+ os.Exit(1)
}
}
diff --git a/internal/server/server.go b/internal/server/server.go
index 8a3bd4c..117861c 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -58,8 +58,9 @@ func New(c *controller.Controller) *Server {
// Exec executes a new agentic task with streaming responses.
func (s *Server) Exec(req *proto.ExecRequest, stream grpc.ServerStreamingServer[proto.ExecResponse]) error {
ctx := stream.Context()
- slog.InfoContext(ctx, "Executing...",
- slog.String("conversation_id", req.ConversationId))
+ slog.InfoContext(ctx, "Executing request",
+ slog.String("request", req.String()),
+ )
inFlight, cleanup := s.markInFlight(req.ConversationId)
if inFlight {
diff --git a/internal/server/server_harness.go b/internal/server/server_harness.go
index 2f43bab..de16db7 100644
--- a/internal/server/server_harness.go
+++ b/internal/server/server_harness.go
@@ -58,8 +58,9 @@ func New(c *controller2.Controller) *Server {
// Exec executes a new agentic task with streaming responses.
func (s *Server) Exec(req *proto.ExecRequest, stream grpc.ServerStreamingServer[proto.ExecResponse]) error {
ctx := stream.Context()
- slog.InfoContext(ctx, "Executing...",
- slog.String("conversation_id", req.ConversationId))
+ slog.InfoContext(ctx, "Executing request",
+ slog.String("request", req.String()),
+ )
inFlight, cleanup := s.markInFlight(req.ConversationId)
if inFlight {