Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pkg/oauth2: consider session cancellation #182

Merged
merged 6 commits into from Jun 13, 2019
Merged

pkg/oauth2: consider session cancellation #182

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c219eb
pkg/oauth2: add unit test for session expiry
s-urbaniak Jun 7, 2019
b4f1fa8
pkg/oauth2: consider session cancellation
s-urbaniak Jun 7, 2019
36c72d7
pkg/oauth2: add pwd credentials grants total metrics
s-urbaniak Jun 12, 2019
b10ffcf
pkg/oauth2: dependency-inject grants total counter metric
s-urbaniak Jun 12, 2019
71867d0
pkg/oauth2: dependency inject counter interface
s-urbaniak Jun 13, 2019
fe20139
pkg/oauth2: set cause/status labels
s-urbaniak Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions pkg/oauth2/token_source.go
View file
Open in desktop
Expand Up @@ -7,9 +7,23 @@ import (
"sync"
"time"

"github.com/prometheus/client_golang/prometheus"
"golang.org/x/oauth2"
)

var (
grantsTotal = prometheus.NewCounter(
prometheus.CounterOpts{
Name: "password_credentials_grants_total",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should have a telemeter_ prefix

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed, ptal

Help: "Tracks the number of resource owner password credential grants.",
},
)
)

func init() {
prometheus.MustRegister(grantsTotal)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we not use the global registry? I'd like us to generally move away from this pattern, and we should be a role model for the rest of the teams.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea. we can do a head-start here 👍 I suggest to dependency-inject the registry here, then gradually factor all the other places, wdyt?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that works for me

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed, ptal

}

type passwordCredentialsTokenSource struct {
ctx context.Context
cfg *oauth2.Config
Expand Down Expand Up @@ -81,6 +95,8 @@ func (c *passwordCredentialsTokenSource) Token() (*oauth2.Token, error) {
}

func (c *passwordCredentialsTokenSource) passwordCredentialsToken() (*oauth2.Token, error) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn’t happen too often, but it would be good to know when it does. Let’s add a counter metric to understand how often this happens.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agreed 👍 added a metric, PTAL

grantsTotal.Inc()

tok, err := c.cfg.PasswordCredentialsToken(c.ctx, c.username, c.password)
if err != nil {
return nil, fmt.Errorf("password credentials token source failed: %v", err)
Expand Down