Skip to content

Commit 39a549a

Browse files
authored
Merge pull request #3020 from aws-observability/mergev043x
Merge release/v0.43.x into main
2 parents 34867ca + bb9ced5 commit 39a549a

File tree

86 files changed

+1967
-1706
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1967
-1706
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ env:
5050
DDB_TABLE_NAME: BatchTestCache
5151
MAX_JOBS: 110
5252
BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE
53-
GO_VERSION: ~1.24.1
53+
GO_VERSION: ~1.24.2
5454

5555

5656
concurrency:

.github/workflows/PR-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
IMAGE_NAME: aws-otel-collector
2626
PACKAGING_ROOT: build/packages
2727
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
28-
GO_VERSION: ~1.24.1
28+
GO_VERSION: ~1.24.2
2929

3030
concurrency:
3131
group: pr-build-${{ github.event.pull_request.number }}

.github/workflows/aws-resources-clean.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
default: "3"
2525
env:
2626
DAYS_TO_KEEP: 3
27-
GO_VERSION: ~1.24.1
27+
GO_VERSION: ~1.24.2
2828

2929
permissions:
3030
id-token: write

.github/workflows/perf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ env:
2727
COMMIT_USER: Github Actions
2828
COMMIT_EMAIL: [email protected]
2929
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
30-
GO_VERSION: ~1.24.1
30+
GO_VERSION: ~1.24.2
3131

3232
permissions:
3333
id-token: write

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.43.1
1+
v0.43.2

config/ecs/ecs-amp-prometheus.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ receivers:
1313
scrape_configs:
1414
- job_name: "otel-collector"
1515
static_configs:
16-
- targets: [${env:AWS_PROMETHEUS_SCRAPING_ENDPOINT}]
16+
- targets: ['${env:AWS_PROMETHEUS_SCRAPING_ENDPOINT}']
1717

1818
processors:
1919
batch/metrics:

config/ecs/ecs-amp-xray-prometheus.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ receivers:
1919
scrape_configs:
2020
- job_name: "otel-collector"
2121
static_configs:
22-
- targets: [${env:AWS_PROMETHEUS_SCRAPING_ENDPOINT}]
22+
- targets: ['${env:AWS_PROMETHEUS_SCRAPING_ENDPOINT}']
2323

2424
processors:
2525
batch/traces:

docs/releases/v0.43.2.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Changelog
2+
3+
## [v0.43.2](https://github.com/aws-observability/aws-otel-collector/tree/v0.43.2) (2025-04-02)
4+
5+
[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.43.1...v0.43.2)
6+
7+
**Merged pull requests:**
8+
9+
- Wrap environment variable substitution syntax in quotes under prometheus configuration [\#3017](https://github.com/aws-observability/aws-otel-collector/pull/3017) ([vasireddy99](https://github.com/vasireddy99))
10+
11+
12+
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ receivers:
77
scrape_configs:
88
- job_name: "test-prometheus-sample-app"
99
static_configs:
10-
- targets: [ ${env:PROMETHEUS_SAMPLE_APP} ]
10+
- targets: [ '${env:PROMETHEUS_SAMPLE_APP}' ]
1111
awsecscontainermetrics:
1212
collection_interval: 20s
1313

go.mod

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/aws-observability/aws-otel-collector
22

3-
go 1.22.7
3+
go 1.23.0
4+
5+
toolchain go1.23.2
46

57
require (
68
github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.117.0
@@ -70,7 +72,7 @@ require (
7072
go.opentelemetry.io/collector/receiver/otlpreceiver v0.117.0
7173
go.uber.org/multierr v1.11.0
7274
go.uber.org/zap v1.27.0
73-
golang.org/x/sys v0.29.0
75+
golang.org/x/sys v0.31.0
7476
gopkg.in/natefinch/lumberjack.v2 v2.2.1
7577
)
7678

@@ -247,7 +249,7 @@ require (
247249
github.com/godbus/dbus/v5 v5.1.0 // indirect
248250
github.com/gogo/googleapis v1.4.1 // indirect
249251
github.com/gogo/protobuf v1.3.2 // indirect
250-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
252+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
251253
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
252254
github.com/golang/mock v1.6.0 // indirect
253255
github.com/golang/protobuf v1.5.4 // indirect
@@ -492,14 +494,14 @@ require (
492494
go.uber.org/atomic v1.11.0 // indirect
493495
go.uber.org/dig v1.18.0 // indirect
494496
go.uber.org/fx v1.22.2 // indirect
495-
golang.org/x/crypto v0.32.0 // indirect
497+
golang.org/x/crypto v0.36.0 // indirect
496498
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
497499
golang.org/x/mod v0.22.0 // indirect
498-
golang.org/x/net v0.34.0 // indirect
500+
golang.org/x/net v0.38.0 // indirect
499501
golang.org/x/oauth2 v0.24.0 // indirect
500-
golang.org/x/sync v0.10.0 // indirect
501-
golang.org/x/term v0.28.0 // indirect
502-
golang.org/x/text v0.21.0 // indirect
502+
golang.org/x/sync v0.12.0 // indirect
503+
golang.org/x/term v0.30.0 // indirect
504+
golang.org/x/text v0.23.0 // indirect
503505
golang.org/x/time v0.7.0 // indirect
504506
golang.org/x/tools v0.28.0 // indirect
505507
gonum.org/v1/gonum v0.15.1 // indirect

0 commit comments

Comments
 (0)