Skip to content

Commit 366f33a

Browse files
committed
WIP
1 parent b16f1c0 commit 366f33a

File tree

8 files changed

+121
-169
lines changed

8 files changed

+121
-169
lines changed

coderd/coderd.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import (
3838
// Used for swagger docs.
3939
_ "github.com/coder/coder/v2/coderd/apidoc"
4040
"github.com/coder/coder/v2/coderd/externalauth"
41-
"github.com/coder/coder/v2/coderd/prometheusmetrics"
4241

4342
"cdr.dev/slog"
4443
"github.com/coder/coder/v2/buildinfo"
@@ -344,14 +343,6 @@ func New(options *Options) *API {
344343
panic(xerrors.Errorf("get deployment ID: %w", err))
345344
}
346345

347-
licenseMetrics, err := prometheusmetrics.NewLicenseMetrics(&prometheusmetrics.LicenseMetricsOptions{
348-
Logger: options.Logger,
349-
Registry: options.PrometheusRegistry,
350-
})
351-
if err != nil {
352-
panic(xerrors.Errorf("unable to initialize license metrics: %w", err))
353-
}
354-
355346
api := &API{
356347
ctx: ctx,
357348
cancel: cancel,
@@ -386,8 +377,6 @@ func New(options *Options) *API {
386377
options.Logger.Named("acquirer"),
387378
options.Database,
388379
options.Pubsub),
389-
390-
LicenseMetrics: licenseMetrics,
391380
}
392381
if options.UpdateCheckOptions != nil {
393382
api.updateChecker = updatecheck.New(
@@ -1047,8 +1036,6 @@ type API struct {
10471036
statsBatcher *batchstats.Batcher
10481037

10491038
Acquirer *provisionerdserver.Acquirer
1050-
1051-
LicenseMetrics *prometheusmetrics.LicenseMetrics
10521039
}
10531040

10541041
// Close waits for all WebSocket connections to drain before returning.

coderd/database/dbmock/dbmock.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/models.go

Lines changed: 25 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/externalauth.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ import (
88

99
"golang.org/x/sync/errgroup"
1010

11+
"github.com/sqlc-dev/pqtype"
12+
1113
"github.com/coder/coder/v2/coderd/database"
1214
"github.com/coder/coder/v2/coderd/database/dbtime"
1315
"github.com/coder/coder/v2/coderd/externalauth"
1416
"github.com/coder/coder/v2/coderd/httpapi"
1517
"github.com/coder/coder/v2/coderd/httpmw"
1618
"github.com/coder/coder/v2/codersdk"
17-
"github.com/sqlc-dev/pqtype"
1819
)
1920

2021
// @Summary Get external auth by ID

0 commit comments

Comments
 (0)