An attempt to get Sentry to work reliably behind multiple ingresses/p…

…roxies
AS203038 · Sep 7, 2024 · 152f283 · 152f283
1 parent 322c29d
commit 152f283
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/http/http.go b/pkg/http/http.go
@@ -11,6 +11,7 @@ import (
 	"io/fs"
 	"log"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/AS203038/looking-glass/pkg/http/grpc"
@@ -177,6 +178,8 @@ func ListenAndServe(ctx context.Context, cfg *utils.Config, rts utils.RouterMap,
 			"Grpc-Timeout",             // Used for gRPC-web
 			"X-Grpc-Web",               // Used for gRPC-web
 			"X-User-Agent",             // Used for gRPC-web
+			"baggage",                  // Used for sentry
+			"sentry-trace",             // Used for sentry
 		},
 		ExposedHeaders: []string{
 			"Content-Encoding",         // Unused in web browsers, but added for future-proofing
@@ -209,7 +212,7 @@ func ListenAndServe(ctx context.Context, cfg *utils.Config, rts utils.RouterMap,
 			EnableTracing:      true,
 			TracesSampleRate:   cfg.Web.Sentry.SampleRate,
 			ProfilesSampleRate: 1.0,
-			Release:            utils.Version(),
+			Release:            strings.Split(utils.Version(), "+")[0],
 			Environment:        cfg.Web.Sentry.Environment,
 		})
 		if err != nil {

diff --git a/webui/src/routes/+layout.svelte b/webui/src/routes/+layout.svelte
@@ -54,7 +54,7 @@
         init({
           dsn: env.PUBLIC_SENTRY_DSN,
           environment: env.PUBLIC_SENTRY_ENV,
-          release: env.PUBLIC_LG_VERSION,
+          release: env.PUBLIC_LG_VERSION?.split("+")[0],
           integrations: [browserTracingIntegration(), replayIntegration()],
           // tracePropagationTargets: [env.PUBLIC_GRPC_URL],
           tracesSampleRate: parseFloat(env.PUBLIC_SENTRY_SAMPLE_RATE || "0.0"),