Fix/logs and metrics

.github/actions/build-api-images/action.yml

@@ -86,6 +86,10 @@ inputs:
     description: 'build websocket-server api'
     default: false
 
+  gateway-kube-proxy:
+    description: 'build gateway kube proxy'
+    default: false
+
 runs:
   using: 'composite'
   steps:
@@ -103,7 +107,7 @@ runs:
         echo "GOCACHE=$GOCACHE" >> $GITHUB_ENV
         echo "FILES_HASH=${{ hashFiles('**/*.go', '**/go.mod', '**/go.sum')}}" >> $GITHUB_OUTPUT
         echo "PUSH_IMAGE=false" >> $GITHUB_ENV
-        if [ "${{ inputs.git_directory }}" != "." ]; then
+        if [ "$(basename ${{ inputs.git_directory }})" != "." ]; then
           echo "IMAGE_REPOSITORY_PREFIX=ghcr.io/${{ github.repository }}/$(basename ${{inputs.git_directory}})" >> $GITHUB_ENV
         else
           echo "IMAGE_REPOSITORY_PREFIX=ghcr.io/${{ github.repository }}" >> $GITHUB_ENV
@@ -430,3 +434,20 @@ runs:
       run: |
         task container:build-and-push image=${IMAGE_REPOSITORY_PREFIX}/websocket-server:${IMAGE_TAG:-latest} upx=true override=$OVERRIDE_PUSHED_IMAGE push_image=${PUSH_IMAGE}
 
+    - name: gateway kube proxy api build cache
+      if: ${{ inputs.gateway-kube-proxy == 'true' }}
+      uses: actions/cache@v4
+      with:
+        path: |+
+          ${{ env.GOMODCACHE }}
+          ${{ env.GOCACHE }}
+        key: go-${{ runner.os }}-gateway-kube-proxy-${{ steps.env-vars.outputs.FILES_HASH }}
+        save-always: true
+        restore-keys: go-${{ runner.os }}-gateway-kube-proxy-
+
+    - name: gateway logs proxy
+      if: ${{ inputs.gateway-kube-proxy == 'true' }}
+      working-directory: ${{ inputs.git_directory }}/cmd/gateway-kube-proxy
+      shell: bash
+      run: |
+        task container:build-and-push image=${IMAGE_REPOSITORY_PREFIX}/cmd/gateway-kube-proxy:${IMAGE_TAG:-latest} upx=true override=$OVERRIDE_PUSHED_IMAGE push_image=${PUSH_IMAGE}

apps/infra/internal/domain/clusters.go

@@ -622,6 +622,7 @@ func (d *domain) syncKloudliteDeviceOnPlatform(ctx InfraContext, gvpnName string
 
 	wgParams.PublicPeers = publicPeers
 	wgParams.DNS = clDevice.IPAddr
+	wgParams.WithDNS = true
 	wgParams.ListenPort = 31820
 
 	dnsServerArgs := make([]string, 0, len(gvpnConns))

apps/infra/internal/env/env.go

@@ -19,7 +19,7 @@ type Env struct {
 
 	KloudliteDNSSuffix string `env:"KLOUDLITE_DNS_SUFFIX" required:"true"`
 
-	NatsURL    string `env:"NATS_URL" required:"true"`
+	NatsURL                    string `env:"NATS_URL" required:"true"`
 	NatsReceiveFromAgentStream string `env:"NATS_RECEIVE_FROM_AGENT_STREAM" required:"true"`
 
 	AccountCookieName       string `env:"ACCOUNT_COOKIE_NAME" required:"true"`

apps/observability/internal/app/app.go

@@ -201,7 +201,7 @@ var Module = fx.Module(
 			}
 
 			if len(pods) == 0 {
-				// it sends http.StatusTooEarly, for the client to retry request after some time
+				// INFO: it sends http.StatusTooEarly, for the client to retry request after some time
 				logger.Infof("no pods found")
 				http.Error(w, "no pods found", http.StatusTooEarly)
 				return

apps/observability/internal/framework/framework.go

@@ -55,7 +55,13 @@ var Module = fx.Module("framework",
 		return http.NewServeMux()
 	}),
 
-	fx.Invoke(func(lf fx.Lifecycle, ev *env.Env, mux *http.ServeMux) {
+	fx.Invoke(func(lf fx.Lifecycle, ev *env.Env, mux *http.ServeMux, logger *slog.Logger) {
+		mux.HandleFunc("/_healthy", func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusOK)
+		})
+
+		logger.Info("starting observability api HTTP server on", "port", ev.HttpPort)
+
 		server := &http.Server{Addr: fmt.Sprintf(":%d", ev.HttpPort), Handler: mux}
 		lf.Append(fx.Hook{
 			OnStart: func(context.Context) error {

apps/observability/main.go

@@ -21,6 +21,9 @@ import (
 func main() {
 	var isDev bool
 	flag.BoolVar(&isDev, "dev", false, "--dev")
+
+	var debug bool
+	flag.BoolVar(&debug, "debug", false, "--debug")
 	flag.Parse()
 
 	ev, err := env.LoadEnv()
@@ -45,7 +48,7 @@ func main() {
 		fx.Provide(func() *slog.Logger {
 			return logging.NewSlogLogger(logging.SlogOptions{
 				ShowCaller:         true,
-				ShowDebugLogs:      isDev,
+				ShowDebugLogs:      debug,
 				SetAsDefaultLogger: true,
 			})
 		}),

cmd/gateway-kube-proxy/Dockerfile

@@ -1,5 +1,5 @@
 #syntax=docker/dockerfile:1
-FROM --platform=$TARGETPLATFORM cgr.dev/chainguard/static:latest-glibc
+FROM cgr.dev/chainguard/static:latest-glibc
 ARG BINARY TARGETARCH
 COPY  --chown=1001 $BINARY-$TARGETARCH ./gateway-kube-proxy
 ENTRYPOINT ["./gateway-kube-proxy"]

cmd/gateway-kube-proxy/Taskfile.yml

@@ -1,31 +1,37 @@
 version: 3
 
 includes:
-  go: ../../.tools/taskfiles/go-build.yml
+  go: ../../.tools/taskfiles/go-build.Taskfile.yml
+  docker: ../../.tools/taskfiles/docker.Taskfile.yml
 
 vars:
   app: gateway-kube-proxy
+  binary: ./bin/{{.app}}
 
 tasks:
   build:
     cmds:
       - task: go:build
         vars:
-          Out: ./bin/{{.app}}-{{.GOARCH}}
+          out: "{{.binary}}-{{.GOARCH}}"
+          GOARCH: "{{.GOARCH}}"
 
   run:
     cmds:
       - fwatcher --exec 'go run ./main.go  --addr :8090 --proxy-addr 127.0.0.1:8111 --authz sample' --ext .go
 
   container:build-and-push:
-    preconditions:
-      - sh: '[[ -n "{{.Image}}" ]]'
-        msg: "var Image is not set"
+    requires:
+      vars:
+        - image
     cmds:
       - task: build
         vars:
           GOARCH: amd64
       - task: build
         vars:
           GOARCH: arm64
-      - docker buildx build --platform linux/amd64,linux/arm64 --output=type=image,compression=zstd,force-compression=true,compression-level=14,push=true --build-arg BINARY="./bin/{{.app}}" -t {{.Image}} .
+      - task: docker:build-and-push
+        vars:
+          args: "--platform linux/amd64,linux/arm64 --build-arg BINARY={{.binary}} ."
+          image: "{{.image}}"

cmd/gateway-kube-proxy/main.go

@@ -3,13 +3,13 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log/slog"
 	"net/http"
 	"net/http/httputil"
 	"strings"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/chi/v5/middleware"
+	"github.com/kloudlite/api/common"
+	"github.com/kloudlite/api/pkg/logging"
 )
 
 func main() {
@@ -28,20 +28,23 @@ func main() {
 		panic("authz token is required, use --authz <authz-token>")
 	}
 
-	logger := slog.Default()
+	common.PrintKloudliteBanner()
+
+	logger := logging.NewSlogLogger(logging.SlogOptions{
+		ShowCaller:         true,
+		ShowDebugLogs:      debug,
+		SetAsDefaultLogger: true,
+	})
 
 	reverseProxyMap := make(map[string]*httputil.ReverseProxy)
 
 	r := chi.NewRouter()
-	r.Use(func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if r.URL.Path == "/healthy" {
-				next.ServeHTTP(w, r)
-				return
-			}
-			middleware.Logger(next).ServeHTTP(w, r)
-		})
+	httpLogger := logging.NewHttpLogger(logger, logging.HttpLoggerOptions{
+		ShowQuery:   true,
+		ShowHeaders: true,
+		SilentPaths: []string{},
 	})
+	r.Use(httpLogger.Use)
 
 	kloudliteAuthzHeader := "X-Kloudlite-Authz"
 
@@ -59,7 +62,6 @@ func main() {
 			return
 		}
 
-		// clusterName := sp[0]
 		clusterName := chi.URLParam(req, "cluster_name")
 
 		urlh := strings.ReplaceAll(proxyAddr, "{{.CLUSTER_NAME}}", clusterName)