Skip to content

Commit

Permalink
Merge pull request moby#49053 from thaJeztah/daemon_unhandled_errs
Browse files Browse the repository at this point in the history
cmd/dockerd: ignore some unhandled errors
  • Loading branch information
thaJeztah authored Dec 8, 2024
2 parents b1c525a + 5fc32c1 commit 9da4ae2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmd/dockerd/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ func (cli *daemonCLI) start(ctx context.Context) (err error) {

const otelServiceNameEnv = "OTEL_SERVICE_NAME"
if _, ok := os.LookupEnv(otelServiceNameEnv); !ok {
os.Setenv(otelServiceNameEnv, filepath.Base(os.Args[0]))
_ = os.Setenv(otelServiceNameEnv, filepath.Base(os.Args[0]))
}

setOTLPProtoDefault()
Expand Down Expand Up @@ -382,10 +382,10 @@ func setOTLPProtoDefault() {

if os.Getenv(protoEnv) == "" {
if os.Getenv(tracesEnv) == "" {
os.Setenv(tracesEnv, defaultProto)
_ = os.Setenv(tracesEnv, defaultProto)
}
if os.Getenv(metricsEnv) == "" {
os.Setenv(metricsEnv, defaultProto)
_ = os.Setenv(metricsEnv, defaultProto)
}
}
}
Expand Down

0 comments on commit 9da4ae2

Please sign in to comment.