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/Dockerfile

@@ -8,9 +8,9 @@ RUN bundle install
 
 COPY . .
 
-EXPOSE 4567
+EXPOSE 9292
 
-#Ensure executable permissions
-RUN chmod +x start.sh
-
-CMD ["./start.sh"]
+CMD ["bundle", "exec", "rackup", "--host", "0.0.0.0", "--port", "9292"]
+ 
+# For local testing, run:
+# curl http://0.0.0.0:9292

tests/ruby/Gemfile

@@ -3,6 +3,5 @@
 source 'https://rubygems.org'
 
 gem 'sinatra'
-gem 'newrelic_rpm'
 
 gem "rackup", "~> 2.1"

tests/ruby/app.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
 require 'sinatra'
-require 'newrelic_rpm'
-
-set :bind, '0.0.0.0'
-set :port, 4567
 
 get '/' do
-  return 'no new relic txn' unless NewRelic::Agent::Tracer.current_transaction
+  status = NewRelic::Agent::Tracer.current_transaction ? 'active' : 'inactive'
 
-  'hello, world!'
+  "Hello, World! New Relic is #{status}"
 end

tests/ruby/chart/templates/deployment.yaml

@@ -20,7 +20,7 @@ spec:
           image: e2e/test-app-ruby:e2e
           imagePullPolicy: Never
           ports:
-            - containerPort: 4567
+            - containerPort: 9292
           env:
           - name: NEW_RELIC_APP_NAME
             value: k8s-e2e-test-app-ruby
@@ -40,7 +40,7 @@ metadata:
 spec:
   type: NodePort
   ports:
-  - port: 4567
-    targetPort: 4567
+  - port: 9292
+    targetPort: 9292
   selector:
     app: test-app-ruby

tests/ruby/config.ru

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