Skip to content
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.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[receiver/dockerstats] Add inspect metrics #21803

Merged
merged 149 commits into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
d7a74ce
add inspect api metrics
carlossscastro May 11, 2023
b54ff11
add changelog
carlossscastro May 11, 2023
a1aa7eb
change cpu shares to non-monotonic sum
carlossscastro May 11, 2023
6404368
fix container.restarts metric name
carlossscastro May 19, 2023
e5ace5a
Address comments
carlossscastro May 31, 2023
d686fb4
Small improvement and unit tests
carlossscastro Jun 1, 2023
14f8949
Fix linting
carlossscastro Jun 1, 2023
fa0fb04
Merge branch 'main' into add_inspect_metrics
carlossscastro Jun 6, 2023
250dd38
Fix metric names in chagelog
carlossscastro Jun 6, 2023
2cee2f4
Fix cpu.shares metric type
carlossscastro Jun 14, 2023
6d46a23
Merge branch 'main' into add_inspect_metrics
carlossscastro Jun 14, 2023
beacb93
Fix codegen
carlossscastro Jun 14, 2023
c5a321a
Address nits
carlossscastro Jun 26, 2023
e13f5a4
Merge branch 'main' into add_inspect_metrics
carlossscastro Jun 26, 2023
a9ccac8
Return wrapped errors
carlossscastro Jun 27, 2023
710c4c0
Amend container.cpu.limit metric description
carlossscastro Jun 28, 2023
e530473
Address -cpuset-cpus nit
carlossscastro Jul 10, 2023
6d1aa63
Address -cpuset-cpus nit
carlossscastro Jul 10, 2023
adb685e
Merge branch 'main' into add_inspect_metrics
sigilioso Aug 11, 2023
60bb627
chore: use constant instead of magic number
sigilioso Aug 11, 2023
f7670b1
test: include missing cfg builder
sigilioso Aug 11, 2023
00edee5
test: fix merge issue
sigilioso Aug 11, 2023
c385041
Merge branch 'main' into add_inspect_metrics
sigilioso Aug 11, 2023
88e1a82
Merge branch 'main' into add_inspect_metrics
sigilioso Aug 16, 2023
e19af71
Merge branch 'main' into add_inspect_metrics
sigilioso Aug 24, 2023
f255253
Merge branch 'main' into add_inspect_metrics
sigilioso Aug 25, 2023
1de00dd
Merge branch 'main' into add_inspect_metrics
sigilioso Aug 28, 2023
5ebd91e
Merge branch 'main' into add_inspect_metrics
sigilioso Aug 28, 2023
3c298e8
Merge branch 'main' into add_inspect_metrics
sigilioso Aug 31, 2023
a2a78b5
Merge branch 'main' into add_inspect_metrics
sigilioso Sep 4, 2023
44e4e1b
Merge branch 'main' into add_inspect_metrics
sigilioso Sep 5, 2023
b6b81b2
Merge branch 'main' into add_inspect_metrics
sigilioso Sep 14, 2023
58b5270
chore: update changelog text
sigilioso Sep 26, 2023
5a30576
Merge branch 'main' into add_inspect_metrics
sigilioso Sep 27, 2023
7daa396
Merge branch 'main' into add_inspect_metrics
sigilioso Sep 28, 2023
74d0059
Merge branch 'main' into add_inspect_metrics
sigilioso Sep 29, 2023
34580c1
Merge branch 'main' into add_inspect_metrics
sigilioso Oct 2, 2023
e38b80d
remove local debug leftover
sigilioso Oct 2, 2023
9b8ec2a
chore: split metric description and extended documentation
sigilioso Oct 3, 2023
31cc60a
Merge branch 'main' into add_inspect_metrics
sigilioso Oct 16, 2023
3f783ae
chore: update generated code
sigilioso Oct 16, 2023
8dba3c9
Merge branch 'main' into add_inspect_metrics
sigilioso Oct 17, 2023
d40207c
chore: make the changelog message accurate
sigilioso Oct 27, 2023
60bfc84
[exporter/datasetexporter]: Fix NPE exception when attribute contains…
martin-majlis-s1 Oct 17, 2023
283df4c
[pkg/stanza] Fix issue where batching caused incorrect starting point…
djaglowski Oct 17, 2023
6024296
Add async config block & concurrent readers to UDP input operator (#2…
hovavza Oct 17, 2023
be8bffd
[k8sclusterreceiver] change resourcequota and clusterquota units (#27…
povilasv Oct 17, 2023
13710b4
[chore] update otel-core dependency (#27772)
dmitryax Oct 17, 2023
beae93c
[cmd/otelcontribcol] Simplify exporters lifecycle tests (#27816)
dmitryax Oct 17, 2023
3d6e526
[pkg/pdatatest] Ignore span timestamps (#27798)
sakulali Oct 17, 2023
bb84ff2
[chore] [cmd/otelcontribcol] Simplify and fix receivers lifecycle tes…
dmitryax Oct 17, 2023
03c4b76
[cmd/otelcontribcol] Simplify processors lifecycle tests (#27817)
dmitryax Oct 17, 2023
4f380c0
[chore][pkg/stanza] Use unscoped mock persister where possible (#27809)
djaglowski Oct 17, 2023
7999bda
[chore] dependabot updates Tue Oct 17 21:10:42 UTC 2023 (#27819)
opentelemetrybot Oct 17, 2023
5d6afac
[chore][pkg/stanza] Extract checkpointing logic into internal package…
djaglowski Oct 18, 2023
485f4a4
[receiver/kubeletstats] Add RBAC docs (#27655)
TylerHelmuth Oct 18, 2023
3819623
Update Grafana Agent distribution components (#27615)
tpaschalis Oct 18, 2023
92fce42
[cmd/otecontribcol] Add sending data step to exporter lifecycle tests…
dmitryax Oct 18, 2023
b57c90b
[chore][exporter/syslog] docs: describe default values, add examples …
andrzej-stencel Oct 18, 2023
a675914
[chore] Send readonly data to immutable exporters in lifecycle tests …
dmitryax Oct 18, 2023
32ac163
UDP input operator - async mode - separate between readers & processo…
hovavza Oct 18, 2023
5557590
[receiver/filelog] Implement specifying top n files to track when ord…
BinaryFissionGames Oct 18, 2023
69dcb32
[pkg/pdatautil] Optimize the hashing function for `pcommon.Map` (#27840)
mdonkers Oct 19, 2023
cdf7353
[aws/cwlogs] Reduce noisy logger in CloudWatch logs pusher (#27774)
bryan-aguilar Oct 19, 2023
3406580
[pkg/pdatatest] Ignore trace ID for ptracetest (#27829)
sakulali Oct 19, 2023
47ec9db
[pkg/pdatatest] Ignore span ID for ptracetest (#27833)
sakulali Oct 19, 2023
8178252
[processor/k8sattributes] Handle all resource deletion event types (#…
c-kruse Oct 19, 2023
3bf7b89
[pkg/ottl] Add Double converter (#27457)
gord02 Oct 19, 2023
5a6da2e
[chore][exporter/fileexporter] use errors.Join instead of go.uber.org…
bagmeg Oct 19, 2023
35feace
[connector/datadog] Allow export to traces pipelines (#27846)
songy23 Oct 19, 2023
27e46ff
[receiver/k8sobjects] Bump to beta stability for logs (#27635)
TylerHelmuth Oct 19, 2023
cc81095
[chore][exporter/elasticsearchexporter] use errors.Join instead of go…
bagmeg Oct 19, 2023
48abd08
Add JMX metrics gatherer version 1.31.0-alpha (#27852)
opentelemetrybot Oct 19, 2023
ff03765
[chore][cmd/otelcontribcol] Exclude from linter (#27865)
crobert-1 Oct 19, 2023
1fa62a8
[chore][pkg/stanza] Log matching paths (#27859)
djaglowski Oct 19, 2023
f99f6df
[extension/encoding/jsonlogencoding] add new extension for JSON codec…
VihasMakwana Oct 19, 2023
c6780e2
[pkg/pdatatest] Ignore span attribute value (#27861)
sakulali Oct 19, 2023
12490fb
[cmd/otelcolcontrib] [chore] Send test data in lifecycle processor te…
dmitryax Oct 19, 2023
ef6e57a
[chore] remove mentions of docs.signalfx.com from docs (#27869)
atoulme Oct 20, 2023
aeebb85
[pkg/stanza] Move flush state into reader package (#27843)
djaglowski Oct 20, 2023
ae9f370
[exporter/signalfx] Add an option to control the dimension client tim…
dloucasfx Oct 20, 2023
3104100
[chore] [dockerstatsreceiver] update dockerstats receiver deprecation…
sigilioso Oct 20, 2023
7ae7c3b
[exporter/datasetexporter]: Make export of resources and scopes more …
martin-majlis-s1 Oct 20, 2023
735bb2d
[pkg/stanza] Fix nil pointer dereference (#27882)
haoqixu Oct 20, 2023
7583ced
[cmd/telemetrygen] Move end to end tests to separate module (#27878)
mx-psi Oct 20, 2023
83d65a3
Warn instead of failing when renaming metrics using metric_relabel_co…
dashpole Oct 20, 2023
0f43f40
[chore][cmd/oteltestbedcol] Skip linting generated code (#27884)
crobert-1 Oct 20, 2023
9f6491a
[chore][receiver/syslog] Remove inaccurate field from doc (#27883)
djaglowski Oct 20, 2023
6036351
[chore] fix codeowners (#27886)
atoulme Oct 20, 2023
6622985
[chore][exporter/datadogexporter] use errors.Join instead of go.uber.…
bagmeg Oct 23, 2023
0fa1d14
[exporter/elasticsearch] add missing scope info in span/log attribute…
JaredTan95 Oct 23, 2023
1a13c63
`make update-otel` (#27904)
mx-psi Oct 23, 2023
ed5fdac
[chore][pkg/stanza] Use variadic arg in test expectation (#28206)
djaglowski Oct 23, 2023
4273dd7
[chore][pkg/stanaza] Fix and strengthen test case (#28228)
djaglowski Oct 23, 2023
f83adda
[chore] bump core v0.88.0 (#28461)
Oct 23, 2023
b3dfe8f
[extension/encodingextension] Introduce zipkin encoding extension. (#…
dao-jun Oct 24, 2023
ffdfde0
[pkg/ottl] Fix issue with named parameter spacing (#28511)
TylerHelmuth Oct 24, 2023
f420d53
[chore][pkg/stanza] Ensure all start/stop calls in are balanced (#28294)
djaglowski Oct 24, 2023
9cbb615
[chore][pkg/stanza] Merge roller into fileconsumer.Manager (#28451)
djaglowski Oct 24, 2023
9b40017
[chore] Prepare release 0.88.0 (#28562)
opentelemetrybot Oct 24, 2023
b63d3cb
Added documentation to describe how to use with AAD Auth Proxy (#26350)
codesmon Oct 24, 2023
5ca3e6f
[servicegraphconnector] Add flush interval config (#27879)
mapno Oct 24, 2023
87f4d4d
[headerssetter] Remove "Limitations" section from README. (#27465)
ptodev Oct 24, 2023
0950b8f
[k8sclusterreceiver] add k8s.node.condition metric (#27838)
povilasv Oct 24, 2023
4642257
[servicegraphprocessor, servicegraphconnector] Measure latency in sec…
mapno Oct 24, 2023
b665836
[cmd/telemetrygen] Remove remaining replace statement (#28565)
mx-psi Oct 24, 2023
31f98e6
[receiver/windowseventlog] Add Execution and Security information to …
BinaryFissionGames Oct 24, 2023
191fc9c
[examples/demo] Use most recent Docker image (#28566)
mx-psi Oct 24, 2023
d229b7d
[pkg/ottl] Expose component.TelemetrySettings to OTTL path parsers so…
swar8080 Oct 24, 2023
c0fbdf9
[chore][pkg/stanza] Fix tests which leave files open (#28569)
djaglowski Oct 24, 2023
5e4de3d
[chore] dependabot updates Tue Oct 24 15:25:38 UTC 2023 (#28572)
opentelemetrybot Oct 25, 2023
efca488
[chore] dependabot updates Wed Oct 25 05:13:14 UTC 2023 (#28611)
opentelemetrybot Oct 25, 2023
c20875a
[pkg/translator/azure] New component for translating from Azure nativ…
cparkins Oct 25, 2023
05c7639
Fix TestGettingTrackingData flakiness (#27927)
pjanotti Oct 25, 2023
ddffb6c
[chore][pkg/stanza] Allow trie to store a value (#28592)
djaglowski Oct 25, 2023
1b1a8ab
[chore][pkg/stanza] Skip persister operations if nil (#28580)
djaglowski Oct 25, 2023
cce57dd
[chore][exporter/opensearchexporter] use errors.Join instead of go.ub…
bagmeg Oct 25, 2023
50bbdee
[exporter/datadog] Add config trace_buffer (#28582)
songy23 Oct 25, 2023
2f36d83
[pkg/ottl] Add status header to readme (#27896)
TylerHelmuth Oct 25, 2023
1d620db
[chore] fix typo in makefile (#28624)
Oct 25, 2023
beb2ef2
[chore] Add definition for documentation label (#27628)
crobert-1 Oct 25, 2023
a64ba23
[chore] clean up from last release (#28632)
Oct 25, 2023
2381707
[chore] Fix a data race in the tests of healthcheckextension (#28629)
atoulme Oct 25, 2023
1bd5da9
[receiver/dockerstats] remove deprecated container.cpu.percent and co…
sigilioso Oct 26, 2023
fdb86a6
[chore][exporter/datadog] Add integration tests (#28396)
songy23 Oct 26, 2023
1e9d8c1
tailsamplingprocessor: Optimize tag mutator memory allocations (#27889)
brancz Oct 26, 2023
e35bd98
[exporter/loki] Don't auto-promote tenant attribute (#27446)
jpkrohling Oct 26, 2023
03868a3
[chore] Update Azure Event Hub Receiver Documentation (#28623)
cparkins Oct 26, 2023
16c8d5f
[receiver/azureeventhub] Set Consumer Group by Configuration (#28634)
cparkins Oct 26, 2023
0742811
Update README.md, fix receiver OTLP instead of bad naming OLTP in the…
jpizquierdo Oct 26, 2023
b7cd52e
[chore] [k8sclusterreceiver] Add new codeowner @povilasv (#27903)
povilasv Oct 26, 2023
ecab38e
OpAMP Agent Extension (#16594)
portertech Oct 26, 2023
0734b0a
[exporter/kafka] do not expose method (#27583)
sakulali Oct 26, 2023
283924a
Remove duplicated 'compression' documentation from googlecloudexporte…
nzbart Oct 26, 2023
540b435
Removed myself as code owner for bearertokenauth and added myself as …
pavankrish123 Oct 26, 2023
4611926
[pkg/translator/azure] Decode "incorrect" JSON without failing comple…
cparkins Oct 27, 2023
6d075f5
[chore] make the collector module version script output a git diff (#…
atoulme Oct 27, 2023
f1b5d42
[exporter/splunkhecexporter] Adding splunkhecexporter integration tes…
pszkamruk-splunk Oct 27, 2023
f844ca9
[receiver/splunkhec] Fix the double encoding of JSON responses (#27606)
atoulme Oct 27, 2023
c4bf087
chore: move chlog change type back to breaking
sigilioso Oct 27, 2023
27e1f60
Merge branch 'main' into add_inspect_metrics
sigilioso Oct 27, 2023
ad94d15
Merge branch 'main' into add_inspect_metrics
sigilioso Oct 30, 2023
6863be2
Merge branch 'main' into add_inspect_metrics
sigilioso Nov 2, 2023
1aba6ac
Merge branch 'main' into add_inspect_metrics
sigilioso Nov 9, 2023
a7f97ab
Merge branch 'main' into add_inspect_metrics
sigilioso Nov 14, 2023
ba953f5
Merge branch 'main' into add_inspect_metrics
sigilioso Nov 14, 2023
9bdfdf1
Merge branch 'main' into add_inspect_metrics
sigilioso Nov 16, 2023
c374199
fix: fix merge issue
sigilioso Nov 16, 2023
9a85d61
Merge branch 'main' into add_inspect_metrics
sigilioso Nov 17, 2023
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: 16 additions & 0 deletions .chloggen/add_inspect_metrics.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement
MovieStoreGuy marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

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

appears the breaking change was lost

Copy link
Contributor

Choose a reason for hiding this comment

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

It was updated after this comment. Let's agree on moving it back to breaking or modifying the api version check on the comment bellow if that's ok.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sry, wasn't clear if this was a request. Moving to 1.25, which I think was engine 1.13's version from 1/17 seems fine but should be advertised as a breaking change.


# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: dockerstatsreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Add [container.cpu.limit], [container.cpu.shares] and [container.restarts] metrics from docker container api"

# One or more tracking issues related to the change
issues: [21087]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: It requires API version to 1.25 or greater if the new metrics are enabled.
sigilioso marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions receiver/dockerstatsreceiver/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) {
},

Endpoint: "http://example.com/",
DockerAPIVersion: 1.24,
DockerAPIVersion: 1.25,

ExcludedImages: []string{
"undesired-container",
Expand Down Expand Up @@ -95,5 +95,5 @@ func TestValidateErrors(t *testing.T) {
assert.Equal(t, "endpoint must be specified", component.ValidateConfig(cfg).Error())

cfg = &Config{ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: 1 * time.Second}, Endpoint: "someEndpoint", DockerAPIVersion: 1.21}
assert.Equal(t, "api_version must be at least 1.22", component.ValidateConfig(cfg).Error())
assert.Equal(t, "api_version must be at least 1.25", component.ValidateConfig(cfg).Error())
}
24 changes: 24 additions & 0 deletions receiver/dockerstatsreceiver/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,22 @@ Number of sectors transferred to/from disk by the group and descendant groups (O
| device_minor | Device minor number for block IO operations. | Any Str |
| operation | Type of BlockIO operation. | Any Str |

### container.cpu.limit

CPU limit set for the container. This metric is only reported if the container has limits set with -cpus, -cpuset-cpus or -cpu-quota.

| Unit | Metric Type | Value Type |
| ---- | ----------- | ---------- |
| {cpus} | Gauge | Double |

### container.cpu.shares

CPU shares set for the container.

| Unit | Metric Type | Value Type |
| ---- | ----------- | ---------- |
| 1 | Gauge | Int |

### container.cpu.throttling_data.periods

Number of periods with throttling active.
Expand Down Expand Up @@ -706,6 +722,14 @@ It requires docker API 1.23 or higher and kernel version >= 4.3 with pids cgroup
| ---- | ----------- | ---------- | ----------------------- | --------- |
| {pids} | Sum | Int | Cumulative | false |

### container.restarts

Number of restarts for the container.

| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
| ---- | ----------- | ---------- | ----------------------- | --------- |
| {restarts} | Sum | Int | Cumulative | true |

### container.uptime

Time elapsed since container start time.
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading