Skip to content

Commit 763db4c

Browse files
Fix compiler error and add changelog
1 parent cdf6ea5 commit 763db4c

File tree

3 files changed

+33
-3
lines changed

3 files changed

+33
-3
lines changed

.chloggen/add-elb-access-log.yaml

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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: awslogsencodingextension
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add support for ELB Access Logs.
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: [40710]
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: []

extension/encoding/awslogsencodingextension/extension.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,11 @@ func newExtension(cfg *Config, settings extension.Settings) (*encodingExtension,
7878
}, nil
7979
case formatELBAccessLog:
8080
return &encodingExtension{
81-
unmarshaler: elbaccesslogs.NewELBAccessLogUnmarshaler(settings.BuildInfo),
82-
format: formatELBAccessLog,
81+
unmarshaler: elbaccesslogs.NewELBAccessLogUnmarshaler(
82+
settings.BuildInfo,
83+
settings.Logger,
84+
),
85+
format: formatELBAccessLog,
8386
}, nil
8487
default:
8588
// Format will have been validated by Config.Validate,

extension/encoding/awslogsencodingextension/internal/unmarshaler/elb-access-log/unmarshaler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func compressToGZIPReader(t *testing.T, buf []byte) io.Reader {
3636
// readAndCompressLogFile reads the data inside it, compresses it
3737
// and returns a GZIP reader for it.
3838
// in case of file containing uncompressed clb logs it returns a bytes.NewReader.
39-
func readAndCompressLogFile(t *testing.T, dir string, file string) io.Reader {
39+
func readAndCompressLogFile(t *testing.T, dir, file string) io.Reader {
4040
data, err := os.ReadFile(filepath.Join(dir, file))
4141
require.NoError(t, err)
4242
// CLB logs do not arrive in gzip format but in plain text

0 commit comments

Comments
 (0)