Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Release/v0.39.x to main #2737

Merged
merged 3 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ env:
DDB_TABLE_NAME: BatchTestCache
MAX_JOBS: 110
BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE
GO_VERSION: ~1.22.2
GO_VERSION: ~1.22.3


concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/PR-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
IMAGE_NAME: aws-otel-collector
PACKAGING_ROOT: build/packages
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
GO_VERSION: ~1.22.2
GO_VERSION: ~1.22.3

concurrency:
group: pr-build-${{ github.event.pull_request.number }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aws-resources-clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
default: "3"
env:
DAYS_TO_KEEP: 3
GO_VERSION: ~1.22.2
GO_VERSION: ~1.22.3

permissions:
id-token: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v5
with:
go-version: '~1.22.2'
go-version: '~1.22.3'
cache-dependency-path: testing-framework/cmd/aotutil/go.sum
- name: Build aotutil
run: cd testing-framework/cmd/aotutil && make build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
COMMIT_USER: Github Actions
COMMIT_EMAIL: [email protected]
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
GO_VERSION: ~1.22.2
GO_VERSION: ~1.22.3

permissions:
id-token: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod-image-mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v5
with:
go-version: ~1.22.2
go-version: ~1.22.3

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down
11 changes: 3 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@ Use the community resources below for getting help with the ADOT Collector.
* 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).
* For contributing guidelines, refer to [CONTRIBUTING.md](CONTRIBUTING.md).

### Notice: ADOT Collector v0.35.0 Breaking Change
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)
for information on a breaking change.

### Notices: ADOT Collector v0.35.0 Breaking Changes
* 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.
* 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)
for information on an upcoming breaking change.
### Notice: ADOT Collector v0.41.0 Breaking Changes
* 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)
for more information on an upcoming breaking change .

#### ADOT Collector Built-in Components

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.38.2
v0.39.0
13 changes: 9 additions & 4 deletions cmd/awscollector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ func main() {
log.Printf("found no extra config, skip it, err: %v", err)
}

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

logger.SetupErrorLogger()

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

params := otelcol.CollectorSettings{
Factories: defaultcomponents.Components,
BuildInfo: info,
LoggingOptions: []zap.Option{logger.WrapCoreOpt()},
ConfigProvider: config.GetConfigProvider(flagSet),
Factories: defaultcomponents.Components,
BuildInfo: info,
LoggingOptions: []zap.Option{logger.WrapCoreOpt()},
ConfigProviderSettings: config.GetConfigProviderSettings(flagSet),
}

if err = run(params, flagSet); err != nil {
Expand Down
13 changes: 13 additions & 0 deletions docs/releases/v0.39.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Changelog

## [v0.39.0](https://github.com/aws-observability/aws-otel-collector/tree/v0.39.0) (2024-04-30)

[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.37.3...v0.39.0)

**Merged pull requests:**

- Bump OTel collector to `v0.98.0` [\#2724](https://github.com/aws-observability/aws-otel-collector/pull/2724) ([vasireddy99](https://github.com/vasireddy99))
- Revert Signalfx exporter commit for send_otlp_histograms [\#2729](https://github.com/aws-observability/aws-otel-collector/pull/2729) ([vasireddy99](https://github.com/vasireddy99))
- Add third Party components behind featuregate [\#2735](https://github.com/aws-observability/aws-otel-collector/pull/2735) ([vasireddy99](https://github.com/vasireddy99))

\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
Loading
Loading