Revert "[AWS Cloudwatch] Fix Tags for APIGW"

[ycombinator]

Reverts #40755 because since that PR was merged, we're seeing the https://buildkite.com/elastic/beats-packaging-pipeline consistently failing like so when it tries to run mage package on Agentbeat:

# github.com/elastic/beats/v7/x-pack/agentbeat
/usr/local/go/pkg/tool/linux_amd64/link: running aarch64-linux-gnu-gcc failed: exit status 1
/usr/lib/gcc-cross/aarch64-linux-gnu/6/../../../../aarch64-linux-gnu/bin/ld.gold: internal error in maybe_apply_stub, at ../../gold/aarch64.cc:5407
collect2: error: ld returned 1 exit status
Error: running "go build -o build/golang-crossbuild/agentbeat-linux-arm64 -buildmode pie -gcflags=all=-N -l -tags=agentbeat -ldflags -X github.com/elastic/beats/v7/libbeat/version.buildTime=2024-10-03T12:37:52Z -X github.com/elastic/beats/v7/libbeat/version.commit=698951e8c895eff9d03a8d0ececadba3b8b4c6bb" failed with exit code 1

[botelastic]

This pull request doesn't have a Team:<team> label.

[mergify]

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @ycombinator? 🙏.
For such, you'll need to label your PR with:

• The upcoming major version of the Elastic Stack
• The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

• backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

[mergify]

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

[ycombinator]

CI is green on this PR but I don't see the https://buildkite.com/elastic/beats-packaging-pipeline step being run on this PR. Pinged @rowlandgeoff off-PR to ask why that might be. Without knowing if this step succeeds on this PR, its hard to say with 100% confidence that merging this PR will make main CI green again.

[jlind23]

@axw We might need your review on this to unblock Beats CI

[axw]

Approving to hopefully unblock CI, but there's nothing unusual in this PR, so seems like something more systemic needs addressing.

[ycombinator]

Approving to hopefully unblock CI, but there's nothing unusual in this PR, so seems like something more systemic needs addressing.

Thanks @axw. Yeah, nothing in the PR jumps out as the cause but this failure is (at least so far) only being observed with #40755. Since we've merged this revert PR here, we haven't seen the same failure on main. So it's something specific to #40755 that we'll need to dig into.