Commit34c46c0

authored

chore: renameservice ->coder_service, removeagent_id label (#19241)

Pyroscope uses `service` tag for top level distinction. So move our`service` -> `coder_service`

1 parentb8851f0 commit34c46c0Copy full SHA for 34c46c0

File tree

+40

-14

lines changed

+40

-14

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,14 @@ import (`
`14`	`14`	`"net/url"`
`15`	`15`	`"path/filepath"`
`16`	`16`	`"regexp"`
	`17`	`+"runtime/pprof"`
`17`	`18`	`"strings"`
`18`	`19`	`"sync"`
`19`	`20`	`"sync/atomic"`
`20`	`21`	`"time"`
`21`	`22`
`22`	`23`	`"github.com/coder/coder/v2/coderd/oauth2provider"`
	`24`	`+"github.com/coder/coder/v2/coderd/pproflabel"`
`23`	`25`	`"github.com/coder/coder/v2/coderd/prebuilds"`
`24`	`26`	`"github.com/coder/coder/v2/coderd/wsbuilder"`
`25`	`27`
`@@ -1340,7 +1342,13 @@ func New(options Options) API {`
`1340`	`1342`	`).Get("/connection",api.workspaceAgentConnectionGeneric)`
`1341`	`1343`	`r.Route("/me",func(r chi.Router) {`
`1342`	`1344`	`r.Use(workspaceAgentInfo)`
`1343`		`-r.Get("/rpc",api.workspaceAgentRPC)`
	`1345`	`+r.Group(func(r chi.Router) {`
	`1346`	`+r.Use(`
	`1347`	`+// Override the request_type for agent rpc traffic.`
	`1348`	`+httpmw.WithStaticProfilingLabels(pprof.Labels(pproflabel.RequestTypeTag,"agent-rpc")),`
	`1349`	`+)`
	`1350`	`+r.Get("/rpc",api.workspaceAgentRPC)`
	`1351`	`+})`
`1344`	`1352`	`r.Patch("/logs",api.patchWorkspaceAgentLogs)`
`1345`	`1353`	`r.Patch("/app-status",api.patchWorkspaceAgentAppStatus)`
`1346`	`1354`	`// Deprecated: Required to support legacy agents`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,22 @@ func WithProfilingLabels(next http.Handler) http.Handler {`
`22`	`22`	`requestType="websocket"`
`23`	`23`	`}`
`24`	`24`
`25`		`-pprof.Do(ctx,pproflabel.Service(pproflabel.ServiceHTTPServer,"request_type",requestType),func(ctx context.Context) {`
	`25`	`+pprof.Do(ctx,pproflabel.Service(pproflabel.ServiceHTTPServer,pproflabel.RequestTypeTag,requestType),func(ctx context.Context) {`
`26`	`26`	`r=r.WithContext(ctx)`
`27`	`27`	`next.ServeHTTP(rw,r)`
`28`	`28`	`})`
`29`	`29`	`})`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+funcWithStaticProfilingLabels(labels pprof.LabelSet)func(next http.Handler) http.Handler {`
	`33`	`+returnfunc(next http.Handler) http.Handler {`
	`34`	`+returnhttp.HandlerFunc(func(rw http.ResponseWriter,r*http.Request) {`
	`35`	`+ctx:=r.Context()`
	`36`	`+`
	`37`	`+pprof.Do(ctx,labels,func(ctx context.Context) {`
	`38`	`+r=r.WithContext(ctx)`
	`39`	`+next.ServeHTTP(rw,r)`
	`40`	`+})`
	`41`	`+})`
	`42`	`+}`
	`43`	`+}`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,22 @@ func Go(ctx context.Context, labels pprof.LabelSet, f func(context.Context)) {`
`10`	`10`	`gopprof.Do(ctx,labels,f)`
`11`	`11`	`}`
`12`	`12`
	`13`	`+funcDo(ctx context.Context,labels pprof.LabelSet,ffunc(context.Context)) {`
	`14`	`+pprof.Do(ctx,labels,f)`
	`15`	`+}`
	`16`	`+`
`13`	`17`	`const (`
`14`		`-ServiceTag="service"`
	`18`	`+// ServiceTag should not collide with the pyroscope built-in tag "service".`
	`19`	+// Use `coder_` to avoid collisions.
	`20`	`+ServiceTag="coder_service"`
`15`	`21`
`16`	`22`	`ServiceHTTPServer="http-api"`
`17`	`23`	`ServiceLifecycles="lifecycle-executor"`
`18`	`24`	`ServiceMetricCollector="metrics-collector"`
`19`	`25`	`ServicePrebuildReconciler="prebuilds-reconciler"`
`20`	`26`	`ServiceTerraformProvisioner="terraform-provisioner"`
	`27`	`+`
	`28`	`+RequestTypeTag="coder_request_type"`
`21`	`29`	`)`
`22`	`30`
`23`	`31`	`funcService(namestring,pairs...string) pprof.LabelSet {`

Lines changed: 8 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`	`"io"`
`8`	`8`	`"net/http"`
`9`		`-"runtime/pprof"`
`10`	`9`	`"sync"`
`11`	`10`	`"sync/atomic"`
`12`	`11`	`"time"`
`@@ -348,16 +347,14 @@ func (m *agentConnectionMonitor) init() {`
`348`	`347`	`func (m*agentConnectionMonitor)start(ctx context.Context) {`
`349`	`348`	`ctx,m.cancel=context.WithCancel(ctx)`
`350`	`349`	`m.wg.Add(2)`
`351`		`-gopprof.Do(ctx,pprof.Labels("agent",m.workspaceAgent.ID.String()),`
`352`		`-func(ctx context.Context) {`
`353`		`-deferm.wg.Done()`
`354`		`-m.sendPings(ctx)`
`355`		`-})`
`356`		`-gopprof.Do(ctx,pprof.Labels("agent",m.workspaceAgent.ID.String()),`
`357`		`-func(ctx context.Context) {`
`358`		`-deferm.wg.Done()`
`359`		`-m.monitor(ctx)`
`360`		`-})`
	`350`	`+gofunc(ctx context.Context) {`
	`351`	`+deferm.wg.Done()`
	`352`	`+m.sendPings(ctx)`
	`353`	`+}(ctx)`
	`354`	`+gofunc(ctx context.Context) {`
	`355`	`+deferm.wg.Done()`
	`356`	`+m.monitor(ctx)`
	`357`	`+}(ctx)`
`361`	`358`	`}`
`362`	`359`
`363`	`360`	`func (m*agentConnectionMonitor)monitor(ctx context.Context) {`

Comments

(0)