Skip to content

refactor(memory): name the domain memory, not mem #568

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
retr0h wants to merge 1 commit into from
Closed

refactor(memory): name the domain memory, not mem #568

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
16 changes: 8 additions & 8 deletions cmd/agent_setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import (
nodeHost "github.com/osapi-io/osapi/internal/provider/node/host"
"github.com/osapi-io/osapi/internal/provider/node/load"
logProv "github.com/osapi-io/osapi/internal/provider/node/log"
"github.com/osapi-io/osapi/internal/provider/node/mem"
"github.com/osapi-io/osapi/internal/provider/node/memory"
ntpProv "github.com/osapi-io/osapi/internal/provider/node/ntp"
powerProv "github.com/osapi-io/osapi/internal/provider/node/power"
processProv "github.com/osapi-io/osapi/internal/provider/node/process"
Expand Down Expand Up @@ -114,14 +114,14 @@ func setupAgent(
diskProvider = disk.NewLinuxProvider()
}

var memProvider mem.Provider
var memoryProvider memory.Provider
switch plat {
case "debian":
memProvider = mem.NewDebianProvider()
memoryProvider = memory.NewDebianProvider()
case "darwin":
memProvider = mem.NewDarwinProvider()
memoryProvider = memory.NewDarwinProvider()
default:
memProvider = mem.NewLinuxProvider()
memoryProvider = memory.NewLinuxProvider()
}

var loadProvider load.Provider
Expand Down Expand Up @@ -235,7 +235,7 @@ func setupAgent(
agent.NewNodeProcessor(
hostProvider,
diskProvider,
memProvider,
memoryProvider,
loadProvider,
sysctlProvider,
ntpProvider,
Expand All @@ -251,7 +251,7 @@ func setupAgent(
),
hostProvider,
diskProvider,
memProvider,
memoryProvider,
loadProvider,
sysctlProvider,
ntpProvider,
Expand Down Expand Up @@ -313,7 +313,7 @@ func setupAgent(
streamName,
hostProvider,
diskProvider,
memProvider,
memoryProvider,
loadProvider,
netinfoProvider,
process.New(),
Expand Down
6 changes: 3 additions & 3 deletions internal/agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
"github.com/osapi-io/osapi/internal/provider/node/disk"
nodeHost "github.com/osapi-io/osapi/internal/provider/node/host"
"github.com/osapi-io/osapi/internal/provider/node/load"
"github.com/osapi-io/osapi/internal/provider/node/mem"
"github.com/osapi-io/osapi/internal/provider/node/memory"
"github.com/osapi-io/osapi/internal/telemetry/process"
)

Expand All @@ -52,7 +52,7 @@ func New(
streamName string,
hostProvider nodeHost.Provider,
diskProvider disk.Provider,
memProvider mem.Provider,
memoryProvider memory.Provider,
loadProvider load.Provider,
netinfoProvider netinfo.Provider,
processProvider process.Provider,
Expand All @@ -70,7 +70,7 @@ func New(
streamName: streamName,
hostProvider: hostProvider,
diskProvider: diskProvider,
memProvider: memProvider,
memoryProvider: memoryProvider,
loadProvider: loadProvider,
netinfoProvider: netinfoProvider,
processProvider: processProvider,
Expand Down
12 changes: 6 additions & 6 deletions internal/agent/agent_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import (
diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks"
hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks"
loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks"
memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks"
memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks"
"github.com/osapi-io/osapi/internal/telemetry/metrics"
processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks"
)
Expand Down Expand Up @@ -132,7 +132,7 @@ func (s *AgentPublicTestSuite) buildAgent() *agent.Agent {
streamName: "test-stream",
hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl),
diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl),
memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl),
memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl),
loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl),
dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl),
pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl),
Expand Down Expand Up @@ -239,7 +239,7 @@ func (s *AgentPublicTestSuite) TestStart() {
streamName: "test-stream",
hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl),
diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl),
memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl),
memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl),
loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl),
dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl),
pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl),
Expand Down Expand Up @@ -285,7 +285,7 @@ func (s *AgentPublicTestSuite) TestStart() {
streamName: "test-stream",
hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl),
diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl),
memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl),
memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl),
loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl),
dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl),
pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl),
Expand Down Expand Up @@ -327,7 +327,7 @@ func (s *AgentPublicTestSuite) TestStart() {
streamName: "test-stream",
hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl),
diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl),
memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl),
memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl),
loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl),
dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl),
pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl),
Expand Down Expand Up @@ -389,7 +389,7 @@ func (s *AgentPublicTestSuite) TestStart() {
streamName: "test-stream",
hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl),
diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl),
memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl),
memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl),
loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl),
dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl),
pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl),
Expand Down
4 changes: 2 additions & 2 deletions internal/agent/condition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/osapi-io/osapi/internal/job"
"github.com/osapi-io/osapi/internal/provider/node/disk"
"github.com/osapi-io/osapi/internal/provider/node/load"
"github.com/osapi-io/osapi/internal/provider/node/mem"
"github.com/osapi-io/osapi/internal/provider/node/memory"
)

// findPrevCondition returns the previous condition of the given type,
Expand Down Expand Up @@ -60,7 +60,7 @@ func transitionTime(
}

func evaluateMemoryPressure(
stats *mem.Result,
stats *memory.Result,
threshold int,
prev []job.Condition,
) job.Condition {
Expand Down
20 changes: 10 additions & 10 deletions internal/agent/condition_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/osapi-io/osapi/internal/job"
"github.com/osapi-io/osapi/internal/provider/node/disk"
"github.com/osapi-io/osapi/internal/provider/node/load"
"github.com/osapi-io/osapi/internal/provider/node/mem"
"github.com/osapi-io/osapi/internal/provider/node/memory"
)

type ConditionPublicTestSuite struct {
Expand Down Expand Up @@ -191,14 +191,14 @@ func (s *ConditionPublicTestSuite) TestTransitionTime() {
func (s *ConditionPublicTestSuite) TestEvaluateMemoryPressure() {
tests := []struct {
name string
stats *mem.Result
stats *memory.Result
threshold int
prev []job.Condition
validateFunc func(job.Condition)
}{
{
name: "when usage above threshold returns true with reason",
stats: &mem.Result{
stats: &memory.Result{
Total: 8 * 1024 * 1024 * 1024, // 8 GB
Available: 1 * 1024 * 1024 * 1024, // 1 GB available = 87.5% used
},
Expand All @@ -214,7 +214,7 @@ func (s *ConditionPublicTestSuite) TestEvaluateMemoryPressure() {
},
{
name: "when usage below threshold returns false",
stats: &mem.Result{
stats: &memory.Result{
Total: 8 * 1024 * 1024 * 1024, // 8 GB
Available: 6 * 1024 * 1024 * 1024, // 6 GB available = 25% used
},
Expand All @@ -239,7 +239,7 @@ func (s *ConditionPublicTestSuite) TestEvaluateMemoryPressure() {
},
{
name: "when total is zero returns false",
stats: &mem.Result{
stats: &memory.Result{
Total: 0,
Available: 0,
},
Expand All @@ -253,7 +253,7 @@ func (s *ConditionPublicTestSuite) TestEvaluateMemoryPressure() {
},
{
name: "when usage exactly at threshold returns false",
stats: &mem.Result{
stats: &memory.Result{
Total: 100,
Available: 20, // 80% used, threshold is 80 (> not >=)
},
Expand Down Expand Up @@ -511,7 +511,7 @@ func (s *ConditionPublicTestSuite) TestLastTransitionTimeTracking() {
name: "when status flips from false to true transition time updates",
evalFunc: func(prev []job.Condition) job.Condition {
return agent.ExportEvaluateMemoryPressure(
&mem.Result{
&memory.Result{
Total: 100,
Available: 10, // 90% used
},
Expand All @@ -536,7 +536,7 @@ func (s *ConditionPublicTestSuite) TestLastTransitionTimeTracking() {
name: "when status stays true transition time is preserved",
evalFunc: func(prev []job.Condition) job.Condition {
return agent.ExportEvaluateMemoryPressure(
&mem.Result{
&memory.Result{
Total: 100,
Available: 10, // 90% used
},
Expand All @@ -560,7 +560,7 @@ func (s *ConditionPublicTestSuite) TestLastTransitionTimeTracking() {
name: "when status flips from true to false transition time updates",
evalFunc: func(prev []job.Condition) job.Condition {
return agent.ExportEvaluateMemoryPressure(
&mem.Result{
&memory.Result{
Total: 100,
Available: 80, // 20% used
},
Expand All @@ -585,7 +585,7 @@ func (s *ConditionPublicTestSuite) TestLastTransitionTimeTracking() {
name: "when status stays false transition time is preserved",
evalFunc: func(prev []job.Condition) job.Condition {
return agent.ExportEvaluateMemoryPressure(
&mem.Result{
&memory.Result{
Total: 100,
Available: 80, // 20% used
},
Expand Down
4 changes: 2 additions & 2 deletions internal/agent/consumer_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks"
hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks"
loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks"
memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks"
memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks"
processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks"
)

Expand Down Expand Up @@ -83,7 +83,7 @@ func (s *ConsumerPublicTestSuite) SetupTest() {
streamName: "test-stream",
hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl),
diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl),
memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl),
memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl),
loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl),
dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl),
pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl),
Expand Down
4 changes: 2 additions & 2 deletions internal/agent/drain_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks"
hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks"
loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks"
memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks"
memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks"
processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks"
)

Expand Down Expand Up @@ -70,7 +70,7 @@ func (s *DrainPublicTestSuite) SetupTest() {
streamName: "test-stream",
hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl),
diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl),
memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl),
memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl),
loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl),
dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl),
pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl),
Expand Down
2 changes: 1 addition & 1 deletion internal/agent/enrollment_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (suite *EnrollmentPublicTestSuite) TestHandlePKIEnrollment() {
"", // streamName
nil, // hostProvider
nil, // diskProvider
nil, // memProvider
nil, // memoryProvider
nil, // loadProvider
nil, // netinfoProvider
nil, // processProvider
Expand Down
12 changes: 6 additions & 6 deletions internal/agent/export_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import (
diskProv "github.com/osapi-io/osapi/internal/provider/node/disk"
nodeHost "github.com/osapi-io/osapi/internal/provider/node/host"
"github.com/osapi-io/osapi/internal/provider/node/load"
memProv "github.com/osapi-io/osapi/internal/provider/node/mem"
memory "github.com/osapi-io/osapi/internal/provider/node/memory"
"github.com/osapi-io/osapi/internal/provider/node/ntp"
"github.com/osapi-io/osapi/internal/provider/node/power"
"github.com/osapi-io/osapi/internal/provider/node/sysctl"
Expand Down Expand Up @@ -290,7 +290,7 @@ func ExportTransitionTime(

// ExportEvaluateMemoryPressure exposes the private evaluateMemoryPressure function for testing.
func ExportEvaluateMemoryPressure(
stats *memProv.Result,
stats *memory.Result,
threshold int,
prev []job.Condition,
) job.Condition {
Expand Down Expand Up @@ -470,7 +470,7 @@ func SetAgentAppConfig(
a.registry.processors["node"] = NewNodeProcessor(
a.hostProvider,
a.diskProvider,
a.memProvider,
a.memoryProvider,
a.loadProvider,
sysctl.Provider(nil),
ntp.Provider(nil),
Expand Down Expand Up @@ -508,7 +508,7 @@ func SetAgentHostProvider(
a.registry.processors["node"] = NewNodeProcessor(
p,
a.diskProvider,
a.memProvider,
a.memoryProvider,
a.loadProvider,
sysctl.Provider(nil),
ntp.Provider(nil),
Expand Down Expand Up @@ -558,8 +558,8 @@ func ExportGetDiskProvider(
// ExportGetMemProvider returns the mem provider from the registry for testing.
func ExportGetMemProvider(
a *Agent,
) memProv.Provider {
return a.memProvider
) memory.Provider {
return a.memoryProvider
}

// ExportGetLoadProvider returns the load provider from the registry for testing.
Expand Down
4 changes: 2 additions & 2 deletions internal/agent/facts_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (
diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks"
hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks"
loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks"
memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks"
memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks"
processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks"
)

Expand Down Expand Up @@ -76,7 +76,7 @@ func (s *FactsPublicTestSuite) SetupTest() {
streamName: "test-stream",
hostProvider: s.mockHostProvider,
diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl),
memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl),
memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl),
loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl),
dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl),
pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl),
Expand Down
4 changes: 2 additions & 2 deletions internal/agent/handler_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import (
diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks"
hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks"
loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks"
memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks"
memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks"
"github.com/osapi-io/osapi/internal/telemetry/metrics"
processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks"
)
Expand Down Expand Up @@ -128,7 +128,7 @@ func (s *HandlerPublicTestSuite) SetupTest() {
streamName: "test-stream",
hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl),
diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl),
memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl),
memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl),
loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl),
dnsProvider: dnsMock,
pingProvider: pingMock,
Expand Down
6 changes: 3 additions & 3 deletions internal/agent/heartbeat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/osapi-io/osapi/internal/job"
"github.com/osapi-io/osapi/internal/provider/node/disk"
"github.com/osapi-io/osapi/internal/provider/node/load"
"github.com/osapi-io/osapi/internal/provider/node/mem"
"github.com/osapi-io/osapi/internal/provider/node/memory"
"github.com/osapi-io/osapi/internal/telemetry/process"
)

Expand Down Expand Up @@ -145,8 +145,8 @@ func (a *Agent) writeRegistration(
reg.LoadAverages = avg
}

var memStats *mem.Result
if stats, err := a.memProvider.GetStats(); err == nil {
var memStats *memory.Result
if stats, err := a.memoryProvider.GetStats(); err == nil {
memStats = stats
reg.MemoryStats = stats
}
Expand Down
Loading
Loading