Skip to content

Commit 2e975fe

Browse files
authored
[receiver/awsfirehose] remove error logging on gzip.Reader type assertion failure due to nil value (#38352)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Fixing a bug. We see a lot of error logs after upgrading `opentelemetry-collector-contrib` to 0.120.0: ``` Expected *gzip.Reader, got *gzip.Reader ``` The root cause is that the type assertion in the following code could return `ok=false` when `r` is `nil`. This could happen when the marshaller is instantiated and there's no value in `gzipPool` yet. ``` r, ok := u.gzipPool.Get().(*gzip.Reader) if !ok { u.logger.Error(fmt.Sprintf("Expected *gzip.Reader, got %T", r)) // Fall through and create a new *gzip.Reader (r == nil) } ``` This PR removes the error log. Since we are instantiating the reader only in the line right below ``` r, err = gzip.NewReader(bytes.NewReader(compressedRecord)) ``` I don't think checking the type assertion result and logging an error is really necessary.
1 parent 7219cc4 commit 2e975fe

File tree

2 files changed

+27
-4
lines changed

2 files changed

+27
-4
lines changed
Lines changed: 27 additions & 0 deletions
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: awsfirehosereceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove error log when gzip reader type assertion fails due to nil value
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: [38352]
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: [user]

receiver/awsfirehosereceiver/internal/unmarshaler/cwlog/unmarshaler.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ func (u *Unmarshaler) UnmarshalLogs(compressedRecord []byte) (plog.Logs, error)
5353
var err error
5454
r, ok := u.gzipPool.Get().(*gzip.Reader)
5555
if !ok {
56-
u.logger.Error(fmt.Sprintf("Expected *gzip.Reader, got %T", r))
57-
// Fall through and create a new *gzip.Reader (r == nil)
58-
}
59-
if r == nil {
6056
r, err = gzip.NewReader(bytes.NewReader(compressedRecord))
6157
} else {
6258
err = r.Reset(bytes.NewReader(compressedRecord))

0 commit comments

Comments
 (0)