Skip to content

Move metrics proto package to stats/v1 - #96

Merged
fuweid merged 1 commit into
containerd:masterfrom
jterry75:stats_pkg
Sep 19, 2019
Merged

Move metrics proto package to stats/v1#96
fuweid merged 1 commit into
containerd:masterfrom
jterry75:stats_pkg

Conversation

@jterry75

Copy link
Copy Markdown
Contributor

In order for projects to link the metrics.proto file with go modules it
is required to have a go import. This creates a problem because the
cgroups package is not platform independent although its types are.
Moving the types to a sperate package allows consumption of the types
regardless of platform.

Signed-off-by: Justin Terry (VM) juterry@microsoft.com

@crosbymichael

Copy link
Copy Markdown
Member

change looks good but tests need updated

@jterry75

Copy link
Copy Markdown
ContributorAuthor

Oops. I thought for sure I ran these.

In order for projects to link the metrics.proto file with go modules it
is required to have a go import. This creates a problem because the
cgroups package is not platform independent although its types are.
Moving the types to a sperate package allows consumption of the types
regardless of platform.
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
@codecov-io

codecov-io commented Sep 18, 2019

Copy link
Copy Markdown

Codecov Report

Merging #96 into master will increase coverage by 27.71%.
The diff coverage is 58.06%.

Impacted file tree graph

@@ Coverage Diff @@## master #96 +/- ##
===========================================
+ Coverage 14.05% 41.76% +27.71% 
===========================================
Files 24 23 -1 Lines 4911 1616 -3295 ===========================================
- Hits 690 675 -15 + Misses 4097 817 -3280 
Partials 124 124
Impacted FilesCoverage Δ
subsystem.go60.71% <ø> (ø)⬆️
cgroup.go48.43% <100%> (ø)⬆️
pids.go94.11% <100%> (ø)⬆️
cpu.go19.4% <100%> (ø)⬆️
hugetlb.go71.15% <100%> (ø)⬆️
cpuacct.go25.8% <100%> (ø)⬆️
rdma.go17.33% <16.66%> (ø)⬆️
memory.go27.66% <22.22%> (ø)⬆️
blkio.go20.67% <75%> (ø)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fc51bcb...caf7157. Read the comment docs.

@crosbymichael

Copy link
Copy Markdown
Member

LGTM

@fuweidfuweid left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fuweid
fuweid merged commit bf292b2 into containerd:masterSep 19, 2019
@jterry75
jterry75 deleted the stats_pkg branch September 19, 2019 15:07
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Oct 31, 2019
full diff: containerd/cgroups@c4b9ac5...5fbad35
- containerd/cgroups#82 Add go module support
- containerd/cgroups#96 Move metrics proto package to stats/v1
- containerd/cgroups#97 Allow overriding the default /proc folder in blkioController
- containerd/cgroups#98 Allows ignoring memory modules
- containerd/cgroups#99 Add Go 1.13 to Travis
- containerd/cgroups#100 stats/v1: export per-cgroup stats
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Oct 31, 2019
full diff: containerd/cgroups@c4b9ac5...5fbad35
- containerd/cgroups#82 Add go module support
- containerd/cgroups#96 Move metrics proto package to stats/v1
- containerd/cgroups#97 Allow overriding the default /proc folder in blkioController
- containerd/cgroups#98 Allows ignoring memory modules
- containerd/cgroups#99 Add Go 1.13 to Travis
- containerd/cgroups#100 stats/v1: export per-cgroup stats
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 27552ceb15bca544820229e574427d4c1d6ef585
Component: engine
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Dec 3, 2019
full diff: containerd/cgroups@c4b9ac5...5fbad35
- containerd/cgroups#82 Add go module support
- containerd/cgroups#96 Move metrics proto package to stats/v1
- containerd/cgroups#97 Allow overriding the default /proc folder in blkioController
- containerd/cgroups#98 Allows ignoring memory modules
- containerd/cgroups#99 Add Go 1.13 to Travis
- containerd/cgroups#100 stats/v1: export per-cgroup stats
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 27552ce)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Jan 23, 2020
full diff: containerd/cgroups@c4b9ac5...5fbad35
- containerd/cgroups#82 Add go module support
- containerd/cgroups#96 Move metrics proto package to stats/v1
- containerd/cgroups#97 Allow overriding the default /proc folder in blkioController
- containerd/cgroups#98 Allows ignoring memory modules
- containerd/cgroups#99 Add Go 1.13 to Travis
- containerd/cgroups#100 stats/v1: export per-cgroup stats
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 27552ceb15bca544820229e574427d4c1d6ef585)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9ab162a73ac9e133a21cffbadd3339cbb5213939
Component: engine
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@jterry75@crosbymichael@codecov-io@fuweid