Skip to content

Commit 84ff4da

Browse files
authored
sdk/log: remove EnabledParameters.Resource (#6494)
Per open-telemetry/opentelemetry-specification#4439 (comment)
1 parent 37b70ce commit 84ff4da

File tree

4 files changed

+1
-11
lines changed

4 files changed

+1
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
1111
### Removed
1212

1313
- Drop support for [Go 1.22]. (#6381, #6418)
14+
- Remove `Resource` field from `EnabledParameters` in `go.opentelemetry.io/otel/sdk/log`. (#6494)
1415

1516
### Changed
1617

sdk/log/filter_processor.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
"go.opentelemetry.io/otel/log"
1010
"go.opentelemetry.io/otel/sdk/instrumentation"
11-
"go.opentelemetry.io/otel/sdk/resource"
1211
)
1312

1413
// FilterProcessor is a [Processor] that knows, and can identify, what [Record]
@@ -56,7 +55,6 @@ type FilterProcessor interface {
5655

5756
// EnabledParameters represents payload for [FilterProcessor]'s Enabled method.
5857
type EnabledParameters struct {
59-
Resource resource.Resource
6058
InstrumentationScope instrumentation.Scope
6159
Severity log.Severity
6260
}

sdk/log/logger.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ func (l *logger) Emit(ctx context.Context, r log.Record) {
5050
// returned if it can be positively verified that no Processor will process.
5151
func (l *logger) Enabled(ctx context.Context, param log.EnabledParameters) bool {
5252
p := EnabledParameters{
53-
Resource: *l.provider.resource,
5453
InstrumentationScope: l.instrumentationScope,
5554
Severity: param.Severity,
5655
}

sdk/log/logger_test.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,6 @@ func TestLoggerEnabled(t *testing.T) {
224224
p1 := newFltrProcessor("1", true)
225225
p2WithDisabled := newFltrProcessor("2", false)
226226

227-
emptyResource := resource.Empty()
228-
res := resource.NewSchemaless(attribute.String("key", "value"))
229-
230227
testCases := []struct {
231228
name string
232229
logger *logger
@@ -247,12 +244,10 @@ func TestLoggerEnabled(t *testing.T) {
247244
logger: newLogger(NewLoggerProvider(
248245
WithProcessor(p0),
249246
WithProcessor(p1),
250-
WithResource(res),
251247
), instrumentation.Scope{Name: "scope"}),
252248
ctx: context.Background(),
253249
expected: true,
254250
expectedP0Params: []EnabledParameters{{
255-
Resource: *res,
256251
InstrumentationScope: instrumentation.Scope{Name: "scope"},
257252
}},
258253
expectedP1Params: nil,
@@ -261,7 +256,6 @@ func TestLoggerEnabled(t *testing.T) {
261256
name: "WithDisabledProcessors",
262257
logger: newLogger(NewLoggerProvider(
263258
WithProcessor(p2WithDisabled),
264-
WithResource(emptyResource),
265259
), instrumentation.Scope{}),
266260
ctx: context.Background(),
267261
expected: false,
@@ -272,7 +266,6 @@ func TestLoggerEnabled(t *testing.T) {
272266
logger: newLogger(NewLoggerProvider(
273267
WithProcessor(p2WithDisabled),
274268
WithProcessor(p0),
275-
WithResource(emptyResource),
276269
), instrumentation.Scope{}),
277270
ctx: context.Background(),
278271
expected: true,
@@ -284,7 +277,6 @@ func TestLoggerEnabled(t *testing.T) {
284277
logger: newLogger(NewLoggerProvider(
285278
WithProcessor(p0),
286279
WithProcessor(p1),
287-
WithResource(emptyResource),
288280
), instrumentation.Scope{}),
289281
ctx: nil,
290282
expected: true,

0 commit comments

Comments
 (0)