appsignal 3.0.2-java → 3.0.6-java

data/gemfiles/resque-2.gemfile

@@ -4,7 +4,3 @@ gem 'resque', "~> 2.0"
 gem 'sinatra'
 
 gemspec :path => '../'
-
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
-  gem 'nokogiri', '~> 1.6.0'
-end

data/gemfiles/sequel-435.gemfile

@@ -6,6 +6,5 @@ if RUBY_PLATFORM == "java"
 else
   gem 'sqlite3'
 end
-gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/sequel.gemfile

@@ -6,6 +6,5 @@ if RUBY_PLATFORM == "java"
 else
   gem 'sqlite3'
 end
-gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/sinatra.gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'sinatra'
-gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/lib/appsignal/extension.rb

@@ -40,6 +40,16 @@ module Appsignal
       def method_missing(m, *args, &block)
         super if Appsignal.testing?
       end
+
+      unless Appsignal.extension_loaded?
+        def data_map_new
+          Appsignal::Extension::MockData.new
+        end
+
+        def data_array_new
+          Appsignal::Extension::MockData.new
+        end
+      end
     end
 
     if Appsignal::System.jruby?
@@ -62,5 +72,45 @@ module Appsignal
         "#<#{self.class.name}:#{object_id} #{self}>"
       end
     end
+
+    # Mock of the {Data} class. This mock is used when the extension cannot be
+    # loaded. This mock listens to all method calls and does nothing, and
+    # prevents NoMethodErrors from being raised.
+    #
+    # Disabled in testing so we can make sure that we don't miss an extension
+    # function implementation.
+    #
+    # This class inherits from the {Data} class so that it passes type checks.
+    class MockData < Data
+      def initialize(*_args)
+        # JRuby extension requirement, as it sends a pointer to the Data object
+        # when creating it
+      end
+
+      def method_missing(_method, *_args, &_block)
+        super if Appsignal.testing?
+      end
+
+      def to_s
+        "{}"
+      end
+    end
+
+    # Mock of the {Transaction} class. This mock is used when the extension
+    # cannot be loaded. This mock listens to all method calls and does nothing,
+    # and prevents NoMethodErrors from being raised.
+    #
+    # Disabled in testing so we can make sure that we don't miss an extension
+    # function implementation.
+    class MockTransaction
+      def initialize(*_args)
+        # JRuby extension requirement, as it sends a pointer to the Transaction
+        # object when creating it
+      end
+
+      def method_missing(_method, *_args, &_block)
+        super if Appsignal.testing?
+      end
+    end
   end
 end

data/lib/appsignal/helpers/instrumentation.rb

@@ -223,7 +223,7 @@ module Appsignal
             "The namespace argument for `Appsignal.send_error` is deprecated. " \
             "Please use the block method to set the namespace instead.\n\n" \
             "  Appsignal.send_error(error) do |transaction|\n" \
-            "    transaction.namespace(#{namespace.inspect})\n" \
+            "    transaction.set_namespace(#{namespace.inspect})\n" \
             "  end\n\n" \
             "Appsignal.send_error called on location: #{call_location}"
         end
@@ -316,7 +316,7 @@ module Appsignal
             "The namespace argument for `Appsignal.set_error` is deprecated. " \
             "Please use the block method to set the namespace instead.\n\n" \
             "  Appsignal.set_error(error) do |transaction|\n" \
-            "    transaction.namespace(#{namespace.inspect})\n" \
+            "    transaction.set_namespace(#{namespace.inspect})\n" \
             "  end\n\n" \
             "Appsignal.set_error called on location: #{call_location}"
         end

data/lib/appsignal/hooks.rb

@@ -32,7 +32,7 @@ module Appsignal
         return unless dependencies_present?
         return if installed?
 
-        Appsignal.logger.info("Installing #{name} hook")
+        Appsignal.logger.debug("Installing #{name} hook")
         begin
           install
           @installed = true
@@ -108,3 +108,4 @@ require "appsignal/hooks/mongo_ruby_driver"
 require "appsignal/hooks/webmachine"
 require "appsignal/hooks/data_mapper"
 require "appsignal/hooks/que"
+require "appsignal/hooks/excon"

data/lib/appsignal/hooks/excon.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Appsignal
+  class Hooks
+    # @api private
+    class ExconHook < Appsignal::Hooks::Hook
+      register :excon
+
+      def dependencies_present?
+        Appsignal.config && defined?(::Excon)
+      end
+
+      def install
+        require "appsignal/integrations/excon"
+        ::Excon.defaults[:instrumentor] = Appsignal::Integrations::ExconIntegration
+      end
+    end
+  end
+end

data/lib/appsignal/integrations/excon.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Appsignal
+  module Integrations
+    module ExconIntegration
+      def self.instrument(name, data, &block)
+        namespace, *event = name.split(".")
+        rails_name = [event, namespace].flatten.join(".")
+
+        title =
+          if rails_name == "response.excon"
+            data[:host]
+          else
+            "#{data[:method].to_s.upcase} #{data[:scheme]}://#{data[:host]}"
+          end
+        Appsignal.instrument(rails_name, title, &block)
+      end
+    end
+  end
+end

data/lib/appsignal/integrations/padrino.rb

@@ -7,7 +7,7 @@ module Appsignal
     # @api private
     module PadrinoPlugin
       def self.init
-        Appsignal.logger.info("Loading Padrino (#{Padrino::VERSION}) integration")
+        Appsignal.logger.debug("Loading Padrino (#{Padrino::VERSION}) integration")
 
         root = Padrino.mounted_root
         Appsignal.config = Appsignal::Config.new(root, Padrino.env)

data/lib/appsignal/integrations/railtie.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Appsignal.logger.info("Loading Rails (#{Rails.version}) integration")
+Appsignal.logger.debug("Loading Rails (#{Rails.version}) integration")
 
 require "appsignal/utils/rails_helper"
 require "appsignal/rack/rails_instrumentation"

data/lib/appsignal/integrations/redis.rb

@@ -3,12 +3,15 @@
 module Appsignal
   module Integrations
     module RedisIntegration
-      def process(commands, &block)
-        sanitized_commands = commands.map do |command, *args|
-          "#{command}#{" ?" * args.size}"
-        end.join("\n")
+      def write(command)
+        sanitized_command =
+          if command[0] == :eval
+            "#{command[1]}#{" ?" * (command.size - 3)}"
+          else
+            "#{command[0]}#{" ?" * (command.size - 1)}"
+          end
 
-        Appsignal.instrument "query.redis", id, sanitized_commands do
+        Appsignal.instrument "query.redis", id, sanitized_command do
           super
         end
       end

data/lib/appsignal/integrations/sinatra.rb

@@ -3,7 +3,7 @@
 require "appsignal"
 require "appsignal/rack/sinatra_instrumentation"
 
-Appsignal.logger.info("Loading Sinatra (#{Sinatra::VERSION}) integration")
+Appsignal.logger.debug("Loading Sinatra (#{Sinatra::VERSION}) integration")
 
 app_settings = ::Sinatra::Application.settings
 Appsignal.config = Appsignal::Config.new(

data/lib/appsignal/transaction.rb

@@ -90,7 +90,7 @@ module Appsignal
         @transaction_id,
         @namespace,
         self.class.garbage_collection_profiler.total_time
-      )
+      ) || Appsignal::Extension::MockTransaction.new
     end
 
     def nil_transaction?
@@ -228,7 +228,7 @@ module Appsignal
     # "Web" and "background_job" gets transformed to "Background".
     #
     # @example
-    #   transaction.set_action("admin")
+    #   transaction.set_namespace("background")
     #
     # @param namespace [String] namespace name to use for this transaction.
     # @return [void]

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.0.2".freeze
+  VERSION = "3.0.6".freeze
 end

data/mono.yml

@@ -0,0 +1,16 @@
+---
+language: ruby
+repo: "https://github.com/appsignal/appsignal-ruby"
+bootstrap:
+  post:
+    - "rake extension:install"
+clean:
+  post:
+    - "bundle exec rake extension:clean"
+    - "rm -rf pkg"
+build:
+  command: "bundle exec rake build:all"
+publish:
+  gem_files_dir: pkg/
+test:
+  command: "bundle exec rake test"

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -115,6 +115,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
     it "logs to the log file" do
       run
       log_contents = File.read(config.log_file_path)
+      p log_contents
       expect(log_contents).to contains_log :info, "Starting AppSignal diagnose"
     end
 

data/spec/lib/appsignal/extension_install_failure_spec.rb

@@ -1,13 +1,6 @@
 describe Appsignal::Extension, :extension_installation_failure do
   context "when the extension library cannot be loaded" do
-    # This test breaks the installation on purpose and is not run by default.
-    # See `rake test:failure`. If this test was run, run `rake
-    # extension:install` again to fix the extension installation.
     it "prints and logs an error" do
-      # ENV var to make sure installation fails on purpurse
-      ENV["_TEST_APPSIGNAL_EXTENSION_FAILURE"] = "true"
-      `rake extension:install` # Run installation
-
       require "open3"
       _stdout, stderr, _status = Open3.capture3("bin/appsignal --version")
       expect(stderr).to include("ERROR: AppSignal failed to load extension")

data/spec/lib/appsignal/extension_spec.rb

@@ -119,22 +119,56 @@ describe Appsignal::Extension do
     end
   end
 
-  context "when the extension library cannot be loaded" do
-    subject { Appsignal::Extension }
+  context "when the extension library cannot be loaded", :extension_installation_failure do
+    let(:ext) { Appsignal::Extension }
 
-    before do
-      allow(Appsignal).to receive(:extension_loaded).and_return(false)
-      allow(Appsignal).to receive(:testing?).and_return(false)
+    around do |example|
+      Appsignal::Testing.without_testing { example.run }
     end
 
     it "should indicate that the extension is not loaded" do
       expect(Appsignal.extension_loaded?).to be_falsy
     end
 
-    it "should not raise errors when methods are called" do
-      expect do
-        subject.something
-      end.not_to raise_error
+    it "does not raise errors when methods are called" do
+      ext.appsignal_start
+      ext.something
+    end
+
+    describe Appsignal::Extension::MockData do
+      it "does not error on missing data_map_new extension method calls" do
+        map = ext.data_map_new
+        expect(map).to be_kind_of(Appsignal::Extension::MockData)
+        # Does not raise errors any arbitrary method call that does not exist
+        map.set_string("key", "value")
+        map.set_int("key", 123)
+        map.something
+      end
+
+      it "does not error on missing data_array_new extension method calls" do
+        array = ext.data_array_new
+        expect(array).to be_kind_of(Appsignal::Extension::MockData)
+        # Does not raise errors any arbitrary method call that does not exist
+        array.append_string("value")
+        array.append_int(123)
+        array.something
+      end
+    end
+
+    describe Appsignal::Extension::MockTransaction do
+      it "does not error on missing transaction extension method calls" do
+        transaction = described_class.new
+
+        transaction.start_event(0)
+        transaction.finish_event(
+          "name",
+          "title",
+          "body",
+          Appsignal::EventFormatter::DEFAULT,
+          0
+        )
+        transaction.something
+      end
     end
   end
 end

data/spec/lib/appsignal/hooks/excon_spec.rb

@@ -0,0 +1,74 @@
+describe Appsignal::Hooks::ExconHook do
+  before :context do
+    start_agent
+  end
+
+  context "with Excon" do
+    before(:context) do
+      class Excon
+        def self.defaults
+          @defaults ||= {}
+        end
+      end
+      Appsignal::Hooks::ExconHook.new.install
+    end
+    after(:context) { Object.send(:remove_const, :Excon) }
+
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_truthy }
+    end
+
+    describe "#install" do
+      it "adds the AppSignal instrumentor to Excon" do
+        expect(Excon.defaults[:instrumentor]).to eql(Appsignal::Integrations::ExconIntegration)
+      end
+    end
+
+    describe "instrumentation" do
+      let!(:transaction) do
+        Appsignal::Transaction.create("uuid", Appsignal::Transaction::HTTP_REQUEST, "test")
+      end
+      around { |example| keep_transactions { example.run } }
+
+      it "instruments a http request" do
+        data = {
+          :host => "www.google.com",
+          :method => :get,
+          :scheme => "http"
+        }
+        Excon.defaults[:instrumentor].instrument("excon.request", data) {}
+
+        expect(transaction.to_h["events"]).to include(
+          hash_including(
+            "name" => "request.excon",
+            "title" => "GET http://www.google.com",
+            "body" => ""
+          )
+        )
+      end
+
+      it "instruments a http response" do
+        data = { :host => "www.google.com" }
+        Excon.defaults[:instrumentor].instrument("excon.response", data) {}
+
+        expect(transaction.to_h["events"]).to include(
+          hash_including(
+            "name" => "response.excon",
+            "title" => "www.google.com",
+            "body" => ""
+          )
+        )
+      end
+    end
+  end
+
+  context "without Excon" do
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_falsy }
+    end
+  end
+end

data/spec/lib/appsignal/hooks/redis_spec.rb

@@ -33,16 +33,17 @@ describe Appsignal::Hooks::RedisHook do
 
           context "instrumentation" do
             before do
+              start_agent
               # Stub Redis::Client class so that it doesn't perform an actual
               # Redis query. This class will be included (prepended) with the
               # AppSignal Redis integration.
               stub_const("Redis::Client", Class.new do
                 def id
-                  :stub_id
+                  "stub_id"
                 end
 
-                def process(_commands)
-                  :stub_process
+                def write(_commands)
+                  "stub_write"
                 end
               end)
               # Load the integration again for the stubbed Redis::Client class.
@@ -50,17 +51,40 @@ describe Appsignal::Hooks::RedisHook do
               # track if it was installed already or not.
               Appsignal::Hooks::RedisHook.new.install
             end
+            let!(:transaction) do
+              Appsignal::Transaction.create("uuid", Appsignal::Transaction::HTTP_REQUEST, "test")
+            end
+            around { |example| keep_transactions { example.run } }
 
             it "instrument a redis call" do
-              Appsignal::Transaction.create("uuid", Appsignal::Transaction::HTTP_REQUEST, "test")
-              expect(Appsignal::Transaction.current).to receive(:start_event)
-                .at_least(:once)
-              expect(Appsignal::Transaction.current).to receive(:finish_event)
-                .at_least(:once)
-                .with("query.redis", :stub_id, "get ?", 0)
+              client = Redis::Client.new
+              expect(client.write([:get, "key"])).to eql("stub_write")
 
+              transaction_hash = transaction.to_h
+              expect(transaction_hash["events"]).to include(
+                hash_including(
+                  "name" => "query.redis",
+                  "body" => "get ?",
+                  "title" => "stub_id"
+                )
+              )
+            end
+
+            it "instrument a redis script call" do
               client = Redis::Client.new
-              expect(client.process([[:get, "key"]])).to eql(:stub_process)
+              script = "return redis.call('set',KEYS[1],ARGV[1])"
+              keys = ["foo"]
+              argv = ["bar"]
+              expect(client.write([:eval, script, keys.size, keys, argv])).to eql("stub_write")
+
+              transaction_hash = transaction.to_h
+              expect(transaction_hash["events"]).to include(
+                hash_including(
+                  "name" => "query.redis",
+                  "body" => "#{script} ? ?",
+                  "title" => "stub_id"
+                )
+              )
             end
           end
         end