From f35fc5c5a0953151e13d691d6c315478de7b9e5c Mon Sep 17 00:00:00 2001 From: Paulo Dias Date: Wed, 25 Mar 2026 21:01:35 +0100 Subject: [PATCH] [chore][pkg/stanza] Remove deprecated NilField type from entry package Signed-off-by: Paulo Dias --- pkg/stanza/entry/nil_field.go | 36 --------------------------- pkg/stanza/entry/nil_field_test.go | 40 ------------------------------ 2 files changed, 76 deletions(-) delete mode 100644 pkg/stanza/entry/nil_field.go delete mode 100644 pkg/stanza/entry/nil_field_test.go diff --git a/pkg/stanza/entry/nil_field.go b/pkg/stanza/entry/nil_field.go deleted file mode 100644 index 39ce10648f1f..000000000000 --- a/pkg/stanza/entry/nil_field.go +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package entry // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/entry" - -// NilField is a struct that implements Field, but -// does nothing for all its operations. It is useful -// as a default no-op field to avoid nil checks. -// -// Deprecated: Originally used for empty Field comparisons, -// use Field.IsEmpty instead. -type NilField struct{} - -// Get will return always return nil -func (NilField) Get(*Entry) (any, bool) { - return nil, true -} - -// Set will do nothing and return no error -func (NilField) Set(*Entry, any) error { - return nil -} - -// Delete will do nothing and return no error -func (NilField) Delete(*Entry) (any, bool) { - return nil, true -} - -func (NilField) String() string { - return "$nil" -} - -// NewNilField will create a new nil field -func NewNilField() Field { - return Field{FieldInterface: NilField{}} -} diff --git a/pkg/stanza/entry/nil_field_test.go b/pkg/stanza/entry/nil_field_test.go deleted file mode 100644 index 1193b9d3410f..000000000000 --- a/pkg/stanza/entry/nil_field_test.go +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package entry - -import ( - "testing" - - "github.com/stretchr/testify/require" -) - -func TestNilFieldGet(t *testing.T) { - entry := &Entry{} - nilField := NewNilField() - value, ok := nilField.Get(entry) - require.True(t, ok) - require.Nil(t, value) -} - -func TestNilFieldSet(t *testing.T) { - entry := &Entry{} - nilField := NewNilField() - err := nilField.Set(entry, "value") - require.NoError(t, err) - require.Equal(t, Entry{}, *entry) -} - -func TestNilFieldDelete(t *testing.T) { - entry := &Entry{} - nilField := NewNilField() - value, ok := nilField.Delete(entry) - require.True(t, ok) - require.Nil(t, value) - require.Equal(t, Entry{}, *entry) -} - -func TestNilFieldString(t *testing.T) { - nilField := NewNilField() - require.Equal(t, "$nil", nilField.String()) -}