diff --git a/VERSION b/VERSION index b4a466a810..39c21135f5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.38.1 +v0.38.2 diff --git a/docs/releases/v0.38.2.md b/docs/releases/v0.38.2.md new file mode 100644 index 0000000000..d56bfb84ea --- /dev/null +++ b/docs/releases/v0.38.2.md @@ -0,0 +1,14 @@ +# Changelog + +## [v0.38.2](https://github.com/aws-observability/aws-otel-collector/tree/v0.38.2) (2024-04-23) + +[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.38.1...v0.38.2) + +**Updates:** + +- Update Go to 1.22.2 +- Update golang.org/x/net to 0.24.0 +- Update docker dependency to 25.0.5 + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/go.mod b/go.mod index c3acd43e97..abbd857062 100644 --- a/go.mod +++ b/go.mod @@ -434,3 +434,5 @@ exclude github.com/DataDog/agent-payload/v5 v5.0.59 // indirect // openshift removed all tags from their repo, use the pseudoversion from the release-3.9 branch HEAD replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37 + +replace github.com/docker/docker v25.0.3+incompatible => github.com/docker/docker v25.0.5+incompatible diff --git a/go.sum b/go.sum index 7017cc4e67..94f85e10af 100644 --- a/go.sum +++ b/go.sum @@ -264,8 +264,8 @@ github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/docker v25.0.3+incompatible h1:D5fy/lYmY7bvZa0XTZ5/UJPljor41F+vdyJG5luQLfQ= -github.com/docker/docker v25.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.5+incompatible h1:UmQydMduGkrD5nQde1mecF/YnSbTOaPeFIeP5C4W+DE= +github.com/docker/docker v25.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= diff --git a/testbed/go.mod b/testbed/go.mod index c47b86e9cb..283117e649 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -432,3 +432,5 @@ replace github.com/go-openapi/spec v0.20.5 => github.com/go-openapi/spec v0.20.9 replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37 replace github.com/aws-observability/aws-otel-collector => ../ + +replace github.com/docker/docker v25.0.3+incompatible => github.com/docker/docker v25.0.5+incompatible diff --git a/testbed/go.sum b/testbed/go.sum index af02e98450..c7466acd91 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -268,8 +268,8 @@ github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/docker v25.0.3+incompatible h1:D5fy/lYmY7bvZa0XTZ5/UJPljor41F+vdyJG5luQLfQ= -github.com/docker/docker v25.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.5+incompatible h1:UmQydMduGkrD5nQde1mecF/YnSbTOaPeFIeP5C4W+DE= +github.com/docker/docker v25.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= diff --git a/tools/packaging/windows/aws-otel-collector.wxs b/tools/packaging/windows/aws-otel-collector.wxs index 2e35247ec5..5384870692 100644 --- a/tools/packaging/windows/aws-otel-collector.wxs +++ b/tools/packaging/windows/aws-otel-collector.wxs @@ -3,7 +3,7 @@ diff --git a/tools/release/image-mirror/go.mod b/tools/release/image-mirror/go.mod index 00f7f9f81c..fc56c7c05d 100644 --- a/tools/release/image-mirror/go.mod +++ b/tools/release/image-mirror/go.mod @@ -63,3 +63,5 @@ require ( // see https://github.com/aws-observability/aws-otel-collector/issues/977 exclude github.com/docker/distribution v2.8.0+incompatible + +replace github.com/docker/docker v25.0.3+incompatible => github.com/docker/docker v25.0.5+incompatible diff --git a/tools/release/image-mirror/go.sum b/tools/release/image-mirror/go.sum index 102b43bca8..9fd42599db 100644 --- a/tools/release/image-mirror/go.sum +++ b/tools/release/image-mirror/go.sum @@ -49,8 +49,8 @@ github.com/docker/cli v24.0.0+incompatible h1:0+1VshNwBQzQAx9lOl+OYCTCEAD8fKs/qe github.com/docker/cli v24.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v25.0.3+incompatible h1:D5fy/lYmY7bvZa0XTZ5/UJPljor41F+vdyJG5luQLfQ= -github.com/docker/docker v25.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.5+incompatible h1:UmQydMduGkrD5nQde1mecF/YnSbTOaPeFIeP5C4W+DE= +github.com/docker/docker v25.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=