Skip to content

Commit

Permalink
fix: enabling gzip was causing eof errors upon decompression (#32081)
Browse files Browse the repository at this point in the history
**Description:** 
Fixed issue when enabling compression: gzip 

**Testing:** 
Locally decompressed the generated payloads before and after the fix

---------

Co-authored-by: Sean Marciniak <30928402+MovieStoreGuy@users.noreply.github.com>
  • Loading branch information
leorinat and MovieStoreGuy committed Apr 2, 2024
1 parent 1bb4967 commit e4c5b51
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 0 deletions.
27 changes: 27 additions & 0 deletions .chloggen/fix-compression-eof.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: exporter/awskinesisexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Fixed issue with compression what was causing EOF exceptions when attempting to decompress the payload"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [32081]

# (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:

# 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: [user]
7 changes: 7 additions & 0 deletions exporter/awskinesisexporter/internal/compress/compresser.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type bufferedResetWriter interface {
Write(p []byte) (int, error)
Flush() error
Reset(newWriter io.Writer)
Close() error
}

type Compressor interface {
Expand Down Expand Up @@ -74,5 +75,11 @@ func (c *compressor) Do(in []byte) ([]byte, error) {
return nil, err
}

if closer, ok := c.compression.(io.Closer); ok {
if err := closer.Close(); err != nil {
return nil, err
}
}

return buf.Bytes(), nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ func (n noop) Write(p []byte) (int, error) {
func (n noop) Flush() error {
return nil
}

func (n *noop) Close() error { return nil }

0 comments on commit e4c5b51

Please sign in to comment.