Skip to content

Backport of feat: add no-op reporting background routine into release/1.15.x #17196

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

Merged
hc-github-team-consul-core merged 1 commit into from
Apr 29, 2023
Merged

Backport of feat: add no-op reporting background routine into release/1.15.x #17196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions agent/consul/reporting/reporting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,26 @@ package reporting

import (
"sync"
"time"

"github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-memdb"
)

type ReportingManager struct {
logger hclog.Logger
server ServerDelegate
logger hclog.Logger
server ServerDelegate
stateProvider StateDelegate
tickerInterval time.Duration
EntDeps
sync.RWMutex
}

const (
SystemMetadataReportingProcessID = "reporting-process-id"
ReportingInterval = 1 * time.Hour
)

//go:generate mockery --name ServerDelegate --inpackage
Expand All @@ -24,10 +31,17 @@ type ServerDelegate interface {
IsLeader() bool
}

func NewReportingManager(logger hclog.Logger, deps EntDeps, server ServerDelegate) *ReportingManager {
type StateDelegate interface {
NodeUsage() (uint64, state.NodeUsage, error)
ServiceUsage(ws memdb.WatchSet) (uint64, structs.ServiceUsage, error)
}

func NewReportingManager(logger hclog.Logger, deps EntDeps, server ServerDelegate, stateProvider StateDelegate) *ReportingManager {
rm := &ReportingManager{
logger: logger.Named("reporting"),
server: server,
logger: logger.Named("reporting"),
server: server,
stateProvider: stateProvider,
tickerInterval: ReportingInterval,
}
err := rm.initEnterpriseReporting(deps)
if err != nil {
Expand Down
8 changes: 8 additions & 0 deletions agent/consul/reporting/reporting_oss.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

package reporting

import (
"context"
)

type EntDeps struct{}

func (rm *ReportingManager) initEnterpriseReporting(entDeps EntDeps) error {
Expand All @@ -19,3 +23,7 @@ func (rm *ReportingManager) StopReportingAgent() error {
// no op
return nil
}

func (m *ReportingManager) Run(ctx context.Context) {
// no op
}
3 changes: 2 additions & 1 deletion agent/consul/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,8 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server, incom
s.overviewManager = NewOverviewManager(s.logger, s.fsm, s.config.MetricsReportingInterval)
go s.overviewManager.Run(&lib.StopChannelContext{StopCh: s.shutdownCh})

s.reportingManager = reporting.NewReportingManager(s.logger, getEnterpriseReportingDeps(flat), s)
s.reportingManager = reporting.NewReportingManager(s.logger, getEnterpriseReportingDeps(flat), s, s.fsm.State())
go s.reportingManager.Run(&lib.StopChannelContext{StopCh: s.shutdownCh})

// Initialize external gRPC server - register services on external gRPC server.
s.externalACLServer = aclgrpc.NewServer(aclgrpc.Config{
Expand Down