Skip to content

Commit 2d91302

Browse files
authored
[receiver/tcplog] remove SplitFuncBuilder from mapstructure (#39485)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description The `SplitFuncBuilder` field is part of the collector's effective configuration, which it shouldn't be. We can't marshal/unmarshal functions. This PR removes it. It also solves a collector panic reported by #39474 <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes #39474 <!--Please delete paragraphs that you did not use before submitting.-->
1 parent b5fb587 commit 2d91302

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: tcplogreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Ignore SplitFuncBuilder field to prevent panic during config marshaling
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [39474]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

pkg/stanza/operator/input/tcp/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ type BaseConfig struct {
7171
Encoding string `mapstructure:"encoding,omitempty"`
7272
SplitConfig split.Config `mapstructure:"multiline,omitempty"`
7373
TrimConfig trim.Config `mapstructure:",squash"`
74-
SplitFuncBuilder SplitFuncBuilder
74+
SplitFuncBuilder SplitFuncBuilder `mapstructure:"-"`
7575
}
7676

7777
type SplitFuncBuilder func(enc encoding.Encoding) (bufio.SplitFunc, error)

0 commit comments

Comments
 (0)