Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dev branch to be in sync with main #2363

Closed
wants to merge 69 commits into from
Closed

Update dev branch to be in sync with main #2363

wants to merge 69 commits into from

Conversation

Kausik-A
Copy link
Contributor

Description:

Update dev branch to be in sync with main.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

dependabot bot and others added 30 commits July 4, 2023 14:59
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.289 to 1.44.295.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](aws/aws-sdk-go@v1.44.289...v1.44.295)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* bump version to v0.31.0

* ignore tag compare that can fail in release notes

* check mdlc version

* Fix typo in pattern

* Update normalize featuregate note

* Update minimum go version used in workflows
* Update collector dependencies to v0.81.0

Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>

* dependabot updates Wed Jul 19 15:39:09 EDT 2023

Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>

---------

Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>
[chore] update main branch with release/v0.31.x
* Update the Collector deps to v0.82.0

* Update deps
* [dev] Vendor modules and add patch file for StatsD Receiver (#2221)

* go mod vendor

* Apply changes to workflows to apply patches

* Add statd feature gate patch

* Don't link check vendor docs

* Ignore vendor dir for linters

* Ignore shell scripts in vendor

* increase timeout for golangcilint

* Run go mod vendor to fix vendor issues

* Add statsd feature gatetest cases

---------

Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>
* kafka-fix

* Correct-patch

* Update MakeFile
* Add k8sattr to default components

* Add k8s attr testcases

* Add eks/eks arm64 to ci

* go mod tidy
Add the load balancing exporter and k8s attributes processor
* Set statsd by default and Add Log statement

* Modify doc

* Change to v0.33.0

* Rebase and correct the log
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* dependabot updates Fri Aug 11 04:54:34 UTC 2023
Bump github.com/aws/aws-sdk-go from 1.44.314 to 1.44.320 in /tools/workflow/cleaner #2263
Bump go.uber.org/zap from 1.24.0 to 1.25.0 #2257
Bump golang.org/x/sys from 0.10.0 to 0.11.0 #2256
Bump github.com/aws/aws-sdk-go-v2/config from 1.18.32 to 1.18.33 in /tools/release/image-mirror #2255
Bump github.com/google/go-containerregistry from 0.15.2 to 0.16.1 in /tools/release/image-mirror #2254
Bump github.com/aws/aws-sdk-go-v2/service/ecrpublic from 1.17.1 to 1.17.2 in /tools/release/image-mirror #2253
Bump golang.org/x/tools from 0.11.1 to 0.12.0 in /tools/workflow/linters #2247

* Update vendor packages

Signed-off-by: Raphael Silva <rapphil@gmail.com>

---------

Signed-off-by: Raphael Silva <rapphil@gmail.com>
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.320 to 1.44.321.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](aws/aws-sdk-go@v1.44.320...v1.44.321)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
* Fix: don't overwrite .env file

Do not overwrite the .env file in case ctl commands are executed.
This is specially important if extra environment variables are passed in the .env file

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Add tests for control script

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Fix typo in github workflow

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Fix shell linting errors

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Update .github/workflows/PR-build.yml

* Make debian aligned with RPM

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* properly install collector deb

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Use dpkg to install collector

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Properly use cache

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Move control script tests to the CI

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Add the pr-build tests back

Signed-off-by: Raphael Silva <rapphil@gmail.com>

---------

Signed-off-by: Raphael Silva <rapphil@gmail.com>
Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>
Signed-off-by: Raphael Silva <rapphil@gmail.com>
Signed-off-by: Raphael Silva <rapphil@gmail.com>
…cript-sed

Fix control script to avoid sed special characters
* bump version to v0.32.0

* Add windows version update

* Port fix of ctl script to v0.32.0 release (#2269)

* Fix: don't overwrite .env file (#2261)

* Fix: don't overwrite .env file

Do not overwrite the .env file in case ctl commands are executed.
This is specially important if extra environment variables are passed in the .env file

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Add tests for control script

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Fix typo in github workflow

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Fix shell linting errors

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Update .github/workflows/PR-build.yml

* Make debian aligned with RPM

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* properly install collector deb

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Use dpkg to install collector

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Properly use cache

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Move control script tests to the CI

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Add the pr-build tests back

Signed-off-by: Raphael Silva <rapphil@gmail.com>

---------

Signed-off-by: Raphael Silva <rapphil@gmail.com>
Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>

* Fix control script to avoid sed special characters

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Fix typo in tests

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Update release notes

Signed-off-by: Raphael Silva <rapphil@gmail.com>

---------

Signed-off-by: Raphael Silva <rapphil@gmail.com>
Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>

---------

Signed-off-by: Raphael Silva <rapphil@gmail.com>
Co-authored-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>
bryan-aguilar and others added 26 commits August 15, 2023 13:03
[chore] update upstream collector versions
)

Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.53.3 to 1.54.1.
- [Release notes](https://github.com/golangci/golangci-lint/releases)
- [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md)
- [Commits](golangci/golangci-lint@v1.53.3...v1.54.1)

---
updated-dependencies:
- dependency-name: github.com/golangci/golangci-lint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com>
…2202)

Bumps [benchmark-action/github-action-benchmark](https://github.com/benchmark-action/github-action-benchmark) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/benchmark-action/github-action-benchmark/releases)
- [Changelog](https://github.com/benchmark-action/github-action-benchmark/blob/master/CHANGELOG.md)
- [Commits](benchmark-action/github-action-benchmark@v1.17.0...v1.18.0)

---
updated-dependencies:
- dependency-name: benchmark-action/github-action-benchmark
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com>
…oot to aoc in Linux (#2259)

* Removing code that switched user from root to aoc in linux

* Adding aoc user in the systemd service
[aoc-collector non-root user]: Removing code that changes user
#2299)

* Statement about non-root user breaking change for awscontainerinightreceiver component

* Resolving Comments

* Adding the Issue Link

* Update README.md

---------

Co-authored-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>
* update upstream otel v0.84.0

* Update StatSD Patch file

* bump version to v0.33.0

* Add statsd_instscopedisabled testcase

* Update go version in workflows to 1.20.8

* [aoc-collector non-root user]:  Statement breaking change non root user (#2299)

* Statement about non-root user breaking change for awscontainerinightreceiver component

* Resolving Comments

* Adding the Issue Link

* Update README.md

---------

Co-authored-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>

---------

Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com>
Co-authored-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
Signed-off-by: Raphael Silva <rapphil@gmail.com>
[chore] update main post v0.33.0 release
* Add dependency to build-aot-util

* Avoid build if cache is restored and fail on miss
* update dependabot

* bump configure aws credentials

* bump checkout
* Remove Log for AOT_CONFIG_CONTENT (#2349)

* Prepare for release v0.33.1 (#2352)
* Remove Log for AOT_CONFIG_CONTENT

* Update Version to v0.32.1
@Kausik-A Kausik-A requested a review from a team as a code owner September 21, 2023 18:07
Copy link
Contributor

@bryan-aguilar bryan-aguilar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are many errors with this merge. Please wait for #2365 to be merged and try again. It should be easier without the vendor volder.

Copy link
Contributor

@bryan-aguilar bryan-aguilar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blocking per previous comment

@Kausik-A Kausik-A closed this Sep 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants