add label for websocket vs http

Emyrk · Emyrk · commit 56f67a7cc720 · 2025-08-07T11:11:00.000-05:00
diff --git a/coderd/httpmw/pprof.go b/coderd/httpmw/pprof.go
@@ -14,7 +14,15 @@ import (
 func WithProfilingLabels(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
-		pprof.Do(ctx, pproflabel.Service(pproflabel.ServiceHTTPServer), func(ctx context.Context) {
+
+		// Label to differentiate between http and websocket requests. Websocket requests
+		// are assumed to be long-lived and more resource consuming.
+		requestType := "http"
+		if r.Header.Get("Upgrade") == "websocket" {
+			requestType = "websocket"
+		}
+
+		pprof.Do(ctx, pproflabel.Service(pproflabel.ServiceHTTPServer, "request_type", requestType), func(ctx context.Context) {
 			r = r.WithContext(ctx)
 			next.ServeHTTP(rw, r)
 		})
diff --git a/coderd/pproflabel/pproflabel.go b/coderd/pproflabel/pproflabel.go
@@ -11,13 +11,15 @@ func Go(ctx context.Context, labels pprof.LabelSet, f func(context.Context)) {
 }
 
 const (
+	ServiceTag = "service"
+
+	ServiceHTTPServer           = "http-api"
+	ServiceLifecycles           = "lifecycle-executor"
+	ServiceMetricCollector      = "metrics-collector"
+	ServicePrebuildReconciler   = "prebuilds-reconciler"
 	ServiceTerraformProvisioner = "terraform-provisioner"
-	ServiceMetricCollector      = "metric-collector"
-	ServiceLifecycles           = "lifecycles"
-	ServiceHTTPServer           = "http-server"
-	ServicePrebuildReconciler   = "prebuild-reconciler"
 )
 
-func Service(name string) pprof.LabelSet {
-	return pprof.Labels("service", name)
+func Service(name string, pairs ...string) pprof.LabelSet {
+	return pprof.Labels(append([]string{ServiceTag, name}, pairs...)...)
 }
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -903,7 +903,8 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 			}
 
 			api.AGPL.PrebuildsReconciler.Store(&reconciler)
-			// TODO: Should this context be the app context?
+			// TODO: Should this context be the api.ctx context? To cancel when
+			// 	the API (and entire app) is closed via shutdown?
 			pproflabel.Go(context.Background(), pproflabel.Service(pproflabel.ServicePrebuildReconciler), reconciler.Run)
 
 			api.AGPL.PrebuildsClaimer.Store(&claimer)

Original file line number	Diff line number	Diff line change
`@@ -903,7 +903,8 @@ func (api *API) updateEntitlements(ctx context.Context) error {`
`903`	`903`	`}`
`904`	`904`
`905`	`905`	`api.AGPL.PrebuildsReconciler.Store(&reconciler)`
`906`		`- // TODO: Should this context be the app context?`
	`906`	`+ // TODO: Should this context be the api.ctx context? To cancel when`
	`907`	`+ // the API (and entire app) is closed via shutdown?`
`907`	`908`	`pproflabel.Go(context.Background(), pproflabel.Service(pproflabel.ServicePrebuildReconciler), reconciler.Run)`
`908`	`909`
`909`	`910`	`api.AGPL.PrebuildsClaimer.Store(&claimer)`