Skip to content

Commit 7449277

Browse files
authored
Merge pull request #2737 from aws-observability/release/v0.39.x
Merge Release/v0.39.x to main
2 parents a0e6a01 + fb02e65 commit 7449277

File tree

15,376 files changed

+4563707
-43
lines changed

Some content is hidden

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

15,376 files changed

+4563707
-43
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.22.2
53+
GO_VERSION: ~1.22.3
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.22.2
28+
GO_VERSION: ~1.22.3
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.22.2
27+
GO_VERSION: ~1.22.3
2828

2929
permissions:
3030
id-token: write

.github/workflows/canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- name: Set up Go 1.x
5858
uses: actions/setup-go@v5
5959
with:
60-
go-version: '~1.22.2'
60+
go-version: '~1.22.3'
6161
cache-dependency-path: testing-framework/cmd/aotutil/go.sum
6262
- name: Build aotutil
6363
run: cd testing-framework/cmd/aotutil && make build

.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.22.2
30+
GO_VERSION: ~1.22.3
3131

3232
permissions:
3333
id-token: write

.github/workflows/prod-image-mirror.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set up Go 1.x
3030
uses: actions/setup-go@v5
3131
with:
32-
go-version: ~1.22.2
32+
go-version: ~1.22.3
3333

3434
- name: Configure AWS Credentials
3535
uses: aws-actions/configure-aws-credentials@v4

README.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@ Use the community resources below for getting help with the ADOT Collector.
1818
* If you think you may have found a bug, open a [bug report](https://github.com/aws-observability/aws-otel-collector/issues/new?template=bug_report.md).
1919
* For contributing guidelines, refer to [CONTRIBUTING.md](CONTRIBUTING.md).
2020

21-
### Notice: ADOT Collector v0.35.0 Breaking Change
22-
Users of the `statsd` receiver, please refer to GitHub Issue - [Warning: StatsD Receiver → EMF Exporter Metric Pipeline Breaking Change](https://github.com/aws-observability/aws-otel-collector/issues/2249)
23-
for information on a breaking change.
24-
25-
### Notices: ADOT Collector v0.35.0 Breaking Changes
26-
* Users of the 'awscontainerinsightreceiver', please refer to the GitHub Issue - [Warning: Container Image Default User Change → Important consideration for AWSContainerInsightReceiver](https://github.com/aws-observability/aws-otel-collector/issues/2317) for more information on an upcoming breaking change.
27-
* Users of the `prometheus` or `prometheusremotewrite` exporters please refer to the GitHub Issue [Warning: ADOT Collector v0.35.0 breaking change](https://github.com/aws-observability/aws-otel-collector/issues/2367)
28-
for information on an upcoming breaking change.
21+
### Notice: ADOT Collector v0.41.0 Breaking Changes
22+
* Users of the `datadog`, `logzio`, `sapm`, `signalfx` exporter components. please refer to [Attention: ADOT Collector v0.41.0 breaking changes - third party exporters deprecation](https://github.com/aws-observability/aws-otel-collector/issues/2734)
23+
for more information on an upcoming breaking change .
2924

3025
#### ADOT Collector Built-in Components
3126

VERSION

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

cmd/awscollector/main.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ func main() {
5252
log.Printf("found no extra config, skip it, err: %v", err)
5353
}
5454

55+
// TODO : Remove after v0.41.0 release
56+
log.Printf("attn: users of the `datadog`, `logzio`, `sapm`, `signalfx` exporter components. please refer to " +
57+
"https://github.com/aws-observability/aws-otel-collector/issues/2734 in regards to an ADOT Collector v0.41.0 " +
58+
"breaking change")
59+
5560
logger.SetupErrorLogger()
5661

5762
// set the collector config from extracfg file
@@ -71,10 +76,10 @@ func main() {
7176
}
7277

7378
params := otelcol.CollectorSettings{
74-
Factories: defaultcomponents.Components,
75-
BuildInfo: info,
76-
LoggingOptions: []zap.Option{logger.WrapCoreOpt()},
77-
ConfigProvider: config.GetConfigProvider(flagSet),
79+
Factories: defaultcomponents.Components,
80+
BuildInfo: info,
81+
LoggingOptions: []zap.Option{logger.WrapCoreOpt()},
82+
ConfigProviderSettings: config.GetConfigProviderSettings(flagSet),
7883
}
7984

8085
if err = run(params, flagSet); err != nil {

docs/releases/v0.39.0.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Changelog
2+
3+
## [v0.39.0](https://github.com/aws-observability/aws-otel-collector/tree/v0.39.0) (2024-04-30)
4+
5+
[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.37.3...v0.39.0)
6+
7+
**Merged pull requests:**
8+
9+
- Bump OTel collector to `v0.98.0` [\#2724](https://github.com/aws-observability/aws-otel-collector/pull/2724) ([vasireddy99](https://github.com/vasireddy99))
10+
- Revert Signalfx exporter commit for send_otlp_histograms [\#2729](https://github.com/aws-observability/aws-otel-collector/pull/2729) ([vasireddy99](https://github.com/vasireddy99))
11+
- Add third Party components behind featuregate [\#2735](https://github.com/aws-observability/aws-otel-collector/pull/2735) ([vasireddy99](https://github.com/vasireddy99))
12+
13+
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

0 commit comments

Comments
 (0)