[chore] Move memorylimiter dependencies under one module (open-teleme…

…try#11419) This PR only moves all the internal code used by internal/memorylimiter under the same directory, next PR will extract that in a different module to limit dependencies. Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
bogdandrutu · Oct 12, 2024 · 35d4156 · 35d4156
1 parent be5fc23
commit 35d4156
Show file tree

Hide file tree

Showing 44 changed files with 14 additions and 14 deletions.
diff --git a/extension/memorylimiterextension/memorylimiter_test.go b/extension/memorylimiterextension/memorylimiter_test.go
@@ -14,8 +14,8 @@ import (
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/internal/iruntime"
 	"go.opentelemetry.io/collector/internal/memorylimiter"
+	"go.opentelemetry.io/collector/internal/memorylimiter/iruntime"
 )
 
 func TestMemoryPressureResponse(t *testing.T) {

diff --git a/internal/cgroups/cgroup.go → internal/memorylimiter/cgroups/cgroup.go b/internal/cgroups/cgroup.go → internal/memorylimiter/cgroups/cgroup.go
@@ -25,7 +25,7 @@
 
 //go:build linux
 
-package cgroups // import "go.opentelemetry.io/collector/internal/cgroups"
+package cgroups // import "go.opentelemetry.io/collector/internal/memorylimiter/cgroups"
 
 import (
 	"bufio"

diff --git a/internal/cgroups/cgroup_test.go → ...rnal/memorylimiter/cgroups/cgroup_test.go b/internal/cgroups/cgroup_test.go → ...rnal/memorylimiter/cgroups/cgroup_test.go
diff --git a/internal/cgroups/cgroups.go → internal/memorylimiter/cgroups/cgroups.go b/internal/cgroups/cgroups.go → internal/memorylimiter/cgroups/cgroups.go
@@ -25,7 +25,7 @@
 
 //go:build linux
 
-package cgroups // import "go.opentelemetry.io/collector/internal/cgroups"
+package cgroups // import "go.opentelemetry.io/collector/internal/memorylimiter/cgroups"
 import (
 	"bufio"
 	"io"

diff --git a/internal/cgroups/cgroups_test.go → ...nal/memorylimiter/cgroups/cgroups_test.go b/internal/cgroups/cgroups_test.go → ...nal/memorylimiter/cgroups/cgroups_test.go
diff --git a/internal/cgroups/doc.go → internal/memorylimiter/cgroups/doc.go b/internal/cgroups/doc.go → internal/memorylimiter/cgroups/doc.go
@@ -26,4 +26,4 @@
 // Package cgroups provides utilities to access Linux control group (CGroups)
 // parameters (total memory, for example) for a given process.
 // The original implementation is taken from https://github.com/uber-go/automaxprocs
-package cgroups // import "go.opentelemetry.io/collector/internal/cgroups"
+package cgroups // import "go.opentelemetry.io/collector/internal/memorylimiter/cgroups"
diff --git a/internal/cgroups/errors.go → internal/memorylimiter/cgroups/errors.go b/internal/cgroups/errors.go → internal/memorylimiter/cgroups/errors.go
@@ -25,7 +25,7 @@
 
 //go:build linux
 
-package cgroups // import "go.opentelemetry.io/collector/internal/cgroups"
+package cgroups // import "go.opentelemetry.io/collector/internal/memorylimiter/cgroups"
 
 import "fmt"
 

diff --git a/internal/cgroups/mountpoint.go → internal/memorylimiter/cgroups/mountpoint.go b/internal/cgroups/mountpoint.go → internal/memorylimiter/cgroups/mountpoint.go
@@ -25,7 +25,7 @@
 
 //go:build linux
 
-package cgroups // import "go.opentelemetry.io/collector/internal/cgroups"
+package cgroups // import "go.opentelemetry.io/collector/internal/memorylimiter/cgroups"
 
 import (
 	"bufio"

diff --git a/internal/cgroups/mountpoint_test.go → .../memorylimiter/cgroups/mountpoint_test.go b/internal/cgroups/mountpoint_test.go → .../memorylimiter/cgroups/mountpoint_test.go
diff --git a/internal/cgroups/package_test.go → ...nal/memorylimiter/cgroups/package_test.go b/internal/cgroups/package_test.go → ...nal/memorylimiter/cgroups/package_test.go
diff --git a/internal/cgroups/subsys.go → internal/memorylimiter/cgroups/subsys.go b/internal/cgroups/subsys.go → internal/memorylimiter/cgroups/subsys.go
@@ -25,7 +25,7 @@
 
 //go:build linux
 
-package cgroups // import "go.opentelemetry.io/collector/internal/cgroups"
+package cgroups // import "go.opentelemetry.io/collector/internal/memorylimiter/cgroups"
 
 import (
 	"bufio"

diff --git a/internal/cgroups/subsys_test.go → ...rnal/memorylimiter/cgroups/subsys_test.go b/internal/cgroups/subsys_test.go → ...rnal/memorylimiter/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/...data/cgroups/memory/memory.limit_in_bytes → ...data/cgroups/memory/memory.limit_in_bytes b/...data/cgroups/memory/memory.limit_in_bytes → ...data/cgroups/memory/memory.limit_in_bytes
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/...oups/testdata/cgroups/v2/empty/memory.max → ...oups/testdata/cgroups/v2/empty/memory.max b/...oups/testdata/cgroups/v2/empty/memory.max → ...oups/testdata/cgroups/v2/empty/memory.max
diff --git a/...ps/testdata/cgroups/v2/invalid/memory.max → ...ps/testdata/cgroups/v2/invalid/memory.max b/...ps/testdata/cgroups/v2/invalid/memory.max → ...ps/testdata/cgroups/v2/invalid/memory.max
diff --git a/...ups/testdata/cgroups/v2/memory/memory.max → ...ups/testdata/cgroups/v2/memory/memory.max b/...ups/testdata/cgroups/v2/memory/memory.max → ...ups/testdata/cgroups/v2/memory/memory.max
diff --git a/.../testdata/cgroups/v2/undefined/memory.max → .../testdata/cgroups/v2/undefined/memory.max b/.../testdata/cgroups/v2/undefined/memory.max → .../testdata/cgroups/v2/undefined/memory.max
diff --git a/...rnal/cgroups/testdata/proc/cgroups/cgroup → ...iter/cgroups/testdata/proc/cgroups/cgroup b/...rnal/cgroups/testdata/proc/cgroups/cgroup → ...iter/cgroups/testdata/proc/cgroups/cgroup
diff --git a/...l/cgroups/testdata/proc/cgroups/mountinfo → ...r/cgroups/testdata/proc/cgroups/mountinfo b/...l/cgroups/testdata/proc/cgroups/mountinfo → ...r/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/...roups/testdata/proc/v2/cgroupv1/mountinfo → ...roups/testdata/proc/v2/cgroupv1/mountinfo b/...roups/testdata/proc/v2/cgroupv1/mountinfo → ...roups/testdata/proc/v2/cgroupv1/mountinfo
diff --git a/...ups/testdata/proc/v2/cgroupv1v2/mountinfo → ...ups/testdata/proc/v2/cgroupv1v2/mountinfo b/...ups/testdata/proc/v2/cgroupv1v2/mountinfo → ...ups/testdata/proc/v2/cgroupv1v2/mountinfo
diff --git a/...roups/testdata/proc/v2/cgroupv2/mountinfo → ...roups/testdata/proc/v2/cgroupv2/mountinfo b/...roups/testdata/proc/v2/cgroupv2/mountinfo → ...roups/testdata/proc/v2/cgroupv2/mountinfo
diff --git a/internal/cgroups/util_test.go → internal/memorylimiter/cgroups/util_test.go b/internal/cgroups/util_test.go → internal/memorylimiter/cgroups/util_test.go
diff --git a/internal/iruntime/mem_info.go → internal/memorylimiter/iruntime/mem_info.go b/internal/iruntime/mem_info.go → internal/memorylimiter/iruntime/mem_info.go
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package iruntime // import "go.opentelemetry.io/collector/internal/iruntime"
+package iruntime // import "go.opentelemetry.io/collector/internal/memorylimiter/iruntime"
 
 import (
 	"github.com/shirou/gopsutil/v4/mem"

diff --git a/internal/iruntime/mem_info_test.go → ...l/memorylimiter/iruntime/mem_info_test.go b/internal/iruntime/mem_info_test.go → ...l/memorylimiter/iruntime/mem_info_test.go
diff --git a/internal/iruntime/package_test.go → ...al/memorylimiter/iruntime/package_test.go b/internal/iruntime/package_test.go → ...al/memorylimiter/iruntime/package_test.go
diff --git a/internal/iruntime/total_memory_linux.go → ...orylimiter/iruntime/total_memory_linux.go b/internal/iruntime/total_memory_linux.go → ...orylimiter/iruntime/total_memory_linux.go
@@ -3,9 +3,9 @@
 
 //go:build linux
 
-package iruntime // import "go.opentelemetry.io/collector/internal/iruntime"
+package iruntime // import "go.opentelemetry.io/collector/internal/memorylimiter/iruntime"
 
-import "go.opentelemetry.io/collector/internal/cgroups"
+import "go.opentelemetry.io/collector/internal/memorylimiter/cgroups"
 
 // unlimitedMemorySize defines the bytes size when memory limit is not set
 // for the container and process with cgroups

diff --git a/internal/iruntime/total_memory_linux_test.go → ...miter/iruntime/total_memory_linux_test.go b/internal/iruntime/total_memory_linux_test.go → ...miter/iruntime/total_memory_linux_test.go
diff --git a/internal/iruntime/total_memory_other.go → ...orylimiter/iruntime/total_memory_other.go b/internal/iruntime/total_memory_other.go → ...orylimiter/iruntime/total_memory_other.go
@@ -3,7 +3,7 @@
 
 //go:build !linux
 
-package iruntime // import "go.opentelemetry.io/collector/internal/iruntime"
+package iruntime // import "go.opentelemetry.io/collector/internal/memorylimiter/iruntime"
 
 // TotalMemory returns total available memory for non-linux platforms.
 func TotalMemory() (uint64, error) {

diff --git a/internal/iruntime/total_memory_other_test.go → ...miter/iruntime/total_memory_other_test.go b/internal/iruntime/total_memory_other_test.go → ...miter/iruntime/total_memory_other_test.go
diff --git a/internal/memorylimiter/memorylimiter.go b/internal/memorylimiter/memorylimiter.go
@@ -15,7 +15,7 @@ import (
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/internal/iruntime"
+	"go.opentelemetry.io/collector/internal/memorylimiter/iruntime"
 )
 
 const (

diff --git a/internal/memorylimiter/memorylimiter_test.go b/internal/memorylimiter/memorylimiter_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
-	"go.opentelemetry.io/collector/internal/iruntime"
+	"go.opentelemetry.io/collector/internal/memorylimiter/iruntime"
 )
 
 // TestMemoryPressureResponse manipulates results from querying memory and

diff --git a/processor/memorylimiterprocessor/memorylimiter_test.go b/processor/memorylimiterprocessor/memorylimiter_test.go
@@ -15,8 +15,8 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/consumer/consumertest"
-	"go.opentelemetry.io/collector/internal/iruntime"
 	"go.opentelemetry.io/collector/internal/memorylimiter"
+	"go.opentelemetry.io/collector/internal/memorylimiter/iruntime"
 	"go.opentelemetry.io/collector/pdata/plog"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.opentelemetry.io/collector/pdata/ptrace"