add weather grpc

pkg/app/app_init.go

@@ -7,7 +7,7 @@ import (
 	"go.opentelemetry.io/otel/codes"
 
 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
-	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv"
+	srvhttp "gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/http"
 )
 
 func (a *App) initGRPC() {
@@ -26,8 +26,8 @@ func (a *App) initHTTP(ctx context.Context) error {
 		attribute.Int("numHTTPHealthChecks", len(a.HTTP.HealthChecks)),
 	)
 
-	httpShutdown, a.HTTP.httpDone, err = srv.InitHTTPServer(
-		&srv.HTTPServerOpts{
+	httpShutdown, a.HTTP.httpDone, err = srvhttp.InitHTTPServer(
+		&srvhttp.HTTPServerOpts{
 			Ctx:              a.AppContext,
 			HandleFuncs:      a.HTTP.Funcs,
 			Middleware:       a.HTTP.Middleware,

pkg/app/app_types.go

@@ -9,7 +9,7 @@ import (
 	"google.golang.org/grpc"
 
 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
-	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv"
+	srvhttp "gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/http"
 )
 
 type App struct {
@@ -35,9 +35,9 @@ type GRPCService struct {
 }
 
 type AppHTTP struct {
-	Funcs        []srv.HTTPFunc
+	Funcs        []srvhttp.HTTPFunc
 	Middleware   []http.Handler
-	HealthChecks []srv.HealthCheckFunc
+	HealthChecks []srvhttp.HealthCheckFunc
 	httpDone     <-chan any
 }
 

pkg/srv/grpc/grpc.go

@@ -0,0 +1,29 @@
+package grpc
+
+import (
+	"context"
+
+	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/trace"
+	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+	"google.golang.org/grpc"
+
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/grpc/opts"
+)
+
+type AppGRPCServer struct {
+	ctx    context.Context
+	tracer trace.Tracer
+	meter  metric.Meter
+}
+
+func InitGRPCServer(ctx context.Context, opts *opts.GRPCOpts) {
+	server := grpc.NewServer()
+
+	stats := otelgrpc.NewServerHandler(otelgrpc.WithTracerProvider(sdktrace.T))
+
+	for _, service := range opts.Services {
+		server.RegisterService(service.Type, service.Service)
+	}
+}

pkg/srv/grpc/opts/grpc_config.go

@@ -0,0 +1,11 @@
+package opts
+
+import (
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/app"
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
+)
+
+type GRPCOpts struct {
+	*config.GRPCConfig
+	*app.AppGRPC
+}

pkg/srv/http/http.go

@@ -1,4 +1,4 @@
-package srv
+package http
 
 import (
 	"context"
@@ -128,17 +128,9 @@ func prepHTTPServer(opts *HTTPServerOpts) *http.Server {
 	}
 }
 
-// Returns a shutdown func and a done channel if the
-// server aborts abnormally. Panics on error.
-func InitHTTPServer(opts *HTTPServerOpts) (
-	func(context.Context) error, <-chan any, error,
-) {
-	return initHTTPServer(opts)
-}
-
 // Returns a shutdown func and a done channel if the
 // server aborts abnormally. Returns error on failure to start
-func initHTTPServer(opts *HTTPServerOpts) (
+func InitHTTPServer(opts *HTTPServerOpts) (
 	func(context.Context) error, <-chan any, error,
 ) {
 	l := zerolog.Ctx(opts.Ctx)

pkg/srv/http/http_health.go

@@ -1,4 +1,4 @@
-package srv
+package http
 
 import (
 	"context"

pkg/srv/http/http_log.go

@@ -1,4 +1,4 @@
-package srv
+package http
 
 import (
 	"bytes"