Update PSM Lib

pentops · May 23, 2024 · de980b0 · de980b0
1 parent 5c950b8
commit de980b0
Show file tree

Hide file tree

Showing 18 changed files with 1,302 additions and 902 deletions.
diff --git a/cmd/server/server.go b/cmd/server/server.go
@@ -12,11 +12,10 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	_ "github.com/lib/pq"
 	"github.com/pentops/dante/dynamictype"
+	"github.com/pentops/dante/gen/o5/dante/v1/dante_spb"
+	"github.com/pentops/dante/gen/o5/dante/v1/dante_tpb"
 	"github.com/pentops/dante/service"
-	"github.com/pentops/log.go/grpc_log"
 	"github.com/pentops/log.go/log"
-	"github.com/pentops/o5-go/dante/v1/dante_spb"
-	"github.com/pentops/o5-go/dante/v1/dante_tpb"
 	"github.com/pressly/goose"
 
 	"golang.org/x/sync/errgroup"
@@ -140,7 +139,17 @@ func runServe(ctx context.Context) error {
 		return err
 	}
 
-	deadletterService, err := service.NewDeadletterServiceService(db, types, sqsClient, cfg.SlackUrl)
+	statemachine, err := service.NewDeadmessagePSM()
+	if err != nil {
+		return err
+	}
+
+	deadletterService, err := service.NewDeadletterServiceService(db, statemachine, sqsClient)
+	if err != nil {
+		return err
+	}
+
+	deadletterWorker, err := service.NewDeadLetterWorker(db, types, statemachine, cfg.SlackUrl)
 	if err != nil {
 		return err
 	}
@@ -149,13 +158,11 @@ func runServe(ctx context.Context) error {
 
 	eg, ctx := errgroup.WithContext(ctx)
 	eg.Go(func() error {
-		grpcServer := grpc.NewServer(grpc.ChainUnaryInterceptor(
-			grpc_log.UnaryServerInterceptor(log.DefaultContext, log.DefaultTrace, log.DefaultLogger),
-		))
+		grpcServer := grpc.NewServer(grpc.ChainUnaryInterceptor(service.GRPCMiddleware()...))
 
 		reflection.Register(grpcServer)
 
-		dante_tpb.RegisterDeadMessageTopicServer(grpcServer, deadletterService)
+		dante_tpb.RegisterDeadMessageTopicServer(grpcServer, deadletterWorker)
 		dante_spb.RegisterDeadMessageCommandServiceServer(grpcServer, deadletterService)
 		dante_spb.RegisterDeadMessageQueryServiceServer(grpcServer, deadletterService)
 

diff --git a/dynamictype/registry_test.go b/dynamictype/registry_test.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/pentops/o5-go/dante/v1/dante_pb"
-	"github.com/pentops/o5-go/dante/v1/dante_tpb"
+	"github.com/pentops/dante/gen/o5/dante/v1/dante_pb"
+	"github.com/pentops/dante/gen/o5/dante/v1/dante_tpb"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/descriptorpb"

diff --git a/ext/db/20231206153030_init.sql b/ext/db/20231206153030_init.sql
@@ -10,7 +10,8 @@ CREATE TABLE deadmessage_event (
     id UUID PRIMARY KEY,
     message_id UUID REFERENCES deadmessage(message_id) NOT NULL,
     timestamp TIMESTAMPTZ NOT NULL DEFAULT now(),
-    actor jsonb NOT NULL,
+    sequence int NOT NULL,
+    cause jsonb NOT NULL,
 	  data jsonb NOT NULL
 );