Merge remote-tracking branch 'gregawoods/support-ruby-3.4' into pr-1510-and-1531

* gregawoods/support-ruby-3.4:
  Update changelog
  Fix failing mongo spec
  Add ruby version
  Update ruby regex to support ruby 3.4 elastic#1509

Author: jclusso

.ci/.ruby.yml

@@ -1,4 +1,5 @@
 VERSION:
+  - ruby:3.4
   - ruby:3.1
   - ruby:3.0
   - ruby:2.7

lib/elastic_apm/stacktrace_builder.rb

@@ -24,7 +24,7 @@ module ElasticAPM
   # @api private
   class StacktraceBuilder
     JAVA_FORMAT = /^(.+)\.([^.]+)\(([^:]+):(\d+)\)$/.freeze
-    RUBY_FORMAT = /^(.+?):(\d+)(?::in `(.+?)')?$/.freeze
+    RUBY_FORMAT = /^(.+?):(\d+)(?::in ['`](.+#)?(.+?)')?$/.freeze
 
     RUBY_VERS_REGEX = %r{ruby(/gems)?[-/](\d+\.)+\d}.freeze
     JRUBY_ORG_REGEX = %r{org/jruby}.freeze
@@ -77,9 +77,9 @@ def parse_line(line)
       ruby_match = line.match(RUBY_FORMAT)
 
       if ruby_match
-        _, file, number, method = ruby_match.to_a
+        _, file, number, module_name, method = ruby_match.to_a
         file.sub!(/\.class$/, '.rb')
-        module_name = nil
+        module_name&.sub!('#', '')
       else
         java_match = line.match(JAVA_FORMAT)
         _, module_name, method, file, number = java_match.to_a

spec/elastic_apm/spies/mongo_spec.rb

@@ -52,6 +52,7 @@ module ElasticAPM
         expect(db.instance).to eq 'elastic-apm-test'
         expect(db.type).to eq 'mongodb'
         expect(db.statement).to eq('{"listCollections"=>1}')
+                            .or eq("{\"listCollections\" => 1}")
         expect(db.user).to be nil
 
         destination = span.context.destination
@@ -102,6 +103,7 @@ module ElasticAPM
         expect(db.instance).to eq 'elastic-apm-test'
         expect(db.type).to eq 'mongodb'
         expect(db.statement).to eq('{"find"=>"testing", "filter"=>{"a"=>"bc"}}')
+                            .or eq("{\"find\" => \"testing\", \"filter\" => {\"a\" => \"bc\"}}")
         expect(db.user).to be nil
       end
     end