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

[OTEL-1337] Merge upstream main to prod #34

Merged
merged 163 commits into from
Jan 5, 2024
Merged

[OTEL-1337] Merge upstream main to prod #34

merged 163 commits into from
Jan 5, 2024

Conversation

songy23
Copy link
Member

@songy23 songy23 commented Jan 3, 2024

No description provided.

renovate bot and others added 30 commits July 27, 2023 17:04
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <austin@ap2.io>
Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
…1003)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
…elemetry#1005)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
…protos to v2.22.1 (open-telemetry#1012)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
…ry#1000)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
Co-authored-by: Austin Parker <austin@ap2.io>
…emetry#1008)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <austin@ap2.io>
…#1010)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <austin@ap2.io>
)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <austin@ap2.io>
…open-telemetry#1023)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <austin@ap2.io>
…1024)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <austin@ap2.io>
…ry#1031)

* Update docker-compose.minimal.yml

* Update docker-compose.minimal.yml

Co-authored-by: Juliano Costa <julianocosta89@outlook.com>

* Update docker-compose.minimal.yml

* Update docker-compose.minimal.yml

* Remove spaces

---------

Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <austin@ap2.io>
…emetry#1029)

* Update node to LTS version and bump deps

* changelog

* Changelog
* pin eclipse image

* add comments

---------

Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
* chore(tests): allow partial runs on trace-based test scripts

* Adding option to run trace-based tests for selected services

* Updating testing README

* Fixing sanity checks

* Fixing lint issues

* Apply suggestions from code review

Co-authored-by: Adnan Rahić <ado.raha198@gmail.com>

* Update README.md with suggestions

* Updating Changelog

* Fixing linter issue

* Fixed changelog

---------

Co-authored-by: Adnan Rahić <ado.raha198@gmail.com>
Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
Co-authored-by: Austin Parker <austin@ap2.io>
Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
* update cadence

* update every other
* Revert collector back to contrib distribution
…protos to v2.22.1 (open-telemetry#1045)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
…#1044)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <austin@ap2.io>
Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
puckpuck and others added 7 commits December 22, 2023 21:23
…1305)

* update to 1.7 release

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add create namespace

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
* Update dependencies and semconv

* changelog
* fix cartServiceFailure flag

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* fix cartServiceFailure flag

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
@songy23 songy23 force-pushed the merge-main-to-prod branch from edf1951 to 00176da Compare January 3, 2024 18:09
@songy23 songy23 changed the title Merge upstream main to prod [WIP][OTEL-1337]Merge upstream main to prod Jan 4, 2024
@songy23 songy23 changed the title [WIP][OTEL-1337]Merge upstream main to prod [WIP][OTEL-1337] Merge upstream main to prod Jan 4, 2024
@songy23 songy23 force-pushed the merge-main-to-prod branch from 00176da to 2fe5949 Compare January 4, 2024 20:07
@songy23 songy23 closed this Jan 4, 2024
@songy23 songy23 reopened this Jan 4, 2024
@songy23 songy23 force-pushed the merge-main-to-prod branch from ba4cf96 to e0aa42d Compare January 4, 2024 21:36
@songy23 songy23 changed the title [WIP][OTEL-1337] Merge upstream main to prod [OTEL-1337] Merge upstream main to prod Jan 5, 2024
@songy23 songy23 requested review from dineshg13 and mackjmr January 5, 2024 01:06
@songy23 songy23 marked this pull request as ready for review January 5, 2024 01:06
@songy23
Copy link
Member Author

songy23 commented Jan 5, 2024

@dineshg13 @mackjmr PTAL at 2fe5949, want to make sure I didn't accidentally introduce unwanted changes.

@songy23 songy23 force-pushed the merge-main-to-prod branch from 4034dc0 to 651517a Compare January 5, 2024 01:10
@songy23 songy23 merged commit bc5ad0f into prod Jan 5, 2024
40 checks passed
@songy23 songy23 deleted the merge-main-to-prod branch January 5, 2024 18:01
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.