Update cyphar/filepath-securejoin and sirupsen/logrus versions (#2392)

* Update cyphar/filepath-securejoin  and sirupsen/logrus versions

* Create patch file to update Update cyphar/filepath-securejoin  and sirupsen/logrus versions

* Revert "Update cyphar/filepath-securejoin  and sirupsen/logrus versions"

This reverts commit d145754.

* Revert "Create patch file to update Update cyphar/filepath-securejoin  and sirupsen/logrus versions"

This reverts commit ef52353.

* Include replace statments to Update cyphar/filepath-securejoin  and sirupsen/logrus versions

* Go mod tidy

* bump version to v0.33.2

* Update version number

* Update go Version to 1.20.9

* go mod vendor

* Increase go linter timeout

.github/workflows/CI.yml

@@ -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.20.8
+  GO_VERSION: ~1.20.9
 
 
 concurrency:

.github/workflows/PR-build.yml

@@ -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.20.8
+  GO_VERSION: ~1.20.9
 
 concurrency:
   group: pr-build-${{ github.event.pull_request.number }}

.github/workflows/aws-resources-clean.yml

@@ -24,7 +24,7 @@ on:
         default: "3"
 env:
   DAYS_TO_KEEP: 3
-  GO_VERSION: ~1.20.8
+  GO_VERSION: ~1.20.9
 
 permissions:
   id-token: write

.github/workflows/perf.yml

@@ -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.20.8
+  GO_VERSION: ~1.20.9
 
 permissions:
   id-token: write

Makefile.Common

@@ -27,7 +27,7 @@ fmt:
 
 .PHONY: lint
 lint:
-	$(TOOL_BIN)/$(LINT) run --timeout 10m --enable gosec
+	$(TOOL_BIN)/$(LINT) run --timeout 20m --enable gosec
 
 .PHONY: mod-tidy
 mod-tidy:

VERSION

@@ -1 +1 @@
-v0.33.1
+v0.33.2

docs/releases/v0.33.2.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## [v0.33.2](https://github.com/aws-observability/aws-otel-collector/tree/v0.33.2) (2023-10-06)
+
+[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.33.1...v0.33.2)
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

go.mod

@@ -443,3 +443,7 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api
 replace github.com/DataDog/datadog-agent/pkg/proto => github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1
 
 replace github.com/DataDog/datadog-agent/pkg/trace => github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1
+
+replace github.com/cyphar/filepath-securejoin v0.2.3 => github.com/cyphar/filepath-securejoin v0.2.4
+
+replace github.com/sirupsen/logrus v1.9.0 => github.com/sirupsen/logrus v1.9.3

go.sum

@@ -370,8 +370,8 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ=
-github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI=
-github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
+github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
+github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/daixiang0/gci v0.2.8/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc=
 github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -1668,8 +1668,8 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.8.0/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
 github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=

tools/packaging/windows/aws-otel-collector.wxs

@@ -3,7 +3,7 @@
     <Product Id="EBBD8548-75D1-41D3-A402-ABE189F0C167"
 UpgradeCode="B7C263DD-95A5-436A-A025-DCA5200C2BE3"
 Name="ADOT Collector"
-Version="0.33.1"
+Version="0.33.2"
 Codepage='1252'
 Manufacturer="Amazon.com, Inc."
 Language="1033">

vendor/modules.txt

@@ -409,7 +409,7 @@ github.com/containerd/ttrpc
 # github.com/coreos/go-systemd/v22 v22.5.0
 ## explicit; go 1.12
 github.com/coreos/go-systemd/v22/dbus
-# github.com/cyphar/filepath-securejoin v0.2.3
+# github.com/cyphar/filepath-securejoin v0.2.3 => github.com/cyphar/filepath-securejoin v0.2.4
 ## explicit; go 1.13
 github.com/cyphar/filepath-securejoin
 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
@@ -1565,7 +1565,7 @@ github.com/signalfx/signalfx-agent/pkg/apm/log
 github.com/signalfx/signalfx-agent/pkg/apm/requests
 github.com/signalfx/signalfx-agent/pkg/apm/requests/requestcounter
 github.com/signalfx/signalfx-agent/pkg/apm/tracetracker
-# github.com/sirupsen/logrus v1.9.0
+# github.com/sirupsen/logrus v1.9.0 => github.com/sirupsen/logrus v1.9.3
 ## explicit; go 1.13
 github.com/sirupsen/logrus
 # github.com/smartystreets/assertions v1.0.1