more PR comments

deansheather · deansheather · commit 7243c41fd291 · 2025-08-15T14:47:21.000Z
diff --git a/coderd/pproflabel/pproflabel.go b/coderd/pproflabel/pproflabel.go
@@ -32,6 +32,8 @@ const (
 	// ServiceAgentMetricAggregator merges agent metrics and exports them in a
 	// prometheus collector format.
 	ServiceAgentMetricAggregator = "agent-metrics-aggregator"
+	// ServiceTallymanPublisher publishes usage events to coder/tallyman.
+	ServiceTallymanPublisher = "tallyman-publisher"
 
 	RequestTypeTag = "coder_request_type"
 )
diff --git a/coderd/rbac/roles.go b/coderd/rbac/roles.go
@@ -271,7 +271,7 @@ func ReloadBuiltinRoles(opts *RoleOptions) {
 			// Workspace dormancy and workspace are omitted.
 			// Workspace is specifically handled based on the opts.NoOwnerWorkspaceExec.
 			// Owners cannot access other users' secrets.
-			allPermsExcept(ResourceWorkspaceDormant, ResourcePrebuiltWorkspace, ResourceWorkspace, ResourceUserSecret),
+			allPermsExcept(ResourceWorkspaceDormant, ResourcePrebuiltWorkspace, ResourceWorkspace, ResourceUserSecret, ResourceUsageEvent),
 			// This adds back in the Workspace permissions.
 			Permissions(map[string][]policy.Action{
 				ResourceWorkspace.Type:        ownerWorkspaceActions,
diff --git a/coderd/rbac/roles_test.go b/coderd/rbac/roles_test.go
@@ -877,8 +877,9 @@ func TestRolePermissions(t *testing.T) {
 			Actions:  []policy.Action{policy.ActionCreate, policy.ActionRead, policy.ActionUpdate},
 			Resource: rbac.ResourceUsageEvent,
 			AuthorizeMap: map[bool][]hasAuthSubjects{
-				true: {owner},
+				true: {},
 				false: {
+					owner,
 					memberMe, orgMemberMe, otherOrgMember,
 					orgAdmin, otherOrgAdmin,
 					orgAuditor, otherOrgAuditor,
diff --git a/enterprise/coderd/usage/publisher.go b/enterprise/coderd/usage/publisher.go
@@ -16,6 +16,7 @@ import (
 	"cdr.dev/slog"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
+	"github.com/coder/coder/v2/coderd/pproflabel"
 	agplusage "github.com/coder/coder/v2/coderd/usage"
 	"github.com/coder/coder/v2/cryptorand"
 	"github.com/coder/coder/v2/enterprise/coderd"
@@ -127,7 +128,8 @@ func PublisherWithInitialDelay(initialDelay time.Duration) TallymanPublisherOpti
 
 // Start implements Publisher.
 func (p *tallymanPublisher) Start() error {
-	deploymentID, err := p.db.GetDeploymentID(p.ctx)
+	ctx := p.ctx
+	deploymentID, err := p.db.GetDeploymentID(ctx)
 	if err != nil {
 		return xerrors.Errorf("get deployment ID: %w", err)
 	}
@@ -147,7 +149,9 @@ func (p *tallymanPublisher) Start() error {
 		p.initialDelay = tallymanPublishInitialMinimumDelay + time.Duration(plusDelay)
 	}
 
-	go p.publishLoop(p.ctx, deploymentUUID)
+	pproflabel.Go(ctx, pproflabel.Service(pproflabel.ServiceTallymanPublisher), func(ctx context.Context) {
+		p.publishLoop(ctx, deploymentUUID)
+	})
 	return nil
 }
 
diff --git a/enterprise/coderd/usage/publisher_test.go b/enterprise/coderd/usage/publisher_test.go
@@ -630,6 +630,9 @@ func TestPublisherTallymanError(t *testing.T) {
 
 func jsoninate(t *testing.T, v any) string {
 	t.Helper()
+	if e, ok := v.(agplusage.Event); ok {
+		v = e.Fields()
+	}
 	buf, err := json.Marshal(v)
 	require.NoError(t, err)
 	return string(buf)

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ const (`
`32`	`32`	`// ServiceAgentMetricAggregator merges agent metrics and exports them in a`
`33`	`33`	`// prometheus collector format.`
`34`	`34`	`ServiceAgentMetricAggregator = "agent-metrics-aggregator"`
	`35`	`+ // ServiceTallymanPublisher publishes usage events to coder/tallyman.`
	`36`	`+ ServiceTallymanPublisher = "tallyman-publisher"`
`35`	`37`
`36`	`38`	`RequestTypeTag = "coder_request_type"`
`37`	`39`	`)`