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

Added --add-attrbitues flag and brings in recent changes to main #7

Merged
merged 17 commits into from
Dec 24, 2024

Conversation

ryanrolds
Copy link
Collaborator

@ryanrolds ryanrolds commented Dec 24, 2024

The PR is a bit messy because the flag work was done off main, which has upstream changes, that haven't made into solo-io. Getting main merged in gets us closer to getting off the solo-ci branch.

In our CI pipelines we call the same tests several times in slightly different contexts. We need to be able to pass through labels to differentiate between suites/tests.

Added a Make target for running tests.

ryanrolds and others added 14 commits December 19, 2024 07:57
* Updating OTEL client

* Updated OTEL client

* Fixing issue with error about exporting being shutdown

* Removed some commented code

* Fixed newline causing test to fail

* Updating Go version

* Updating Go version

* Updating Go version

* Removed port debugging output
Bumps [github.com/joshdk/go-junit](https://github.com/joshdk/go-junit) from 0.0.0-20210226021600-6145f504ca0d to 1.0.0.
- [Release notes](https://github.com/joshdk/go-junit/releases)
- [Commits](https://github.com/joshdk/go-junit/commits/v1.0.0)

---
updated-dependencies:
- dependency-name: github.com/joshdk/go-junit
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: use non-deprecated API

* chore: bump tc-go to latest release

* chore: use testcontainers-go newer APIs

* chore: use testing library as much as possible

* chore: use filepath

* fix: do not swallow errors

* chore: use testify's require

* chore: use testing library

* chore: use testing library as much as possible

* chore: better test names

* chore: add helper

* chore: rename helper function

* chore: use wait for file

* chore: use docker compose binary

* chore: use testdata

* fix: reset state inn test
* fix: create span processor with batch size

* chore: make batch size configurable using a command-line flag

* chore: use testing library to set up env vars in tests

* chore: extract creation of test containers to a method

* fix: swap json objects parsing

* fix: swap back

* chore: increase batch size in tests
Bumps [gotest.tools/gotestsum](https://github.com/gotestyourself/gotestsum) from 1.8.2 to 1.12.0.
- [Release notes](https://github.com/gotestyourself/gotestsum/releases)
- [Commits](gotestyourself/gotestsum@v1.8.2...v1.12.0)

---
updated-dependencies:
- dependency-name: gotest.tools/gotestsum
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ya#94)

* deps: bump github.com/go-git/go-git/v5 from 5.4.2 to 5.12.0

Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.4.2 to 5.12.0.
- [Release notes](https://github.com/go-git/go-git/releases)
- [Commits](go-git/go-git@v5.4.2...v5.12.0)

---
updated-dependencies:
- dependency-name: github.com/go-git/go-git/v5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix: use proper target branch name in tests

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Manuel de la Peña <[email protected]>
* Updating OTEL client

* Updated OTEL client

* Fixed newline causing test to fail

* Adding an allow list for properties

* Added default value to make it cleaner

* Removed debug code

* Removed port debugging output

* Improved test reliability

* Switch to waiting for port

* Tidy the mods
@ryanrolds ryanrolds changed the title Added --add-attrbitues flag Added --add-attrbitues flag and brings in recent changes to main Dec 24, 2024
@ryanrolds ryanrolds marked this pull request as ready for review December 24, 2024 17:02
Copy link

@nfuden nfuden left a comment

Choose a reason for hiding this comment

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

Now this is going be a real annoying request. Can we first fastforward our fork and then squash all your commits into one squashed commit?
Also happy to not do that if its too painful.

I do like the attributes and how it lets you know that you are passing something bad in if it doesnt follow the right semantics!

@ryanrolds
Copy link
Collaborator Author

We will be moving off this branch once upstream is caught up. So, lets not worry about it being perfect.

@ryanrolds ryanrolds merged commit 0e32b95 into solo-ci Dec 24, 2024
1 check passed
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.

3 participants