Skip to content

Use seelog patch to get correct function caller in logger #37040

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.

Sign up for GitHub

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

Closed
pgimalac wants to merge 3 commits into from
Closed

Use seelog patch to get correct function caller in logger #37040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b02f5d
fix(logger): get correct function caller in logger
pgimalac May 15, 2025
1ce9785
chore: tidy
pgimalac May 15, 2025
9e58553
chore: update licenses
pgimalac May 16, 2025
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
4 changes: 4 additions & 0 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,10 @@ core,github.com/cenkalti/backoff/v5,MIT,Copyright (c) 2014 Cenk Altı
core,github.com/cespare/xxhash/v2,MIT,Copyright (c) 2016 Caleb Spare
core,github.com/chrusty/protoc-gen-jsonschema,Apache-2.0,Copyright (c) 2017 The Authors
core,github.com/cihub/seelog,BSD-3-Clause,"Copyright (c) 2012, Cloud Instruments Co., Ltd. <info@cin.io>"
core,github.com/cihub/seelog/archive,BSD-3-Clause,"Copyright (c) 2012, Cloud Instruments Co., Ltd. <info@cin.io>"
core,github.com/cihub/seelog/archive/gzip,BSD-3-Clause,"Copyright (c) 2012, Cloud Instruments Co., Ltd. <info@cin.io>"
core,github.com/cihub/seelog/archive/tar,BSD-3-Clause,"Copyright (c) 2012, Cloud Instruments Co., Ltd. <info@cin.io>"
core,github.com/cihub/seelog/archive/zip,BSD-3-Clause,"Copyright (c) 2012, Cloud Instruments Co., Ltd. <info@cin.io>"
core,github.com/cilium/ebpf,MIT,"Copyright (c) 2017 Nathan Sweet | Copyright (c) 2018, 2019 Cloudflare | Copyright (c) 2019 Authors of Cilium"
core,github.com/cilium/ebpf/asm,MIT,"Copyright (c) 2017 Nathan Sweet | Copyright (c) 2018, 2019 Cloudflare | Copyright (c) 2019 Authors of Cilium"
core,github.com/cilium/ebpf/btf,MIT,"Copyright (c) 2017 Nathan Sweet | Copyright (c) 2018, 2019 Cloudflare | Copyright (c) 2019 Authors of Cilium"
Expand Down
3 changes: 2 additions & 1 deletion comp/forwarder/orchestrator/orchestratorinterface/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ require github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.56.0

// Internal deps fix version
replace (
github.com/cihub/seelog => github.com/cihub/seelog v0.0.0-20151216151435-d2c6e5aa9fbf // v2.6
// https://github.com/cihub/seelog/pull/170
github.com/cihub/seelog => github.com/zhuzhengyang/seelog v0.0.0-20190304065841-ce4aa56b4caa
github.com/spf13/cast => github.com/DataDog/cast v1.8.0
)

Expand Down
4 changes: 2 additions & 2 deletions comp/forwarder/orchestrator/orchestratorinterface/go.sum
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ retract (

// Internal deps fix version
replace (
github.com/cihub/seelog => github.com/cihub/seelog v0.0.0-20151216151435-d2c6e5aa9fbf // v2.6
// https://github.com/cihub/seelog/pull/170
github.com/cihub/seelog => github.com/zhuzhengyang/seelog v0.0.0-20190304065841-ce4aa56b4caa
github.com/spf13/cast => github.com/DataDog/cast v1.8.0
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion pkg/util/log/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ module github.com/DataDog/datadog-agent/pkg/util/log

go 1.23.0

replace github.com/cihub/seelog => github.com/cihub/seelog v0.0.0-20151216151435-d2c6e5aa9fbf // v2.6
// https://github.com/cihub/seelog/pull/170
replace github.com/cihub/seelog => github.com/zhuzhengyang/seelog v0.0.0-20190304065841-ce4aa56b4caa

require (
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.62.3
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/log/go.sum
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion pkg/util/log/setup/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ module github.com/DataDog/datadog-agent/pkg/util/log/setup

go 1.23.0

replace github.com/cihub/seelog => github.com/cihub/seelog v0.0.0-20151216151435-d2c6e5aa9fbf // v2.6
// https://github.com/cihub/seelog/pull/170
replace github.com/cihub/seelog => github.com/zhuzhengyang/seelog v0.0.0-20190304065841-ce4aa56b4caa

require (
github.com/DataDog/datadog-agent/pkg/config/mock v0.61.0
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/log/setup/go.sum
View file
Open in desktop

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