Merge remote-tracking branch 'origin/develop' into feat/logs

Author: kenanfarukcakir

Dockerfile

@@ -3,7 +3,7 @@ WORKDIR /app
 COPY . ./
 RUN apk update && apk add gcc musl-dev
 ARG VERSION
-RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-X 'github.com/ddosify/alaz/datastore.tag=$VERSION'" -o alaz
+RUN GOOS=linux go build -ldflags="-X 'github.com/ddosify/alaz/datastore.tag=$VERSION'" -o alaz
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal:9.3-1552
 RUN microdnf update -y && microdnf install procps ca-certificates -y && microdnf clean all

Dockerfile.default

@@ -1,12 +1,13 @@
-FROM golang:1.20-alpine as builder
+FROM golang:1.20.14-bullseye as builder
 WORKDIR /app
 COPY . ./
-RUN apk update && apk add gcc musl-dev
+RUN apt update 
+
 ARG VERSION
-RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-X 'github.com/ddosify/alaz/datastore.tag=$VERSION'" -o alaz
+RUN GOOS=linux go build -ldflags="-X 'github.com/ddosify/alaz/datastore.tag=$VERSION'" -o alaz
 
-FROM alpine:3.18.3
-RUN apk --no-cache add ca-certificates
+FROM debian:12.5-slim
+RUN apt-get update && apt-get install -y procps ca-certificates && rm -rf /var/lib/apt/lists/*
 
 COPY --chown=0:0 --from=builder /app/alaz ./bin/
 ENTRYPOINT ["alaz"]

README.md

@@ -13,7 +13,7 @@
 </p>
 
 <h2 align="center">
-    <a href="https://demo.ddosify.com/" target="_blank">Live Demo</a> •
+    <a href="https://demo.ddosify.com/clusters/0ce2ef05-ef64-459d-90d9-7f2cbd65fff8" target="_blank">Live Demo</a> •
     <a href="https://docs.ddosify.com/" target="_blank">Documentation</a> •
     <a href="https://docs.ddosify.com/ddosify/deployment" target="_blank">Deployment</a> •
     <a href="https://docs.ddosify.com/ddosify/deployment" target="_blank">Discord</a>
@@ -119,7 +119,7 @@ MONITORING_ID=XXXXX
 BACKEND_HOST=XXXXX
 curl -sSL https://raw.githubusercontent.com/ddosify/alaz/master/resources/alaz.yaml -o alaz.yaml
 sed -i"" -e "s/<MONITORING_ID>/$MONITORING_ID/g" alaz.yaml
-sed -i"" -e "s/https:\/\/api.ddosify.com:443/http:\/\/$BACKEND_HOST\/api/g" alaz.yaml
+sed -i"" -e "s/https:\/\/api-alaz.ddosify.com:443/http:\/\/$BACKEND_HOST\/api/g" alaz.yaml
 kubectl create namespace ddosify
 kubectl apply -f alaz.yaml
 ```

aggregator/data.go

@@ -22,6 +22,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"syscall"
 
 	"golang.org/x/time/rate"
@@ -79,7 +80,7 @@ type Aggregator struct {
 	rateLimitMu  sync.RWMutex
 
 	// Used to find the correct mutex for the pid, some pids can share the same mutex
-	muIndex int
+	muIndex atomic.Uint64
 	muArray []*sync.RWMutex
 }
 
@@ -185,7 +186,7 @@ func NewAggregator(parentCtx context.Context, k8sChan <-chan interface{},
 		liveProcesses:       make(map[uint32]struct{}),
 		rateLimiters:        make(map[uint32]*rate.Limiter),
 		pgStmts:             make(map[string]string),
-		muIndex:             0,
+		muIndex:             atomic.Uint64{},
 		muArray:             nil,
 	}
 
@@ -227,11 +228,10 @@ func NewAggregator(parentCtx context.Context, k8sChan <-chan interface{},
 	a.muArray = make([]*sync.RWMutex, countMuArray)
 
 	// set distinct mutex for every live process
-	a.muIndex = 0
 	for pid := range a.liveProcesses {
-		a.muArray[a.muIndex] = &sync.RWMutex{}
-		sockMaps[pid].mu = a.muArray[a.muIndex]
-		a.muIndex++
+		a.muArray[a.muIndex.Load()] = &sync.RWMutex{}
+		sockMaps[pid].mu = a.muArray[a.muIndex.Load()]
+		a.muIndex.Add(1)
 		a.getAlreadyExistingSockets(pid)
 	}
 
@@ -456,9 +456,16 @@ func (a *Aggregator) processExec(d *proc.ProcEvent) {
 	a.liveProcesses[d.Pid] = struct{}{}
 
 	// create lock on demand
-	a.muArray[a.muIndex%len(a.muArray)] = &sync.RWMutex{}
-	a.muIndex++
-	a.clusterInfo.SocketMaps[d.Pid].mu = a.muArray[a.muIndex%len(a.muArray)]
+	a.muArray[(a.muIndex.Load())%uint64(len(a.muArray))] = &sync.RWMutex{}
+	a.muIndex.Add(1)
+
+	// if duplicate exec event comes, underlying mutex will be changed
+	// if first assigned mutex is locked and another exec event comes, mutex will be changed
+	// and unlock of unlocked mutex now is a possibility
+	// to avoid this case, if a socket map already has a mutex, don't change it
+	if a.clusterInfo.SocketMaps[d.Pid].mu == nil {
+		a.clusterInfo.SocketMaps[d.Pid].mu = a.muArray[(a.muIndex.Load())%uint64(len(a.muArray))]
+	}
 }
 
 func (a *Aggregator) processExit(pid uint32) {
@@ -1325,7 +1332,7 @@ func (a *Aggregator) parseSqlCommand(d *l7_req.L7Event) (string, error) {
 			a.pgStmtsMu.RLock()
 			query, ok := a.pgStmts[a.getPgStmtKey(d.Pid, d.Fd, stmtName)]
 			a.pgStmtsMu.RUnlock()
-			if !ok { // we don't have the query for the prepared statement
+			if !ok || query == "" { // we don't have the query for the prepared statement
 				// Execute (name of prepared statement) [(parameter)]
 				return fmt.Sprintf("EXECUTE %s *values*", stmtName), nil
 			}

config/db.go

@@ -11,6 +11,7 @@ type PostgresConfig struct {
 type BackendDSConfig struct {
 	Host                  string
 	MetricsExport         bool
+	GpuMetricsExport      bool
 	MetricsExportInterval int // in seconds
 
 	ReqBufferSize  int