From 9c713af85cb1e484c9dcb19f2e47e57deec9651b Mon Sep 17 00:00:00 2001 From: Dan Jaglowski Date: Mon, 21 Aug 2023 13:55:38 -0400 Subject: [PATCH] [fileconsumer] Remove deprecated structs --- .../pkg-stanza-fileconsumer-rm-finder.yaml | 32 +++++++++++++++++++ pkg/stanza/fileconsumer/finder.go | 21 ------------ 2 files changed, 32 insertions(+), 21 deletions(-) create mode 100755 .chloggen/pkg-stanza-fileconsumer-rm-finder.yaml delete mode 100644 pkg/stanza/fileconsumer/finder.go diff --git a/.chloggen/pkg-stanza-fileconsumer-rm-finder.yaml b/.chloggen/pkg-stanza-fileconsumer-rm-finder.yaml new file mode 100755 index 000000000000..607bfba585d2 --- /dev/null +++ b/.chloggen/pkg-stanza-fileconsumer-rm-finder.yaml @@ -0,0 +1,32 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: pkg/stanza + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove deprecated fileconsumer config structs + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24853] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: Includes | + - MatchingCriteria + - OrderingCriteria + - NumericSortRule + - AlphabeticalSortRule + - TimestampSortRule + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/pkg/stanza/fileconsumer/finder.go b/pkg/stanza/fileconsumer/finder.go deleted file mode 100644 index d04942a22b91..000000000000 --- a/pkg/stanza/fileconsumer/finder.go +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package fileconsumer // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer" - -import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/matcher" - -// Deprecated: [v0.83.0] Use matcher.Criteria instead. -type MatchingCriteria = matcher.Criteria - -// Deprecated: [v0.83.0] Use matcher.OrderingCriteria instead. -type OrderingCriteria = matcher.OrderingCriteria - -// Deprecated: [v0.83.0] Use matcher.Sort instead. -type NumericSortRule = matcher.Sort - -// Deprecated: [v0.83.0] Use matcher.Sort instead. -type AlphabeticalSortRule = matcher.Sort - -// Deprecated: [v0.83.0] Use matcher.Sort instead. -type TimestampSortRule = matcher.Sort