-
Notifications
You must be signed in to change notification settings - Fork 375
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
Add hanami app to integration CI configurations #3639
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
removed
the
dev/ci
Involves CircleCI, GitHub Actions, or GitLab
label
May 13, 2024
TonyCTHsu
approved these changes
May 15, 2024
There isn't always a datadog specification defined, update code to account for it missing.
* master: (22 commits) Remove experimental warning from OpenTelemetry.md Remove latest tag on docker images add installer system tests Extract trace id format helper method (DataDog#3670) Remaps http status code tag for otel span for trace metrics (DataDog#3664) Update .github/labeler.yml Use 3.20 rb -> ruby Add a note about `use` vs `instrument` GitHub: Update labeller bot with new products Update lockfiles for release 2.0.0.rc1 Bump version 2.0.0.beta2 to 2.0.0.rc1 Add 2.0.0.rc1 to CHANGELOG.md chore(lib-injection): update base image to alpine 3.18.6 Apply suggestions from code review Revert "DEBUG-2334 Add Debugger component (DataDog#3640)" Implement `latest_major` and `lastest_minor` tag for docker init container (DataDog#3643) Build oci package Update `rexml` (DataDog#3656) Remove bundler cache in for `setup-ruby` step and pin bundler and rubygem version ...
* master: Add missing Apache 2.0 license from gemspec Use ffi 1.16.3 Add platform Output gem version Output debug logs Fix spec to exclude .vscode directory Fix docker run command Add vscode settings for dockerfile file associations Update gem version Update gemfiles/* Update `ffi` in Gemfile
This file appears to be loaded by `require 'hanami'` and overrides actual Hanami code, making the integration application unusable when it uses Hanami.
Due to `set -u`, if a ruby version is not specified to build-images, the script fails at the attempt to check if it's empty. Initialize the variable to the empty value to get the intended behavior.
The tests attempt to invoke hanami with unicorn, but the unicorn configuration for hanami was missing resulting in failure.
* master: Update lockfiles for release 2.0.0 Bump version 2.0.0.rc1 to 2.0.0 Add 2.0.0 to CHANGELOG.md
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #3639 +/- ##
=======================================
Coverage 98.10% 98.11%
=======================================
Files 1225 1225
Lines 72522 72522
Branches 3446 3446
=======================================
+ Hits 71151 71152 +1
+ Misses 1371 1370 -1 ☔ View full report in Codecov by Sentry. |
TonyCTHsu
approved these changes
Jun 6, 2024
I ran all of the tests in #3690. |
p-datadog
pushed a commit
to MITSUBOSHI/dd-trace-rb
that referenced
this pull request
Jun 6, 2024
* master: (34 commits) Add hanami app to integration CI configurations (DataDog#3639) Update UpgradeGuide in README.md Update lockfiles for release 2.0.0 Bump version 2.0.0.rc1 to 2.0.0 Add 2.0.0 to CHANGELOG.md Add missing Apache 2.0 license from gemspec Use ffi 1.16.3 Add platform Output gem version Output debug logs Fix spec to exclude .vscode directory Fix docker run command Add vscode settings for dockerfile file associations Update gem version Update gemfiles/* Update `ffi` in Gemfile Remove experimental warning from OpenTelemetry.md Remove latest tag on docker images add installer system tests Extract trace id format helper method (DataDog#3670) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
l
What does this PR do?
Adds hanami to CI configurations, as requested in #2546.
Several things needed to be fixed for the tests to pass:
hanami.rb
which looks to have been intended to mock Hanami framework (?). The app requires the actual hanami framework to function and this empty file was loaded instead of hanami itself. I removed the file.I also made the image build script work when ruby version isn't given and to provide a help message so that someone new to this area of the code could actually get it running locally.
Motivation:
Review of #2546.
Test plan
The tests are running on Ruby 2.6 and 2.7 only. Hanami 1 (1.3.5, more exactly) that is currently being used in these tests is not compatible with Ruby 3.