implement grpc gateway and addl handler support

pkg/app/run.go

@@ -1,72 +1,68 @@
 package app
 
 import (
-	"context"
-	"sync"
-	"time"
+	"errors"
 
-	"go.opentelemetry.io/otel/attribute"
+	"github.com/rs/zerolog"
 	"go.opentelemetry.io/otel/codes"
+
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
 )
 
-// Watches contexts and channels for the
-// app to be finished and calls shutdown once
-// the app is done
-func (a *App) run() {
-	select {
-	case <-a.AppContext.Done():
-		a.l.Warn().Str("reason", a.AppContext.Err().Error()).
-			Msg("shutting down on context done")
-	case <-a.HTTP.HTTPDone: // TODO: return error on this channel
-		a.l.Warn().Msg("shutting down early on http server done")
-	case err := <-a.GRPC.GRPCDone:
-		a.l.Warn().Err(err).Msg("shutting down early on grpc server done")
-	}
+// TODO: Make Configurable
+const GRPC_GW_API_PATH = "/api"
 
-	a.Shutdown()     // Run through all shutdown funcs
-	a.appDone <- nil // Notify app
+func (a *App) Done() <-chan any {
+	return a.appDone
 }
 
-// Typically invoked when AppContext is done
-// or Server has exited. Not intended to be called
-// manually
-func (a *App) Shutdown() {
-	now := time.Now()
-
-	doneCtx, cncl := context.WithTimeout(context.Background(), 15*time.Second)
-	defer func() {
-		if doneCtx.Err() == context.DeadlineExceeded {
-			a.l.Err(doneCtx.Err()).
-				Dur("shutdownTime", time.Since(now)).
-				Msg("app shutdown aborted")
-		} else {
-			a.l.Info().
-				Int("shutdownFuncsCalled", len(a.shutdownFuncs)).
-				Dur("shutdownTime", time.Since(now)).
-				Msg("app shutdown normally")
-		}
-		cncl()
-	}()
-
-	doneCtx, span := a.tracer.Start(doneCtx, "shutdown")
-	defer span.End()
-
-	span.SetAttributes(attribute.Int("shutdown.funcs", len(a.shutdownFuncs)))
-
-	var wg sync.WaitGroup
-	wg.Add(len(a.shutdownFuncs))
-
-	for _, f := range a.shutdownFuncs {
-		go func() {
-			defer wg.Done()
-			err := f(doneCtx)
-			if err != nil {
-				span.SetStatus(codes.Error, "shutdown failed")
-				span.RecordError(err)
-				a.l.Err(err).Send()
-			}
-		}()
+func (a *App) MustRun() {
+	if a.cfg != nil {
+		panic(errors.New("already ran app trying to run"))
 	}
 
-	wg.Wait()
+	// Set up app
+	a.cfg = config.MustFromCtx(a.AppContext)
+	a.l = zerolog.Ctx(a.AppContext)
+	a.shutdownFuncs = make([]shutdownFunc, 0)
+	a.appDone = make(chan any)
+	a.HTTP.HTTPDone = make(chan any)
+
+	if !a.cfg.HTTPEnabled() && !a.cfg.GRPCEnabled() {
+		panic(errors.New("neither http nor grpc enabled, nothing to do"))
+	}
+
+	if len(a.HTTP.Funcs) < 1 {
+		a.l.Warn().Msg("no http funcs provided, only serving health and metrics")
+	}
+
+	// Start OTEL
+	// Registers a NO-OP provider if not enabled
+	a.initOTEL()
+
+	// With OTEL ready, create an init span to track startup
+	ctx, initSpan := a.tracer.Start(a.AppContext, "init")
+	defer initSpan.End()
+
+	// Prepare GRPC first. The GRPC server may update its opts
+	// with a prepared GRPC-Gateway runtime.ServeMux if any of its services
+	// have added GRPC-Gateway handlers. If present, serve under api path
+	if a.cfg.GRPCEnabled() {
+		a.runGRPC(ctx)
+	}
+
+	if a.cfg.HTTPEnabled() {
+		a.runHTTP(ctx)
+	}
+
+	// Monitor app lifecycle
+	go a.monitor()
+
+	// Startup Complete
+	a.l.Info().
+		Str("name", a.cfg.Name).
+		Str("version", a.cfg.Version).
+		Str("logLevel", a.cfg.Logging.Level).
+		Msg("app initialized")
+	initSpan.SetStatus(codes.Ok, "")
 }