Skip to content

Commit 0657336

Browse files
[otel] add awslogsencodingextension (#11107)
* [otel] add awslogsencodingextension * add changelog * mage notice * add pr number
1 parent 558deea commit 0657336

File tree

10 files changed

+3367
-2043
lines changed

10 files changed

+3367
-2043
lines changed

NOTICE-fips.txt

Lines changed: 2238 additions & 1603 deletions
Large diffs are not rendered by default.

NOTICE.txt

Lines changed: 1075 additions & 440 deletions
Large diffs are not rendered by default.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: feature
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: edot-add-awslogsencodingextension
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
#description:
20+
21+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
22+
component: "elastic-agent"
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
pr: https://github.com/elastic/elastic-agent/pull/11107
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
#issue: https://github.com/owner/repo/1234

go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ require (
202202
github.com/armon/go-metrics v0.4.1 // indirect
203203
github.com/armon/go-radix v1.0.0 // indirect
204204
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
205+
github.com/aws/aws-lambda-go v1.49.0 // indirect
205206
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4 // indirect
206207
github.com/aws/aws-sdk-go-v2 v1.39.2 // indirect
207208
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
@@ -505,6 +506,8 @@ require (
505506
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.137.0 // indirect
506507
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.137.0 // indirect
507508
github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.137.0 // indirect
509+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.137.0 // indirect
510+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/awslogsencodingextension v0.137.0 // indirect
508511
github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.137.0 // indirect
509512
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.137.0 // indirect
510513
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.137.0 // indirect

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
249249
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
250250
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
251251
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
252+
github.com/aws/aws-lambda-go v1.49.0 h1:z4VhTqkFZPM3xpEtTqWqRqsRH4TZBMJqTkRiBPYLqIQ=
253+
github.com/aws/aws-lambda-go v1.49.0/go.mod h1:dpMpZgvWx5vuQJfBt0zqBha60q7Dd7RfgJv23DymV8A=
252254
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4 h1:2jAwFwA0Xgcx94dUId+K24yFabsKYDtAhCgyMit6OqE=
253255
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4/go.mod h1:MVYeeOhILFFemC/XlYTClvBjYZrg/EPd3ts885KrNTI=
254256
github.com/aws/aws-sdk-go-v2 v1.39.2 h1:EJLg8IdbzgeD7xgvZ+I8M1e0fL0ptn/M47lianzth0I=
@@ -1229,6 +1231,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokena
12291231
github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.137.0/go.mod h1:oe5y7XQcd8nW+SWDFtk9txkqwRVnzrPEi1OPhyEuFE8=
12301232
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.137.0 h1:Dpsto78q/LWlECjAzscwtbD4NH27Amk6Tmw24LaOb0s=
12311233
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.137.0/go.mod h1:rYu+Ex82lNvBg91LWe5Jk33ghjbrZ6GDUP/E+EOeobE=
1234+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/awslogsencodingextension v0.137.0 h1:4D1EX2uesc8upD6CnpiB5z5cMzQgno3D3kGnP1jcS4Y=
1235+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/awslogsencodingextension v0.137.0/go.mod h1:Cyd89KD73XpK9btCkN+gX0iP2Ma6ZDSM0iU5S1g61Ic=
12321236
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.137.0 h1:Ewyz9J434LiiEXaUwZ3IbrildylJrGMSqTxJM1NZqsE=
12331237
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.137.0/go.mod h1:03iI0GydfIdzEyNnXZHkU2Rz5bZGyYl7yYNiCJ3dR4Y=
12341238
github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.137.0 h1:nm9ub4mLaOR11HTwEypAXbBk2X+YGfZZMQpsqm3gNyk=

internal/edot/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.137.0
2323
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.137.0
2424
github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.137.0
25+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/awslogsencodingextension v0.137.0
2526
github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.137.0
2627
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.137.0
2728
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.137.0
@@ -181,6 +182,7 @@ require (
181182
github.com/armon/go-metrics v0.4.1 // indirect
182183
github.com/armon/go-radix v1.0.0 // indirect
183184
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
185+
github.com/aws/aws-lambda-go v1.49.0 // indirect
184186
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4 // indirect
185187
github.com/aws/aws-sdk-go-v2 v1.39.2 // indirect
186188
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
@@ -449,6 +451,7 @@ require (
449451
github.com/oklog/ulid/v2 v2.1.1 // indirect
450452
github.com/open-telemetry/opamp-go v0.22.0 // indirect
451453
github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.138.0 // indirect
454+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.137.0 // indirect
452455
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.137.0 // indirect
453456
github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.137.0 // indirect
454457
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.137.0 // indirect

internal/edot/go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
225225
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
226226
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
227227
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
228+
github.com/aws/aws-lambda-go v1.49.0 h1:z4VhTqkFZPM3xpEtTqWqRqsRH4TZBMJqTkRiBPYLqIQ=
229+
github.com/aws/aws-lambda-go v1.49.0/go.mod h1:dpMpZgvWx5vuQJfBt0zqBha60q7Dd7RfgJv23DymV8A=
228230
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4 h1:2jAwFwA0Xgcx94dUId+K24yFabsKYDtAhCgyMit6OqE=
229231
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4/go.mod h1:MVYeeOhILFFemC/XlYTClvBjYZrg/EPd3ts885KrNTI=
230232
github.com/aws/aws-sdk-go-v2 v1.39.2 h1:EJLg8IdbzgeD7xgvZ+I8M1e0fL0ptn/M47lianzth0I=
@@ -1080,6 +1082,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokena
10801082
github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.137.0/go.mod h1:oe5y7XQcd8nW+SWDFtk9txkqwRVnzrPEi1OPhyEuFE8=
10811083
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.137.0 h1:Dpsto78q/LWlECjAzscwtbD4NH27Amk6Tmw24LaOb0s=
10821084
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.137.0/go.mod h1:rYu+Ex82lNvBg91LWe5Jk33ghjbrZ6GDUP/E+EOeobE=
1085+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/awslogsencodingextension v0.137.0 h1:4D1EX2uesc8upD6CnpiB5z5cMzQgno3D3kGnP1jcS4Y=
1086+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/awslogsencodingextension v0.137.0/go.mod h1:Cyd89KD73XpK9btCkN+gX0iP2Ma6ZDSM0iU5S1g61Ic=
10831087
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.137.0 h1:Ewyz9J434LiiEXaUwZ3IbrildylJrGMSqTxJM1NZqsE=
10841088
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.137.0/go.mod h1:03iI0GydfIdzEyNnXZHkU2Rz5bZGyYl7yYNiCJ3dR4Y=
10851089
github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.137.0 h1:nm9ub4mLaOR11HTwEypAXbBk2X+YGfZZMQpsqm3gNyk=

internal/edot/otelcol/components.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ import (
7373

7474
// Extensions
7575
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension"
76+
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/awslogsencodingextension"
7677
headersetterextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension"
7778
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension"
7879
healthcheckv2extension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension"
@@ -208,6 +209,7 @@ func components(extensionFactories ...extension.Factory) func() (otelcol.Factori
208209
headersetterextension.NewFactory(),
209210
beatsauthextension.NewFactory(),
210211
elasticdiagnostics.NewFactory(),
212+
awslogsencodingextension.NewFactory(),
211213
}
212214
extensions = append(extensions, extensionFactories...)
213215
factories.Extensions, err = otelcol.MakeFactoryMap[extension.Factory](extensions...)

internal/pkg/otel/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ This section provides a summary of components included in the Elastic Distributi
101101
|---|---|
102102
| [apikeyauthextension](https://github.com/elastic/opentelemetry-collector-components/blob/extension/apikeyauthextension/v0.8.0/extension/apikeyauthextension/README.md) | v0.8.0 |
103103
| [apmconfigextension](https://github.com/elastic/opentelemetry-collector-components/blob/extension/apmconfigextension/v0.8.0/extension/apmconfigextension/README.md) | v0.8.0 |
104+
| [awslogsencodingextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/encoding/awslogsencodingextension/v0.137.0/extension/encoding/awslogsencodingextension/README.md) | v0.137.0 |
104105
| [bearertokenauthextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/bearertokenauthextension/v0.137.0/extension/bearertokenauthextension/README.md) | v0.137.0 |
105106
| [filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/storage/filestorage/v0.137.0/extension/storage/filestorage/README.md) | v0.137.0 |
106107
| [headerssetterextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/headerssetterextension/v0.137.0/extension/headerssetterextension/README.md) | v0.137.0 |

internal/pkg/otel/testdata/all-components.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ extensions:
2424
key: X-Scope-OrgID
2525
from_context: tenant_id
2626
default_value: Org-ID
27+
awslogs_encoding/elbaccess:
28+
format: elbaccess
2729

2830
processors:
2931
attributes:
@@ -87,6 +89,8 @@ receivers:
8789
s3downloader:
8890
s3_bucket: 'test'
8991
s3_prefix: 'test'
92+
encodings:
93+
- extension: awslogs_encoding/elbaccess
9094

9195

9296
connectors:
@@ -122,6 +126,7 @@ service:
122126
- memory_limiter
123127
- health_check
124128
- headers_setter
129+
- awslogs_encoding/elbaccess
125130
pipelines:
126131
logs:
127132
exporters:

0 commit comments

Comments
 (0)