mirror of
https://github.com/zeromicro/go-zero.git
synced 2025-01-24 09:40:24 +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>
36 lines
928 B
Go
36 lines
928 B
Go
package logx
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestContextWithFields(t *testing.T) {
|
|
ctx := ContextWithFields(context.Background(), Field("a", 1), Field("b", 2))
|
|
vals := ctx.Value(fieldsContextKey)
|
|
assert.NotNil(t, vals)
|
|
fields, ok := vals.([]LogField)
|
|
assert.True(t, ok)
|
|
assert.EqualValues(t, []LogField{Field("a", 1), Field("b", 2)}, fields)
|
|
}
|
|
|
|
func TestWithFieldsAppend(t *testing.T) {
|
|
var dummyKey struct{}
|
|
ctx := context.WithValue(context.Background(), dummyKey, "dummy")
|
|
ctx = ContextWithFields(ctx, Field("a", 1), Field("b", 2))
|
|
ctx = ContextWithFields(ctx, Field("c", 3), Field("d", 4))
|
|
vals := ctx.Value(fieldsContextKey)
|
|
assert.NotNil(t, vals)
|
|
fields, ok := vals.([]LogField)
|
|
assert.True(t, ok)
|
|
assert.Equal(t, "dummy", ctx.Value(dummyKey))
|
|
assert.EqualValues(t, []LogField{
|
|
Field("a", 1),
|
|
Field("b", 2),
|
|
Field("c", 3),
|
|
Field("d", 4),
|
|
}, fields)
|
|
}
|