Update Ruby test application and agent Dockerfile

.github/workflows/ruby.yml

@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: check-modified-files
     # run only if files were modified, the workflow was manually invoked, or doing a release
-    if: needs.check-modified-files.outputs.files-changed == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' && endsWith(github.ref, '_ruby')
+    if: needs.check-modified-files.outputs.files-changed == 'true' || github.event_name == 'workflow_dispatch' || (github.event_name == 'release' && endsWith(github.ref, '_ruby'))
 
     steps:
       - name: Checkout code

src/ruby/Dockerfile

@@ -6,6 +6,8 @@
 FROM ruby:latest AS build
 WORKDIR /operator-build
 
+ARG AGENT_VERSION
+
 # Install gems from Gemfile into the `workspace` directory
 ADD Gemfile .
 RUN BUNDLE_PATH=workspace bundle install
@@ -21,7 +23,7 @@ WORKDIR /operator-build
 # Copy the result into a new directory called `/instrumentation`.
 RUN sh -c "find 'workspace/ruby/' -type d -name newrelic_rpm\\* -exec cp -r '{}' /instrumentation \\;"
 
-# Adjust permissions of `instrumentation` director to readable by everyone
+# Adjust permissions of `instrumentation` directory to readable by everyone
 RUN chmod -R go+r /instrumentation
 
 # Clean up build artifacts

src/ruby/Gemfile

@@ -2,4 +2,4 @@
 
 source 'https://rubygems.org'
 
-gem 'newrelic_rpm'
+gem *['newrelic_rpm', ENV.fetch('AGENT_VERSION', nil)].compact

tests/ruby/config.ru

@@ -1,3 +1,5 @@
-require './app.rb'
+require 'bundler'
+Bunder.require
 
+require './app.rb'
 run Sinatra::Application

tests/ruby/start.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Start ruby app and provide time to boot Puma
-ruby app.rb & sleep 5
+bundle exec rackup & sleep 5
 
 # Hit endponint
 while true; do