Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ build-frontend-app:
cd services/frontend/react_app && ./scripts/build.sh

dev-build-docker: build
$(DOCKER) build -t signadot/hotrod:latest \
$(DOCKER) build -t signadot/hotrod:dev \
--platform $(GOOS)/$(GOARCH) \
.

Expand Down
49 changes: 44 additions & 5 deletions services/driver/consumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"context"
"encoding/json"
"fmt"
"net"
"os"
"time"

"github.com/dnwe/otelsarama"
Expand All @@ -22,6 +24,29 @@ import (
"github.com/IBM/sarama"
)

// isRouteserverReachable checks if the routeserver is available and reachable
func isRouteserverReachable(logger log.Factory) (string, bool) {
routeserverURL := os.Getenv("SIGNADOT_ROUTESERVER")
if routeserverURL == "" {
logger.Bg().Info("No routeserver URL found")
return "", false
}

// Try to connect to check reachability
timeout := 2 * time.Second
conn, err := net.DialTimeout("tcp", routeserverURL, timeout)
if err != nil {
logger.Bg().Info("Routeserver not reachable",
zap.String("url", routeserverURL),
zap.Error(err))
return routeserverURL, false
}

conn.Close()
logger.Bg().Info("Routeserver is reachable", zap.String("url", routeserverURL))
return routeserverURL, true
}

// Consumer represents a Sarama consumer group consumer
type Consumer struct {
tracer trace.Tracer
Expand All @@ -35,11 +60,21 @@ type Consumer struct {

func newConsumer(ctx context.Context, tracerProvider trace.TracerProvider,
logger log.Factory) *Consumer {
// create a routesapi baseline watched instance
// TODO: remove this in case we're not running with Signadot
routing, err := watched.BaselineWatchedFromEnv()
if err != nil {
panic(err)

// Only initialize routing if routeserver URL is set and reachable
var routing watched.BaselineWatched
routeserverURL, reachable := isRouteserverReachable(logger)

if reachable {
logger.Bg().Info("Initializing routing with reachable routeserver",
zap.String("url", routeserverURL))
var err error
routing, err = watched.BaselineWatchedFromEnv()
if err != nil {
logger.Bg().Info("Failed to create BaselineWatchedFromEnv, continuing without routing", zap.Error(err))
}
} else {
logger.Bg().Info("Continuing without routing")
}

tracer := tracerProvider.Tracer("driver")
Expand Down Expand Up @@ -84,6 +119,10 @@ func (consumer *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, clai
}

func (consumer *Consumer) shouldProcess(routingKey string) bool {
if consumer.routing == nil {
// If routing is not set up, process all messages
return true
}
if sbName := config.SignadotSandboxName(); sbName != "" {
return consumer.routing.RoutesTo(routingKey, sbName)
}
Expand Down
Loading