From b06ffe521919b0322fb867e505d8c1602ad9e059 Mon Sep 17 00:00:00 2001 From: Min Xia Date: Wed, 16 Jun 2021 05:38:53 -0700 Subject: [PATCH] move cgroup and iruntime utils from memory_limiter to internal foler (#3448) --- .../memorylimiter/internal => internal}/cgroups/cgroup.go | 0 .../internal => internal}/cgroups/cgroup_test.go | 0 .../memorylimiter/internal => internal}/cgroups/cgroups.go | 4 ++-- .../internal => internal}/cgroups/cgroups_test.go | 0 {processor/memorylimiter/internal => internal}/cgroups/doc.go | 0 .../memorylimiter/internal => internal}/cgroups/errors.go | 0 .../memorylimiter/internal => internal}/cgroups/mountpoint.go | 0 .../internal => internal}/cgroups/mountpoint_test.go | 0 .../memorylimiter/internal => internal}/cgroups/subsys.go | 0 .../internal => internal}/cgroups/subsys_test.go | 0 .../cgroups/testdata/cgroups/cpu/cpu.cfs_period_us | 0 .../cgroups/testdata/cgroups/cpu/cpu.cfs_quota_us | 0 .../cgroups/testdata/cgroups/empty/cpu.cfs_quota_us | 0 .../cgroups/testdata/cgroups/invalid/cpu.cfs_quota_us | 0 .../testdata/cgroups/undefined-period/cpu.cfs_quota_us | 0 .../cgroups/testdata/cgroups/undefined/cpu.cfs_period_us | 0 .../cgroups/testdata/cgroups/undefined/cpu.cfs_quota_us | 0 .../cgroups/testdata/proc/cgroups/cgroup | 0 .../cgroups/testdata/proc/cgroups/mountinfo | 0 .../cgroups/testdata/proc/invalid-cgroup/cgroup | 0 .../cgroups/testdata/proc/invalid-mountinfo/mountinfo | 0 .../cgroups/testdata/proc/untranslatable/cgroup | 0 .../cgroups/testdata/proc/untranslatable/mountinfo | 0 .../memorylimiter/internal => internal}/cgroups/util_test.go | 0 .../internal => internal}/iruntime/total_memory_linux.go | 2 +- .../internal => internal}/iruntime/total_memory_linux_test.go | 0 .../internal => internal}/iruntime/total_memory_other.go | 0 .../internal => internal}/iruntime/total_memory_other_test.go | 0 processor/memorylimiter/memorylimiter.go | 2 +- processor/memorylimiter/memorylimiter_test.go | 2 +- 30 files changed, 5 insertions(+), 5 deletions(-) rename {processor/memorylimiter/internal => internal}/cgroups/cgroup.go (100%) rename {processor/memorylimiter/internal => internal}/cgroups/cgroup_test.go (100%) rename {processor/memorylimiter/internal => internal}/cgroups/cgroups.go (97%) rename {processor/memorylimiter/internal => internal}/cgroups/cgroups_test.go (100%) rename {processor/memorylimiter/internal => internal}/cgroups/doc.go (100%) rename {processor/memorylimiter/internal => internal}/cgroups/errors.go (100%) rename {processor/memorylimiter/internal => internal}/cgroups/mountpoint.go (100%) rename {processor/memorylimiter/internal => internal}/cgroups/mountpoint_test.go (100%) rename {processor/memorylimiter/internal => internal}/cgroups/subsys.go (100%) rename {processor/memorylimiter/internal => internal}/cgroups/subsys_test.go (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/cgroups/cpu/cpu.cfs_period_us (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/cgroups/cpu/cpu.cfs_quota_us (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/cgroups/empty/cpu.cfs_quota_us (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/cgroups/invalid/cpu.cfs_quota_us (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/cgroups/undefined-period/cpu.cfs_quota_us (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/cgroups/undefined/cpu.cfs_period_us (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/cgroups/undefined/cpu.cfs_quota_us (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/proc/cgroups/cgroup (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/proc/cgroups/mountinfo (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/proc/invalid-cgroup/cgroup (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/proc/invalid-mountinfo/mountinfo (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/proc/untranslatable/cgroup (100%) rename {processor/memorylimiter/internal => internal}/cgroups/testdata/proc/untranslatable/mountinfo (100%) rename {processor/memorylimiter/internal => internal}/cgroups/util_test.go (100%) rename {processor/memorylimiter/internal => internal}/iruntime/total_memory_linux.go (92%) rename {processor/memorylimiter/internal => internal}/iruntime/total_memory_linux_test.go (100%) rename {processor/memorylimiter/internal => internal}/iruntime/total_memory_other.go (100%) rename {processor/memorylimiter/internal => internal}/iruntime/total_memory_other_test.go (100%) diff --git a/processor/memorylimiter/internal/cgroups/cgroup.go b/internal/cgroups/cgroup.go similarity index 100% rename from processor/memorylimiter/internal/cgroups/cgroup.go rename to internal/cgroups/cgroup.go diff --git a/processor/memorylimiter/internal/cgroups/cgroup_test.go b/internal/cgroups/cgroup_test.go similarity index 100% rename from processor/memorylimiter/internal/cgroups/cgroup_test.go rename to internal/cgroups/cgroup_test.go diff --git a/processor/memorylimiter/internal/cgroups/cgroups.go b/internal/cgroups/cgroups.go similarity index 97% rename from processor/memorylimiter/internal/cgroups/cgroups.go rename to internal/cgroups/cgroups.go index 4545114c692..38f5040d2a4 100644 --- a/processor/memorylimiter/internal/cgroups/cgroups.go +++ b/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/processor/memorylimiter/internal/cgroups/cgroups_test.go b/internal/cgroups/cgroups_test.go similarity index 100% rename from processor/memorylimiter/internal/cgroups/cgroups_test.go rename to internal/cgroups/cgroups_test.go diff --git a/processor/memorylimiter/internal/cgroups/doc.go b/internal/cgroups/doc.go similarity index 100% rename from processor/memorylimiter/internal/cgroups/doc.go rename to internal/cgroups/doc.go diff --git a/processor/memorylimiter/internal/cgroups/errors.go b/internal/cgroups/errors.go similarity index 100% rename from processor/memorylimiter/internal/cgroups/errors.go rename to internal/cgroups/errors.go diff --git a/processor/memorylimiter/internal/cgroups/mountpoint.go b/internal/cgroups/mountpoint.go similarity index 100% rename from processor/memorylimiter/internal/cgroups/mountpoint.go rename to internal/cgroups/mountpoint.go diff --git a/processor/memorylimiter/internal/cgroups/mountpoint_test.go b/internal/cgroups/mountpoint_test.go similarity index 100% rename from processor/memorylimiter/internal/cgroups/mountpoint_test.go rename to internal/cgroups/mountpoint_test.go diff --git a/processor/memorylimiter/internal/cgroups/subsys.go b/internal/cgroups/subsys.go similarity index 100% rename from processor/memorylimiter/internal/cgroups/subsys.go rename to internal/cgroups/subsys.go diff --git a/processor/memorylimiter/internal/cgroups/subsys_test.go b/internal/cgroups/subsys_test.go similarity index 100% rename from processor/memorylimiter/internal/cgroups/subsys_test.go rename to internal/cgroups/subsys_test.go diff --git a/processor/memorylimiter/internal/cgroups/testdata/cgroups/cpu/cpu.cfs_period_us b/internal/cgroups/testdata/cgroups/cpu/cpu.cfs_period_us similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/cgroups/cpu/cpu.cfs_period_us rename to internal/cgroups/testdata/cgroups/cpu/cpu.cfs_period_us diff --git a/processor/memorylimiter/internal/cgroups/testdata/cgroups/cpu/cpu.cfs_quota_us b/internal/cgroups/testdata/cgroups/cpu/cpu.cfs_quota_us similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/cgroups/cpu/cpu.cfs_quota_us rename to internal/cgroups/testdata/cgroups/cpu/cpu.cfs_quota_us diff --git a/processor/memorylimiter/internal/cgroups/testdata/cgroups/empty/cpu.cfs_quota_us b/internal/cgroups/testdata/cgroups/empty/cpu.cfs_quota_us similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/cgroups/empty/cpu.cfs_quota_us rename to internal/cgroups/testdata/cgroups/empty/cpu.cfs_quota_us diff --git a/processor/memorylimiter/internal/cgroups/testdata/cgroups/invalid/cpu.cfs_quota_us b/internal/cgroups/testdata/cgroups/invalid/cpu.cfs_quota_us similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/cgroups/invalid/cpu.cfs_quota_us rename to internal/cgroups/testdata/cgroups/invalid/cpu.cfs_quota_us diff --git a/processor/memorylimiter/internal/cgroups/testdata/cgroups/undefined-period/cpu.cfs_quota_us b/internal/cgroups/testdata/cgroups/undefined-period/cpu.cfs_quota_us similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/cgroups/undefined-period/cpu.cfs_quota_us rename to internal/cgroups/testdata/cgroups/undefined-period/cpu.cfs_quota_us diff --git a/processor/memorylimiter/internal/cgroups/testdata/cgroups/undefined/cpu.cfs_period_us b/internal/cgroups/testdata/cgroups/undefined/cpu.cfs_period_us similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/cgroups/undefined/cpu.cfs_period_us rename to internal/cgroups/testdata/cgroups/undefined/cpu.cfs_period_us diff --git a/processor/memorylimiter/internal/cgroups/testdata/cgroups/undefined/cpu.cfs_quota_us b/internal/cgroups/testdata/cgroups/undefined/cpu.cfs_quota_us similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/cgroups/undefined/cpu.cfs_quota_us rename to internal/cgroups/testdata/cgroups/undefined/cpu.cfs_quota_us diff --git a/processor/memorylimiter/internal/cgroups/testdata/proc/cgroups/cgroup b/internal/cgroups/testdata/proc/cgroups/cgroup similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/proc/cgroups/cgroup rename to internal/cgroups/testdata/proc/cgroups/cgroup diff --git a/processor/memorylimiter/internal/cgroups/testdata/proc/cgroups/mountinfo b/internal/cgroups/testdata/proc/cgroups/mountinfo similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/proc/cgroups/mountinfo rename to internal/cgroups/testdata/proc/cgroups/mountinfo diff --git a/processor/memorylimiter/internal/cgroups/testdata/proc/invalid-cgroup/cgroup b/internal/cgroups/testdata/proc/invalid-cgroup/cgroup similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/proc/invalid-cgroup/cgroup rename to internal/cgroups/testdata/proc/invalid-cgroup/cgroup diff --git a/processor/memorylimiter/internal/cgroups/testdata/proc/invalid-mountinfo/mountinfo b/internal/cgroups/testdata/proc/invalid-mountinfo/mountinfo similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/proc/invalid-mountinfo/mountinfo rename to internal/cgroups/testdata/proc/invalid-mountinfo/mountinfo diff --git a/processor/memorylimiter/internal/cgroups/testdata/proc/untranslatable/cgroup b/internal/cgroups/testdata/proc/untranslatable/cgroup similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/proc/untranslatable/cgroup rename to internal/cgroups/testdata/proc/untranslatable/cgroup diff --git a/processor/memorylimiter/internal/cgroups/testdata/proc/untranslatable/mountinfo b/internal/cgroups/testdata/proc/untranslatable/mountinfo similarity index 100% rename from processor/memorylimiter/internal/cgroups/testdata/proc/untranslatable/mountinfo rename to internal/cgroups/testdata/proc/untranslatable/mountinfo diff --git a/processor/memorylimiter/internal/cgroups/util_test.go b/internal/cgroups/util_test.go similarity index 100% rename from processor/memorylimiter/internal/cgroups/util_test.go rename to internal/cgroups/util_test.go diff --git a/processor/memorylimiter/internal/iruntime/total_memory_linux.go b/internal/iruntime/total_memory_linux.go similarity index 92% rename from processor/memorylimiter/internal/iruntime/total_memory_linux.go rename to internal/iruntime/total_memory_linux.go index 611f4a0fac1..fab28a60ea3 100644 --- a/processor/memorylimiter/internal/iruntime/total_memory_linux.go +++ b/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/processor/memorylimiter/internal/iruntime/total_memory_linux_test.go b/internal/iruntime/total_memory_linux_test.go similarity index 100% rename from processor/memorylimiter/internal/iruntime/total_memory_linux_test.go rename to internal/iruntime/total_memory_linux_test.go diff --git a/processor/memorylimiter/internal/iruntime/total_memory_other.go b/internal/iruntime/total_memory_other.go similarity index 100% rename from processor/memorylimiter/internal/iruntime/total_memory_other.go rename to internal/iruntime/total_memory_other.go diff --git a/processor/memorylimiter/internal/iruntime/total_memory_other_test.go b/internal/iruntime/total_memory_other_test.go similarity index 100% rename from processor/memorylimiter/internal/iruntime/total_memory_other_test.go rename to internal/iruntime/total_memory_other_test.go diff --git a/processor/memorylimiter/memorylimiter.go b/processor/memorylimiter/memorylimiter.go index 403de7e7190..11430bbccea 100644 --- 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 index 1665537f3a4..50b7aebe130 100644 --- 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" )