Skip to content

Commit

Permalink
Merge pull request #2658 from aws-observability/updateMain/v0.38.0
Browse files Browse the repository at this point in the history
Merge release into main
  • Loading branch information
Aneurysm9 committed Feb 23, 2024
2 parents a2ada55 + ef72e5f commit ac4813c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 8 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.37.1
v0.38.0
17 changes: 17 additions & 0 deletions docs/releases/v0.38.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# 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:**

- Update go dependencies [\#2638](https://github.com/aws-observability/aws-otel-collector/pull/2638) ([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)*
6 changes: 0 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/packaging/windows/aws-otel-collector.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Product Id="EBBD8548-75D1-41D3-A402-ABE189F0C167"
UpgradeCode="B7C263DD-95A5-436A-A025-DCA5200C2BE3"
Name="ADOT Collector"
Version="0.37.1"
Version="0.38.0"
Codepage='1252'
Manufacturer="Amazon.com, Inc."
Language="1033">
Expand Down

0 comments on commit ac4813c

Please sign in to comment.