Skip to content

Commit 55412f9

Browse files
acrmpctlongrroberts2222
committed
Add metric tags to desired lrp update (#51)
* Use counterfeiter directives to generate fakes Replace go generate tags with counterfeiter directives to speed up the generation of fakes and remove warning messages from stderr. Co-authored-by: Carson Long <[email protected]> * Regenerate models with protoc v3.21.10 Co-authored-by: Andrew Crump <[email protected]> * Remove unused import from certificate properties proto protoc version is v3.21.10. Resolves the following warning that we were seeing during go generate: ``` certificate_properties.proto:5:1: warning: Import github.com/gogo/protobuf/gogoproto/gogo.proto is unused. ``` Co-authored-by: Carson Long <[email protected]> * Add metric tags to DesiredLRPUpdate cloudfoundry/diego-release#662 Co-authored-by: Andrew Crump <[email protected]> * Persist metric tags on Desired LRP Update - Overwrite any existing metric tags. - If metric tags are not provided in the message then don't update them. - We don't believe that CreatedAt is in use anymore, we believe we are ok to pass in db.clock.Now() when re-generating the RunInfo. cloudfoundry/diego-release#662 Co-authored-by: Carson Long <[email protected]> * Remove CreateComponents from DesiredLRP We don't believe that this has been in use since the removal of ETCD in 09fd338. Co-authored-by: Andrew Crump <[email protected]> * New revision of UpdateDesiredLRP - Adds UpdateDesiredLRP_r1 with support for metric tags - UpdateDesiredLRP_r0 ignores the metric tags field if provided cloudfoundry/diego-release#662 Signed-off-by: Rebecca Roberts <[email protected]> * Document update desired LRP r1 cloudfoundry/diego-release#662 Co-authored-by: Andrew Crump <[email protected]> * Remove redundant type information * Add metric tags to example DesiredLRPUpdateRequest cloudfoundry/diego-release#662 * Revert revision bump of desired lrp update endpoint Reverts the following commits: - 1e131b5 - feeab5a cloudfoundry/diego-release#662 Co-authored-by: Andrew Crump <[email protected]> Signed-off-by: Rebecca Roberts <[email protected]> Co-authored-by: Carson Long <[email protected]> Co-authored-by: Rebecca Roberts <[email protected]>
1 parent 48cb0a7 commit 55412f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+556
-214
lines changed

client.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ const (
3535

3636
var EndpointNotFoundErr = models.NewError(models.Error_InvalidResponse, fmt.Sprintf(InvalidResponseMessage, 404))
3737

38-
//go:generate counterfeiter -o fake_bbs/fake_internal_client.go . InternalClient
39-
//go:generate counterfeiter -o fake_bbs/fake_client.go . Client
38+
//go:generate counterfeiter -generate
39+
40+
//counterfeiter:generate -o fake_bbs/fake_internal_client.go . InternalClient
41+
//counterfeiter:generate -o fake_bbs/fake_client.go . Client
4042

4143
/*
4244
The InternalClient interface exposes all available endpoints of the BBS server,
@@ -154,7 +156,7 @@ type ExternalActualLRPClient interface {
154156
}
155157

156158
/*
157-
The ExternalDesiredLRPClient is used to access and manipulate Disired LRPs.
159+
The ExternalDesiredLRPClient is used to access and manipulate Desired LRPs.
158160
*/
159161
type ExternalDesiredLRPClient interface {
160162
// Lists all DesiredLRPs that match the given DesiredLRPFilter

controllers/lrp_convergence_controller.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ import (
1717
"code.cloudfoundry.org/workpool"
1818
)
1919

20-
//go:generate counterfeiter -o fakes/fake_retirer.go . Retirer
20+
//go:generate counterfeiter -generate
21+
22+
//counterfeiter:generate -o fakes/fake_retirer.go . Retirer
2123
type Retirer interface {
2224
RetireActualLRP(ctx context.Context, logger lager.Logger, key *models.ActualLRPKey) error
2325
}

converger/converger.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ import (
1414
"code.cloudfoundry.org/clock"
1515
)
1616

17-
//go:generate counterfeiter -o fake_controllers/fake_lrp_convergence_controller.go . LrpConvergenceController
17+
//go:generate counterfeiter -generate
18+
19+
//counterfeiter:generate -o fake_controllers/fake_lrp_convergence_controller.go . LrpConvergenceController
1820
type LrpConvergenceController interface {
1921
ConvergeLRPs(ctx context.Context, logger lager.Logger)
2022
}
2123

22-
//go:generate counterfeiter -o fake_controllers/fake_task_controller.go . TaskController
24+
//counterfeiter:generate -o fake_controllers/fake_task_controller.go . TaskController
2325
type TaskController interface {
2426
ConvergeTasks(ctx context.Context, logger lager.Logger, kickTaskDuration, expirePendingTaskDuration, expireCompletedTaskDuration time.Duration) error
2527
}

db/actual_lrp_db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"code.cloudfoundry.org/lager"
88
)
99

10-
//go:generate counterfeiter . ActualLRPDB
10+
//counterfeiter:generate . ActualLRPDB
1111

1212
type ActualLRPDB interface {
1313
ActualLRPs(ctx context.Context, logger lager.Logger, filter models.ActualLRPFilter) ([]*models.ActualLRP, error)

db/db.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package db
22

3-
//go:generate counterfeiter . DB
3+
//go:generate counterfeiter -generate
4+
5+
//counterfeiter:generate . DB
46

57
type DB interface {
68
DomainDB

db/desired_lrp_db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"code.cloudfoundry.org/lager"
88
)
99

10-
//go:generate counterfeiter . DesiredLRPDB
10+
//counterfeiter:generate . DesiredLRPDB
1111

1212
type DesiredLRPDB interface {
1313
DesiredLRPs(ctx context.Context, logger lager.Logger, filter models.DesiredLRPFilter) ([]*models.DesiredLRP, error)

db/domain_db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"code.cloudfoundry.org/lager"
77
)
88

9-
//go:generate counterfeiter . DomainDB
9+
//counterfeiter:generate . DomainDB
1010
type DomainDB interface {
1111
FreshDomains(ctx context.Context, logger lager.Logger) ([]string, error)
1212
UpsertDomain(ctx context.Context, lgger lager.Logger, domain string, ttl uint32) error

db/encryption_db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"code.cloudfoundry.org/lager"
77
)
88

9-
//go:generate counterfeiter . EncryptionDB
9+
//counterfeiter:generate . EncryptionDB
1010

1111
type EncryptionDB interface {
1212
EncryptionKeyLabel(ctx context.Context, logger lager.Logger) (string, error)

db/evacuation_db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"code.cloudfoundry.org/lager"
88
)
99

10-
//go:generate counterfeiter . EvacuationDB
10+
//counterfeiter:generate . EvacuationDB
1111

1212
type EvacuationDB interface {
1313
RemoveEvacuatingActualLRP(context.Context, lager.Logger, *models.ActualLRPKey, *models.ActualLRPInstanceKey) error

db/lrp_db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type ActualLRPKeyWithInternalRoutes struct {
1414
DesiredInternalRoutes internalroutes.InternalRoutes
1515
}
1616

17-
//go:generate counterfeiter . LRPDB
17+
//counterfeiter:generate . LRPDB
1818

1919
type ConvergenceResult struct {
2020
MissingLRPKeys []*models.ActualLRPKeyWithSchedulingInfo

0 commit comments

Comments
 (0)