Skip to content

Commit 2b19afd

Browse files
Samiur ArifDougManton
authored andcommitted
fixed the issue 31087 (open-telemetry#31658)
**Description:** Bumped docker v25.0.4+incompatible **Link to tracking Issue:** 31087 **Testing:** Integration tests, unit test ![Screenshot_20240308_120615](https://github.com/open-telemetry/opentelemetry-collector-contrib/assets/86324446/2d48706d-ee8b-438e-bc3b-1552ef00ece5)
1 parent ab7a08b commit 2b19afd

File tree

6 files changed

+49
-17
lines changed

6 files changed

+49
-17
lines changed

.chloggen/fix-issue-31087.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: 'bug_fix'
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: 'internal/docker'
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: 'Updated docker dependency and fixed zap.String incompatibility'
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [31087]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

cmd/configschema/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ require (
306306
github.com/devigned/tab v0.1.1 // indirect
307307
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
308308
github.com/digitalocean/godo v1.104.1 // indirect
309-
github.com/docker/distribution v2.8.2+incompatible // indirect
310-
github.com/docker/docker v24.0.9+incompatible // indirect
309+
github.com/distribution/reference v0.5.0 // indirect
310+
github.com/docker/docker v25.0.4+incompatible // indirect
311311
github.com/docker/go-connections v0.5.0 // indirect
312312
github.com/docker/go-units v0.5.0 // indirect
313313
github.com/dustin/go-humanize v1.0.1 // indirect

cmd/configschema/go.sum

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@ require (
324324
github.com/devigned/tab v0.1.1 // indirect
325325
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
326326
github.com/digitalocean/godo v1.104.1 // indirect
327-
github.com/docker/distribution v2.8.2+incompatible // indirect
328-
github.com/docker/docker v24.0.9+incompatible // indirect
327+
github.com/distribution/reference v0.5.0 // indirect
328+
github.com/docker/docker v25.0.4+incompatible // indirect
329329
github.com/docker/go-connections v0.5.0 // indirect
330330
github.com/docker/go-units v0.5.0 // indirect
331331
github.com/dustin/go-humanize v1.0.1 // indirect
@@ -482,6 +482,7 @@ require (
482482
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
483483
github.com/mitchellh/reflectwalk v1.0.2 // indirect
484484
github.com/moby/sys/mountinfo v0.6.2 // indirect
485+
github.com/moby/sys/user v0.1.0 // indirect
485486
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
486487
github.com/modern-go/reflect2 v1.0.2 // indirect
487488
github.com/mongodb-forks/digest v1.0.5 // indirect

go.sum

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/docker/docker.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -236,16 +236,16 @@ EVENT_LOOP:
236236
case event := <-eventCh:
237237
switch event.Action {
238238
case "destroy":
239-
dc.logger.Debug("Docker container was destroyed:", zap.String("id", event.ID))
240-
dc.RemoveContainer(event.ID)
239+
dc.logger.Debug("Docker container was destroyed:", zap.String("id", event.Actor.ID))
240+
dc.RemoveContainer(event.Actor.ID)
241241
default:
242242
dc.logger.Debug(
243243
"Docker container update:",
244-
zap.String("id", event.ID),
245-
zap.String("action", event.Action),
244+
zap.String("id", event.Actor.ID),
245+
zap.Any("action", event.Action),
246246
)
247247

248-
dc.InspectAndPersistContainer(ctx, event.ID)
248+
dc.InspectAndPersistContainer(ctx, event.Actor.ID)
249249
}
250250

251251
if event.TimeNano > lastTime.UnixNano() {

0 commit comments

Comments
 (0)