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

chore: Merge upstream changes #8

Merged
merged 8 commits into from
Nov 21, 2023
Merged

Conversation

jdehaan
Copy link
Collaborator

@jdehaan jdehaan commented Nov 21, 2023

No description provided.

HoneyryderChuck and others added 8 commits November 21, 2023 13:55
* added httpx opentelemetry adapter

* Update instrumentation/httpx/CHANGELOG.md

Co-authored-by: Ariel Valentin <[email protected]>

* Update instrumentation/httpx/README.md

Co-authored-by: Ariel Valentin <[email protected]>

* Update instrumentation/httpx/README.md

Co-authored-by: Ariel Valentin <[email protected]>

---------

Co-authored-by: Ariel Valentin <[email protected]>
Co-authored-by: Josef Šimánek <[email protected]>
The toys gem checks that all actions are passing before allowing
a release request to be opened, however only the CI builds are actually required.

This change limits the release request requirements to look specifically for CI builds
…elease) (open-telemetry#713)

* release: Release opentelemetry-instrumentation-httpx 0.1.0 (initial release)

* Update instrumentation/httpx/CHANGELOG.md
* feat!: Drop Rails 6.0 EOL

6.0 is no longer receiving maintenance, security, or feature updates as of 01 Jun 2023

Users who want to continue instrumentating Rails applications should pin to earlier versions of the instrumentation.

* squash: Fix test

* squash: gem version object instead of string

* Update README.md

Co-authored-by: Kayla Reopelle (she/her) <[email protected]>

* Update instrumentation/README.md

Co-authored-by: Kayla Reopelle (she/her) <[email protected]>

---------

Co-authored-by: Kayla Reopelle (she/her) <[email protected]>
fix: Removal Sinatra 1.x Appraisal

Rack 1.x is not directly supported anymore. Sinatra 1.x in turn
"is not". Removal appraisal and add a compatibility note to both
Sinatra and Rack for proper instrumentation version usage.

Co-authored-by: Ariel Valentin <[email protected]>
@jdehaan jdehaan self-assigned this Nov 21, 2023
@jdehaan jdehaan requested a review from Hareramrai November 21, 2023 13:59
Copy link
Collaborator

@Hareramrai Hareramrai left a comment

Choose a reason for hiding this comment

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

👍

@jdehaan jdehaan merged commit 991b18b into main-aoeur Nov 21, 2023
@jdehaan jdehaan deleted the chore/2023-11-21-merge-upstream branch November 21, 2023 14:03
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.

6 participants