From 5334075f540041a8333850fba64c7ce068b5bcb3 Mon Sep 17 00:00:00 2001 From: Alexis Perez-Mendoza Date: Wed, 21 Feb 2024 15:50:20 -0800 Subject: [PATCH 1/3] bump version to v0.38.0 --- VERSION | 2 +- docs/releases/v0.38.0.md | 23 +++++++++++++++++++ .../packaging/windows/aws-otel-collector.wxs | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 docs/releases/v0.38.0.md diff --git a/VERSION b/VERSION index d90dff7ad..765098dc4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.37.1 +v0.38.0 diff --git a/docs/releases/v0.38.0.md b/docs/releases/v0.38.0.md new file mode 100644 index 000000000..55b4d1f9e --- /dev/null +++ b/docs/releases/v0.38.0.md @@ -0,0 +1,23 @@ +# Changelog + +## [v0.38.0](https://github.com/aws-observability/aws-otel-collector/tree/v0.38.0) (2024-02-21) + +[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.37.1...v0.38.0) + +**Closed issues:** + +- Add release to fix CVE-2024-21626 [\#2643](https://github.com/aws-observability/aws-otel-collector/issues/2643) + +**Merged pull requests:** + +- \[chore\] Update main with v0.37.1 tag [\#2649](https://github.com/aws-observability/aws-otel-collector/pull/2649) ([bryan-aguilar](https://github.com/bryan-aguilar)) +- \[chore\] update main post v0.37.1 [\#2648](https://github.com/aws-observability/aws-otel-collector/pull/2648) ([bryan-aguilar](https://github.com/bryan-aguilar)) +- Add More regexes for Lambda Layer cleaner [\#2647](https://github.com/aws-observability/aws-otel-collector/pull/2647) ([vasireddy99](https://github.com/vasireddy99)) +- Update go dependencies [\#2638](https://github.com/aws-observability/aws-otel-collector/pull/2638) ([bryan-aguilar](https://github.com/bryan-aguilar)) +- Ignore OTEL Collector updates from dependabot [\#2636](https://github.com/aws-observability/aws-otel-collector/pull/2636) ([bryan-aguilar](https://github.com/bryan-aguilar)) +- Add Lambda Layer Version cleaner [\#2611](https://github.com/aws-observability/aws-otel-collector/pull/2611) ([vasireddy99](https://github.com/vasireddy99)) +- Update main post v0.37.0 [\#2587](https://github.com/aws-observability/aws-otel-collector/pull/2587) ([bryan-aguilar](https://github.com/bryan-aguilar)) + + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/tools/packaging/windows/aws-otel-collector.wxs b/tools/packaging/windows/aws-otel-collector.wxs index 296247ed3..931c72814 100644 --- a/tools/packaging/windows/aws-otel-collector.wxs +++ b/tools/packaging/windows/aws-otel-collector.wxs @@ -3,7 +3,7 @@ From e55bb282be8c22b3fa63c1b7821dcf21685c1af1 Mon Sep 17 00:00:00 2001 From: Alexis Perez <50466397+alexperez52@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:26:16 -0800 Subject: [PATCH 2/3] Remove unecessary updates (#2656) --- docs/releases/v0.38.0.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/releases/v0.38.0.md b/docs/releases/v0.38.0.md index 55b4d1f9e..0159353ef 100644 --- a/docs/releases/v0.38.0.md +++ b/docs/releases/v0.38.0.md @@ -10,13 +10,7 @@ **Merged pull requests:** -- \[chore\] Update main with v0.37.1 tag [\#2649](https://github.com/aws-observability/aws-otel-collector/pull/2649) ([bryan-aguilar](https://github.com/bryan-aguilar)) -- \[chore\] update main post v0.37.1 [\#2648](https://github.com/aws-observability/aws-otel-collector/pull/2648) ([bryan-aguilar](https://github.com/bryan-aguilar)) -- Add More regexes for Lambda Layer cleaner [\#2647](https://github.com/aws-observability/aws-otel-collector/pull/2647) ([vasireddy99](https://github.com/vasireddy99)) - Update go dependencies [\#2638](https://github.com/aws-observability/aws-otel-collector/pull/2638) ([bryan-aguilar](https://github.com/bryan-aguilar)) -- Ignore OTEL Collector updates from dependabot [\#2636](https://github.com/aws-observability/aws-otel-collector/pull/2636) ([bryan-aguilar](https://github.com/bryan-aguilar)) -- Add Lambda Layer Version cleaner [\#2611](https://github.com/aws-observability/aws-otel-collector/pull/2611) ([vasireddy99](https://github.com/vasireddy99)) -- Update main post v0.37.0 [\#2587](https://github.com/aws-observability/aws-otel-collector/pull/2587) ([bryan-aguilar](https://github.com/bryan-aguilar)) From 42611ce7848261893d0b848c2c2838520d36eabb Mon Sep 17 00:00:00 2001 From: Vasi Vasireddy Date: Wed, 21 Feb 2024 16:59:32 -0800 Subject: [PATCH 3/3] Remove replace for go-tup --- go.mod | 6 ------ 1 file changed, 6 deletions(-) diff --git a/go.mod b/go.mod index 227ac07dc..dbfeb9456 100644 --- a/go.mod +++ b/go.mod @@ -429,12 +429,6 @@ exclude github.com/ionos-cloud/sdk-go/v6 v6.0.5851 // https://github.com/go-openapi/spec/issues/156 replace github.com/go-openapi/spec v0.20.5 => github.com/go-openapi/spec v0.20.6 -// This replace can be removed once it is patched to v0.3.2 upstream -// see https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/exporter/datadogexporter/go.mod#L116 -// Also see the source version from the datadog agent -// https://github.com/DataDog/datadog-agent/blob/main/go.mod#L26 -replace github.com/theupdateframework/go-tuf v0.3.1 => github.com/DataDog/go-tuf v0.3.0--fix-localmeta - // excluded as DataDog/agent-payload/v5 v5.0.59 has been removed from source directory but is still present in proxy package exclude github.com/DataDog/agent-payload/v5 v5.0.59 // indirect