Merge branch 'master' into currency-add-new-pipeline

instana · Nov 20, 2024 · 1bad392 · 1bad392
2 parents 25a2760 + 0c3e239
commit 1bad392
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -443,6 +443,23 @@ workflows:
                 - "./gemfiles/rails_61.gemfile"
                 - "./gemfiles/rails_70.gemfile"
                 - "./gemfiles/rails_71.gemfile"
+  rails8_ruby_33_34:
+    jobs:
+      - test_apprisal:
+          matrix:
+            parameters:
+              stack:
+                - ruby_32
+                - ruby_32_postgres
+                - ruby_32_mysql2
+                - ruby_33
+                - ruby_33_postgres
+                - ruby_33_mysql2
+                - ruby_34
+                - ruby_34_postgres
+                - ruby_34_mysql2
+              gemfile:
+                - "./gemfiles/rails_80.gemfile"
   sequel:
       jobs:
       - test_apprisal:

diff --git a/gemfiles/rails_80.gemfile b/gemfiles/rails_80.gemfile
@@ -0,0 +1,17 @@
+# (c) Copyright IBM Corp. 2024
+
+source "https://rubygems.org"
+
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "mail", ">= 2.8.1"
+gem "mutex_m" # mutex_m is not part of the default gems since Ruby 3.4.0
+gem "rails", ">= 8.0"
+gem "mysql2", "0.5.5"
+gem "pg"
+gem "sqlite3", ">= 2.1"
+
+gemspec path: "../"
diff --git a/lib/instana.rb b/lib/instana.rb
@@ -1,6 +1,6 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2016
-if ENV.fetch('INSTANA_DISABLE', false)
+if ENV.fetch('INSTANA_DISABLE', false) && defined?(::Instana)
   Object.send(:remove_const, :Instana)
 end
 

diff --git a/lib/instana/version.rb b/lib/instana/version.rb
@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.216.0"
+  VERSION = "1.217.0"
   VERSION_FULL = "instana-#{VERSION}"
 end
diff --git a/test/frameworks/sinatra_test.rb b/test/frameworks/sinatra_test.rb
@@ -7,6 +7,7 @@
 class SinatraTest < Minitest::Test
   include Rack::Test::Methods
   APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru')
+
   sinatra_version = Gem::Specification.find_by_name('sinatra').version
   if sinatra_version < Gem::Version.new('4.0.0')
     APP = APP.first
@@ -18,8 +19,8 @@ def app
 
   def test_basic_get
     clear_all!
-
     r = get '/'
+
     assert last_response.ok?
 
 

diff --git a/test/support/apps/sinatra/config.ru b/test/support/apps/sinatra/config.ru
@@ -5,10 +5,14 @@ class InstanaSinatraApp < ::Sinatra::Base
   get '/' do
     "Hello Sinatra!"
   end
-  
+
   get '/greet/:name' do
     "Hello, #{params[:name]}!"
   end
+
+  configure do
+    set :host_authorization, {permitted_hosts: "example.org"}
+  end
 end
 
 run InstanaSinatraApp