Prime for andasy.io

.dockerignore

@@ -7,4 +7,4 @@ Dockerfile
 *.yml
 var
 hermer-cluster*
-hermes.secret
+*.secret

.gitignore

@@ -5,4 +5,5 @@ hermes.json
 var
 hermes.db*
 hermes-cluster*
-hermes.secret
+*.secret
+video.md

Dockerfile

@@ -27,4 +27,4 @@ ADD etc/litefs.yml /etc/litefs.yml
 # Ensure our mount & data directories exists before mounting with LiteFS.
 RUN mkdir -p /var/lib/litefs /mnt/litefs
 
-ENTRYPOINT ["litefs", "mount"]
+ENTRYPOINT ["hermes", "run"]

api/api.go

@@ -42,7 +42,7 @@ func (s Server) Handler() http.Handler {
 	r.Use(mw.Tracing(s.provider))
 	r.Use(mw.WithRequestID)
 	r.Use(mw.Idempotency)
-	r.Use(mw.Caching(s.cache))
+	// r.Use(mw.Caching(s.cache))
 	r.Use(middleware.Recoverer)
 
 	r.Get("/", func(w http.ResponseWriter, r *http.Request) {

cmd/hermes/main.go

@@ -33,6 +33,11 @@ func run(ctx context.Context, args []string) (err error) {
 		return runServe(ctx, args)
 	case "migrate":
 		return runMigrate(ctx, args)
+	case "run":
+		if err := runMigrate(ctx, args); err != nil {
+			return err
+		}
+		return runServe(ctx, args)
 	case "version":
 		fmt.Printf("version: %s, date: %s\n", build.Info().Version, build.Info().Date)
 		return
@@ -55,6 +60,7 @@ Usage:
 Available Commands:
 	server	  start the hermes server
 	migrate	  run database migrations
+	run 	  makes migrations and starts the server
 	version	  print the version of hermes
 `[1:])
 }

cmd/hermes/migrate.go

@@ -10,7 +10,7 @@ import (
 	"go.opentelemetry.io/otel"
 )
 
-func runMigrate(ctx context.Context, args []string) (err error) {
+func runMigrate(ctx context.Context, _ []string) (err error) {
 	config := newConfig()
 
 	provider, err := tracing.Provider(

cmd/hermes/serve.go

@@ -13,16 +13,14 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/rugwirobaker/hermes"
 	"github.com/rugwirobaker/hermes/api"
-	"github.com/rugwirobaker/hermes/fly"
-	"github.com/rugwirobaker/hermes/observ"
 	"github.com/rugwirobaker/hermes/sqlite"
 	"github.com/rugwirobaker/hermes/tracing"
 	"go.opentelemetry.io/otel"
 )
 
 var (
-	cleanupInterval = 2 * time.Minute
-	retention       = 2 * time.Hour
+// cleanupInterval = 2 * time.Minute
+// retention       = 2 * time.Hour
 )
 
 type Server struct {
@@ -48,7 +46,7 @@ func (s *Server) Stop(ctx context.Context) error {
 	return s.Shutdown(ctx)
 }
 
-func runServe(ctx context.Context, args []string) (err error) {
+func runServe(ctx context.Context, _ []string) (err error) {
 	signalCh := make(chan os.Signal, 2)
 	signal.Notify(signalCh, syscall.SIGINT, syscall.SIGTERM)
 
@@ -100,7 +98,7 @@ func runServe(ctx context.Context, args []string) (err error) {
 
 	cache := hermes.NewIdempotencyKeyStore(db)
 
-	environment := fly.NewEnvironment()
+	// environment := fly.NewEnvironment()
 
 	log.Println("initialized hermes api")
 	api := api.New(service, events, apps, messages, cache, provider)
@@ -120,16 +118,16 @@ func runServe(ctx context.Context, args []string) (err error) {
 		}
 	}()
 
-	role, err := environment.GetNodeRole(ctx)
-	if err != nil {
-		log.Fatalf("could not get node role: %v", err)
-	}
+	// role, err := environment.GetNodeRole(ctx)
+	// if err != nil {
+	// 	log.Fatalf("could not get node role: %v", err)
+	// }
 
-	if role == "primary" {
-		log.Println("this is the primary node, starting cleanup routine")
+	// if role == "primary" {
+	// 	log.Println("this is the primary node, starting cleanup routine")
 
-		go startCleanupRoutine(ctx, db, cleanupInterval, retention)
-	}
+	// 	go startCleanupRoutine(ctx, db, cleanupInterval, retention)
+	// }
 
 	<-signalCh
 	log.Println("received signal, shutting down")
@@ -150,25 +148,25 @@ func runServe(ctx context.Context, args []string) (err error) {
 
 }
 
-func startCleanupRoutine(ctx context.Context, db *sqlite.DB, interval, ret time.Duration) {
-	ticker := time.NewTicker(interval)
-	defer ticker.Stop()
-
-	ctx, span := observ.StartSpan(ctx, "cleanup")
-	defer span.End()
-
-	for {
-		select {
-		case <-ticker.C:
-			numDeleted, err := sqlite.DeleteOldRecords(ctx, db, ret)
-			if err != nil {
-				log.Printf("Error cleaning up old records: %v", err)
-			} else {
-				log.Printf("Deleted %d old records", numDeleted)
-			}
-		case <-ctx.Done():
-			log.Printf("Cleanup routine stopped")
-			return
-		}
-	}
-}
+// func startCleanupRoutine(ctx context.Context, db *sqlite.DB, interval, ret time.Duration) {
+// 	ticker := time.NewTicker(interval)
+// 	defer ticker.Stop()
+
+// 	ctx, span := observ.StartSpan(ctx, "cleanup")
+// 	defer span.End()
+
+// 	for {
+// 		select {
+// 		case <-ticker.C:
+// 			numDeleted, err := sqlite.DeleteOldRecords(ctx, db, ret)
+// 			if err != nil {
+// 				log.Printf("Error cleaning up old records: %v", err)
+// 			} else {
+// 				log.Printf("Deleted %d old records", numDeleted)
+// 			}
+// 		case <-ctx.Done():
+// 			log.Printf("Cleanup routine stopped")
+// 			return
+// 		}
+// 	}
+// }

config.hcl

@@ -0,0 +1,30 @@
+app_name = "hermes"
+
+app {
+
+  env = {
+    PRIMARY_REGION = "lhr"
+    DATABASE_URL = "hermes.db"
+    ENVIRONMENT = "staging"
+    PORT = "8080"
+    HERMES_SENDER_IDENTITY="hermes"
+    HONEYCOMB_DSN="api.honeycomb.io"
+  }
+
+  port = 8080
+
+  compute {
+    cpu      = 1
+    memory   = 256
+    cpu_kind = "shared"
+  }
+
+  process {
+    name = "hermes"
+  }
+
+  storage {
+    name        = "data"
+    destination = "/data"
+  }
+}

etc/litefs.yml

@@ -30,14 +30,14 @@ exec:
 # These environment variables will be available in your Fly.io application.
 # You must specify "experiement.enable_consul" for FLY_CONSUL_URL to be available.
 lease:
-  type: "consul"
+  type: "static"
   hostname: "${HOSTNAME}"
-  advertise-url: "http://${HOSTNAME}.vm.${FLY_APP_NAME}.internal:20202"
-  candidate: ${FLY_REGION == PRIMARY_REGION}
-  promote: true
-  consul: 
-    key: "litefs/${FLY_APP_NAME}"
-    url: "${FLY_CONSUL_URL}"
+  advertise-url: "http://{ANDASY_APP}.internal:20202"
+  candidate: true
+  #promote: true
+  # consul: 
+  #   key: "litefs/${FLY_APP_NAME}"
+  #   url: "${FLY_CONSUL_URL}"
 
 backup:
   type: "litefs-cloud"

fly.toml

@@ -6,38 +6,38 @@ kill_timeout = 5
 primary_region = "lhr"
 
 [deploy]
-  strategy = "rolling"
+strategy = "rolling"
 
 [experimental]
-  auto_rollback = true
-  enable_consul = true
+auto_rollback = true
+enable_consul = true
 
 [env]
-  PRIMARY_REGION = "lhr"
-  DATABASE_URL = "/var/lib/hermes/state.db"
-  ENVIRONMENT = "test"
-  PORT = "8081"
+PRIMARY_REGION = "lhr"
+DATABASE_URL = "/var/lib/hermes/state.db"
+ENVIRONMENT = "test"
+PORT = "8081"
 
 [[mounts]]
-  source = "data_machines"
-  destination = "/data"
+source = "data_machines"
+destination = "/data"
 
 
 [http_service]
-  internal_port = 8080
-  force_https = true
-  auto_stop_machines = false
-  auto_start_machines = false
-  [http_service.concurrency]
-    type = "requests"
-    soft_limit = 200
-    hard_limit = 250
+internal_port = 8080
+force_https = true
+auto_stop_machines = "off"
+auto_start_machines = false
+[http_service.concurrency]
+type = "requests"
+soft_limit = 200
+hard_limit = 250
 
 [checks]
-  [checks.healthz]
-    type = "tcp"
-    grace_period = "4s"
-    interval = "8s"
-    port = 8080
-    timeout = "10s"
-    restart_limit = 3
+[checks.healthz]
+type = "tcp"
+grace_period = "4s"
+interval = "8s"
+port = 8080
+timeout = "10s"
+restart_limit = 3

sqlite/db.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"log"
 	"os"
 	"path/filepath"
 
@@ -38,6 +39,9 @@ func NewDB(dsn, server string, provider trace.TracerProvider) (*DB, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	log.Println("dsn:", dsn)
+
 	return &DB{db, dsn}, nil
 }
 

sqlite/migrate.go

@@ -58,6 +58,12 @@ func (db *DB) Migrate(dir Direction) (int, error) {
 					createTableIdempotencyKeys,
 				},
 			},
+			{
+				Id: "7",
+				Up: []string{
+					insertHermesApp,
+				},
+			},
 		},
 	}
 
@@ -159,3 +165,5 @@ var createTableIdempotencyKeys = `CREATE TABLE IF NOT EXISTS idempotency_keys (
 	path TEXT NOT NULL,
 	created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
 );`
+
+var insertHermesApp = `INSERT INTO apps (name, token, sender) VALUES ('hermes', 'hermes_token', 'Hermes');`

tracing/database.go

@@ -11,7 +11,7 @@ import (
 )
 
 // DBTraceDriver driver will register a new tracing sql driver and return the driver name.
-func DBTraceDriver(tp trace.TracerProvider, driver, dns, service string) (string, error) {
+func DBTraceDriver(tp trace.TracerProvider, driver, dsn, service string) (string, error) {
 
 	if service == "" {
 		service = driver + "-db-service"
@@ -20,7 +20,7 @@ func DBTraceDriver(tp trace.TracerProvider, driver, dns, service string) (string
 	// Register the otelsql wrapper for the provided database driver.
 	driverName, err := otelsql.RegisterWithSource(
 		driver,
-		dns,
+		dsn,
 		otelsql.WithDefaultAttributes(
 			semconv.ServiceNameKey.String(service),
 		),