You've already forked opentelemetry-go
mirror of
https://github.com/open-telemetry/opentelemetry-go.git
synced 2025-08-10 22:31:50 +02:00
log,sdk/log: add EventName to EnabledParameters (#6825)
Fixes https://github.com/open-telemetry/opentelemetry-go/issues/6771
This commit is contained in:
@@ -57,4 +57,5 @@ type FilterProcessor interface {
|
||||
type EnabledParameters struct {
|
||||
InstrumentationScope instrumentation.Scope
|
||||
Severity log.Severity
|
||||
EventName string
|
||||
}
|
||||
|
@@ -52,6 +52,7 @@ func (l *logger) Enabled(ctx context.Context, param log.EnabledParameters) bool
|
||||
p := EnabledParameters{
|
||||
InstrumentationScope: l.instrumentationScope,
|
||||
Severity: param.Severity,
|
||||
EventName: param.EventName,
|
||||
}
|
||||
|
||||
// If there are more Processors than FilterProcessors,
|
||||
|
@@ -231,6 +231,7 @@ func TestLoggerEnabled(t *testing.T) {
|
||||
name string
|
||||
logger *logger
|
||||
ctx context.Context
|
||||
param log.EnabledParameters
|
||||
expected bool
|
||||
expectedP0Params []EnabledParameters
|
||||
expectedP1Params []EnabledParameters
|
||||
@@ -248,10 +249,16 @@ func TestLoggerEnabled(t *testing.T) {
|
||||
WithProcessor(p0),
|
||||
WithProcessor(p1),
|
||||
), instrumentation.Scope{Name: "scope"}),
|
||||
ctx: context.Background(),
|
||||
ctx: context.Background(),
|
||||
param: log.EnabledParameters{
|
||||
Severity: log.SeverityInfo,
|
||||
EventName: "test_event",
|
||||
},
|
||||
expected: true,
|
||||
expectedP0Params: []EnabledParameters{{
|
||||
InstrumentationScope: instrumentation.Scope{Name: "scope"},
|
||||
Severity: log.SeverityInfo,
|
||||
EventName: "test_event",
|
||||
}},
|
||||
expectedP1Params: nil,
|
||||
},
|
||||
@@ -295,7 +302,7 @@ func TestLoggerEnabled(t *testing.T) {
|
||||
p1.params = nil
|
||||
p2WithDisabled.params = nil
|
||||
|
||||
assert.Equal(t, tc.expected, tc.logger.Enabled(tc.ctx, log.EnabledParameters{}))
|
||||
assert.Equal(t, tc.expected, tc.logger.Enabled(tc.ctx, tc.param))
|
||||
assert.Equal(t, tc.expectedP0Params, p0.params)
|
||||
assert.Equal(t, tc.expectedP1Params, p1.params)
|
||||
assert.Equal(t, tc.expectedP2Params, p2WithDisabled.params)
|
||||
|
Reference in New Issue
Block a user