Skip to content

Commit

Permalink
fixed the issue 31087 (#31658)
Browse files Browse the repository at this point in the history
**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)
  • Loading branch information
samiura authored Mar 8, 2024
1 parent 4c5b5e9 commit 045e329
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 17 deletions.
27 changes: 27 additions & 0 deletions .chloggen/fix-issue-31087.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: 'bug_fix'

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: 'Updated docker dependency and fixed zap.String incompatibility'

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [31087]

# (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:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
4 changes: 2 additions & 2 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@ require (
github.com/devigned/tab v0.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/digitalocean/godo v1.104.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v24.0.9+incompatible // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/docker v25.0.4+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
Expand Down
10 changes: 6 additions & 4 deletions cmd/configschema/go.sum

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

5 changes: 3 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ require (
github.com/devigned/tab v0.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/digitalocean/godo v1.104.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v24.0.9+incompatible // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/docker v25.0.4+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
Expand Down Expand Up @@ -482,6 +482,7 @@ require (
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/sys/user v0.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mongodb-forks/digest v1.0.5 // indirect
Expand Down
10 changes: 6 additions & 4 deletions go.sum

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

10 changes: 5 additions & 5 deletions internal/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,16 +236,16 @@ EVENT_LOOP:
case event := <-eventCh:
switch event.Action {
case "destroy":
dc.logger.Debug("Docker container was destroyed:", zap.String("id", event.ID))
dc.RemoveContainer(event.ID)
dc.logger.Debug("Docker container was destroyed:", zap.String("id", event.Actor.ID))
dc.RemoveContainer(event.Actor.ID)
default:
dc.logger.Debug(
"Docker container update:",
zap.String("id", event.ID),
zap.String("action", event.Action),
zap.String("id", event.Actor.ID),
zap.Any("action", event.Action),
)

dc.InspectAndPersistContainer(ctx, event.ID)
dc.InspectAndPersistContainer(ctx, event.Actor.ID)
}

if event.TimeNano > lastTime.UnixNano() {
Expand Down

0 comments on commit 045e329

Please sign in to comment.