mirror of
https://github.com/zeromicro/go-zero.git
synced 2025-01-24 01:30:25 +08:00
0b1884b6bd
* feat: support caller skip in logx * chore: remove debug prints * chore: remove debug prints * chore(deps): bump go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc (#2402) Bumps [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](https://github.com/open-telemetry/opentelemetry-go) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: simplify test code * chore: remove new WithFields in logx, and deprecated old WithFields * chore: simplify WithDuration Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
25 lines
697 B
Go
25 lines
697 B
Go
package logx
|
|
|
|
import "context"
|
|
|
|
var fieldsContextKey contextKey
|
|
|
|
type contextKey struct{}
|
|
|
|
// ContextWithFields returns a new context with the given fields.
|
|
func ContextWithFields(ctx context.Context, fields ...LogField) context.Context {
|
|
if val := ctx.Value(fieldsContextKey); val != nil {
|
|
if arr, ok := val.([]LogField); ok {
|
|
return context.WithValue(ctx, fieldsContextKey, append(arr, fields...))
|
|
}
|
|
}
|
|
|
|
return context.WithValue(ctx, fieldsContextKey, fields)
|
|
}
|
|
|
|
// WithFields returns a new logger with the given fields.
|
|
// deprecated: use ContextWithFields instead.
|
|
func WithFields(ctx context.Context, fields ...LogField) context.Context {
|
|
return ContextWithFields(ctx, fields...)
|
|
}
|