move cgroup and iruntime utils from memory_limiter to internal foler (#…

…3448)
open-telemetry · Jun 16, 2021 · b06ffe5 · b06ffe5
1 parent 05f16c5
commit b06ffe5
Show file tree

Hide file tree

Showing 30 changed files with 5 additions and 5 deletions.
diff --git a/.../memorylimiter/internal/cgroups/cgroup.go → internal/cgroups/cgroup.go b/.../memorylimiter/internal/cgroups/cgroup.go → internal/cgroups/cgroup.go
diff --git a/...rylimiter/internal/cgroups/cgroup_test.go → internal/cgroups/cgroup_test.go b/...rylimiter/internal/cgroups/cgroup_test.go → internal/cgroups/cgroup_test.go
diff --git a/...memorylimiter/internal/cgroups/cgroups.go → internal/cgroups/cgroups.go b/...memorylimiter/internal/cgroups/cgroups.go → internal/cgroups/cgroups.go
@@ -109,12 +109,12 @@ func NewCGroupsForCurrentProcess() (CGroups, error) {
 // It is a result of `memory.limit_in_bytes`. If the value of
 // `memory.limit_in_bytes` was not set (-1), the method returns `(-1, false, nil)`.
 func (cg CGroups) MemoryQuota() (int64, bool, error) {
-	cpuCGroup, exists := cg[_cgroupSubsysMemory]
+	memCGroup, exists := cg[_cgroupSubsysMemory]
 	if !exists {
 		return -1, false, nil
 	}
 
-	memLimitBytes, err := cpuCGroup.readInt(_cgroupMemoryLimitBytes)
+	memLimitBytes, err := memCGroup.readInt(_cgroupMemoryLimitBytes)
 	if defined := memLimitBytes > 0; err != nil || !defined {
 		return -1, defined, err
 	}

diff --git a/...ylimiter/internal/cgroups/cgroups_test.go → internal/cgroups/cgroups_test.go b/...ylimiter/internal/cgroups/cgroups_test.go → internal/cgroups/cgroups_test.go
diff --git a/...sor/memorylimiter/internal/cgroups/doc.go → internal/cgroups/doc.go b/...sor/memorylimiter/internal/cgroups/doc.go → internal/cgroups/doc.go
diff --git a/.../memorylimiter/internal/cgroups/errors.go → internal/cgroups/errors.go b/.../memorylimiter/internal/cgroups/errors.go → internal/cgroups/errors.go
diff --git a/...orylimiter/internal/cgroups/mountpoint.go → internal/cgroups/mountpoint.go b/...orylimiter/internal/cgroups/mountpoint.go → internal/cgroups/mountpoint.go
diff --git a/...miter/internal/cgroups/mountpoint_test.go → internal/cgroups/mountpoint_test.go b/...miter/internal/cgroups/mountpoint_test.go → internal/cgroups/mountpoint_test.go
diff --git a/.../memorylimiter/internal/cgroups/subsys.go → internal/cgroups/subsys.go b/.../memorylimiter/internal/cgroups/subsys.go → internal/cgroups/subsys.go
diff --git a/...rylimiter/internal/cgroups/subsys_test.go → internal/cgroups/subsys_test.go b/...rylimiter/internal/cgroups/subsys_test.go → internal/cgroups/subsys_test.go
diff --git a/...ps/testdata/cgroups/cpu/cpu.cfs_period_us → ...ps/testdata/cgroups/cpu/cpu.cfs_period_us b/...ps/testdata/cgroups/cpu/cpu.cfs_period_us → ...ps/testdata/cgroups/cpu/cpu.cfs_period_us
diff --git a/...ups/testdata/cgroups/cpu/cpu.cfs_quota_us → ...ups/testdata/cgroups/cpu/cpu.cfs_quota_us b/...ups/testdata/cgroups/cpu/cpu.cfs_quota_us → ...ups/testdata/cgroups/cpu/cpu.cfs_quota_us
diff --git a/...s/testdata/cgroups/empty/cpu.cfs_quota_us → ...s/testdata/cgroups/empty/cpu.cfs_quota_us b/...s/testdata/cgroups/empty/cpu.cfs_quota_us → ...s/testdata/cgroups/empty/cpu.cfs_quota_us
diff --git a/...testdata/cgroups/invalid/cpu.cfs_quota_us → ...testdata/cgroups/invalid/cpu.cfs_quota_us b/...testdata/cgroups/invalid/cpu.cfs_quota_us → ...testdata/cgroups/invalid/cpu.cfs_quota_us
diff --git a/...cgroups/undefined-period/cpu.cfs_quota_us → ...cgroups/undefined-period/cpu.cfs_quota_us b/...cgroups/undefined-period/cpu.cfs_quota_us → ...cgroups/undefined-period/cpu.cfs_quota_us
diff --git a/...tdata/cgroups/undefined/cpu.cfs_period_us → ...tdata/cgroups/undefined/cpu.cfs_period_us b/...tdata/cgroups/undefined/cpu.cfs_period_us → ...tdata/cgroups/undefined/cpu.cfs_period_us
diff --git a/...stdata/cgroups/undefined/cpu.cfs_quota_us → ...stdata/cgroups/undefined/cpu.cfs_quota_us b/...stdata/cgroups/undefined/cpu.cfs_quota_us → ...stdata/cgroups/undefined/cpu.cfs_quota_us
diff --git a/...rnal/cgroups/testdata/proc/cgroups/cgroup → ...rnal/cgroups/testdata/proc/cgroups/cgroup b/...rnal/cgroups/testdata/proc/cgroups/cgroup → ...rnal/cgroups/testdata/proc/cgroups/cgroup
diff --git a/...l/cgroups/testdata/proc/cgroups/mountinfo → ...l/cgroups/testdata/proc/cgroups/mountinfo b/...l/cgroups/testdata/proc/cgroups/mountinfo → ...l/cgroups/testdata/proc/cgroups/mountinfo
diff --git a/...roups/testdata/proc/invalid-cgroup/cgroup → ...roups/testdata/proc/invalid-cgroup/cgroup b/...roups/testdata/proc/invalid-cgroup/cgroup → ...roups/testdata/proc/invalid-cgroup/cgroup
diff --git a/...testdata/proc/invalid-mountinfo/mountinfo → ...testdata/proc/invalid-mountinfo/mountinfo b/...testdata/proc/invalid-mountinfo/mountinfo → ...testdata/proc/invalid-mountinfo/mountinfo
diff --git a/...roups/testdata/proc/untranslatable/cgroup → ...roups/testdata/proc/untranslatable/cgroup b/...roups/testdata/proc/untranslatable/cgroup → ...roups/testdata/proc/untranslatable/cgroup
diff --git a/...ps/testdata/proc/untranslatable/mountinfo → ...ps/testdata/proc/untranslatable/mountinfo b/...ps/testdata/proc/untranslatable/mountinfo → ...ps/testdata/proc/untranslatable/mountinfo
diff --git a/...morylimiter/internal/cgroups/util_test.go → internal/cgroups/util_test.go b/...morylimiter/internal/cgroups/util_test.go → internal/cgroups/util_test.go
diff --git a/...r/internal/iruntime/total_memory_linux.go → internal/iruntime/total_memory_linux.go b/...r/internal/iruntime/total_memory_linux.go → internal/iruntime/total_memory_linux.go
@@ -16,7 +16,7 @@
 
 package iruntime
 
-import "go.opentelemetry.io/collector/processor/memorylimiter/internal/cgroups"
+import "go.opentelemetry.io/collector/internal/cgroups"
 
 // TotalMemory returns total available memory.
 // This implementation is meant for linux and uses cgroups to determine available memory.

diff --git a/...ernal/iruntime/total_memory_linux_test.go → internal/iruntime/total_memory_linux_test.go b/...ernal/iruntime/total_memory_linux_test.go → internal/iruntime/total_memory_linux_test.go
diff --git a/...r/internal/iruntime/total_memory_other.go → internal/iruntime/total_memory_other.go b/...r/internal/iruntime/total_memory_other.go → internal/iruntime/total_memory_other.go
diff --git a/...ernal/iruntime/total_memory_other_test.go → internal/iruntime/total_memory_other_test.go b/...ernal/iruntime/total_memory_other_test.go → internal/iruntime/total_memory_other_test.go
diff --git a/processor/memorylimiter/memorylimiter.go b/processor/memorylimiter/memorylimiter.go
@@ -26,8 +26,8 @@ import (
 
 	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/consumer/pdata"
+	"go.opentelemetry.io/collector/internal/iruntime"
 	"go.opentelemetry.io/collector/obsreport"
-	"go.opentelemetry.io/collector/processor/memorylimiter/internal/iruntime"
 )
 
 const (

diff --git a/processor/memorylimiter/memorylimiter_test.go b/processor/memorylimiter/memorylimiter_test.go
@@ -29,8 +29,8 @@ import (
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 	"go.opentelemetry.io/collector/consumer/pdata"
+	"go.opentelemetry.io/collector/internal/iruntime"
 	"go.opentelemetry.io/collector/obsreport"
-	"go.opentelemetry.io/collector/processor/memorylimiter/internal/iruntime"
 	"go.opentelemetry.io/collector/processor/processorhelper"
 )