fix: sigsegv

mtojek · mtojek · commit b16f1c02a73d · 2023-10-10T15:06:00.000+02:00
diff --git a/cli/server.go b/cli/server.go
@@ -816,6 +816,9 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 				}
 				defer closeAgentsFunc()
 
+				if coderAPI.LicenseMetrics == nil {
+					return xerrors.Errorf("developer error: LicenseMetrics should be not nil")
+				}
 				closeLicenseMetricsFunc, err := coderAPI.LicenseMetrics.Collect(ctx)
 				if err != nil {
 					return xerrors.Errorf("register license metric: %w", err)
diff --git a/coderd/prometheusmetrics/license.go b/coderd/prometheusmetrics/license.go
@@ -73,6 +73,16 @@ func (lm *LicenseMetrics) Collect(ctx context.Context) (func(), error) {
 		defer ticker.Reset(lm.interval)
 
 		entitlements := lm.Entitlements.Load()
+		if entitlements == nil {
+			lm.logger.Warn(ctx, `entitlements have not been loaded yet`)
+			return
+		}
+
+		if entitlements.Features == nil {
+			lm.logger.Warn(ctx, `entitlements features are undefined`)
+			return
+		}
+
 		userLimitEntitlement, ok := entitlements.Features[codersdk.FeatureUserLimit]
 		if !ok {
 			lm.logger.Warn(ctx, `"user_limit" entitlement is not present`)

Original file line number	Diff line number	Diff line change
`@@ -816,6 +816,9 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`816`	`816`	`}`
`817`	`817`	`defer closeAgentsFunc()`
`818`	`818`
	`819`	`+ if coderAPI.LicenseMetrics == nil {`
	`820`	`+ return xerrors.Errorf("developer error: LicenseMetrics should be not nil")`
	`821`	`+ }`
`819`	`822`	`closeLicenseMetricsFunc, err := coderAPI.LicenseMetrics.Collect(ctx)`
`820`	`823`	`if err != nil {`
`821`	`824`	`return xerrors.Errorf("register license metric: %w", err)`