atatus 1.3.0 → 1.6.1

data/lib/atatus/spies/mongo.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus
@@ -6,10 +23,14 @@ module Atatus
     # @api private
     class MongoSpy
       def install
-        ::Mongo::Monitoring::Global.subscribe(
-          ::Mongo::Monitoring::COMMAND,
-          Subscriber.new
-        )
+        if defined?(::Mongo) && defined?(::Mongo::Monitoring) && defined?(::Mongo::Monitoring::Global)
+
+          ::Mongo::Monitoring::Global.subscribe(
+            ::Mongo::Monitoring::COMMAND,
+            Subscriber.new
+          )
+
+        end
       end
 
       # @api private
@@ -36,15 +57,21 @@ module Atatus
 
         private
 
-        # rubocop:disable Metrics/MethodLength
         def push_event(event)
           return unless Atatus.current_transaction
           # Some MongoDB commands are not on collections but rather are db
           # admin commands. For these commands, the value at the `command_name`
           # key is the integer 1.
-          unless event.command[event.command_name] == 1
-            collection = event.command[event.command_name]
-          end
+          # For getMore commands, the value at `command_name` is the cursor id
+          # and the collection name is at the key `collection`
+          collection =
+            if event.command[event.command_name] == 1 ||
+               event.command[event.command_name].is_a?(BSON::Int64)
+              event.command[:collection]
+            else
+              event.command[event.command_name]
+            end
+
           name = [event.database_name,
                   collection,
                   event.command_name].compact.join('.')
@@ -60,11 +87,10 @@ module Atatus
 
           @events[event.operation_id] = span
         end
-        # rubocop:enable Metrics/MethodLength
 
         def pop_event(event)
-          return unless (curr = Atatus.current_span)
           span = @events.delete(event.operation_id)
+          return unless (curr = Atatus.current_span)
 
           curr == span && Atatus.end_span
         end
@@ -76,6 +102,11 @@ module Atatus
               statement: event.command.to_s,
               type: 'mongodb',
               user: nil
+            },
+            destination: {
+              name: SUBTYPE,
+              resource: SUBTYPE,
+              type: TYPE
             }
           )
         end

data/lib/atatus/spies/net_http.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus
@@ -9,7 +26,6 @@ module Atatus
       TYPE = 'ext'
       SUBTYPE = 'net_http'
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       class << self
         def disabled=(disabled)
           Thread.current[KEY] = disabled
@@ -30,41 +46,66 @@ module Atatus
         end
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def install
         if defined?(::Net) && defined?(::Net::HTTP)
-          ::Net::HTTP.class_eval do
+
+          Net::HTTP.class_eval do
             alias request_without_apm request
 
             def request(req, body = nil, &block)
               unless (transaction = Atatus.current_transaction)
                 return request_without_apm(req, body, &block)
               end
+
               if Atatus::Spies::NetHTTPSpy.disabled?
                 return request_without_apm(req, body, &block)
               end
 
-              host, = req['host'] && req['host'].split(':')
-              method = req.method
+              host = req['host']&.split(':')&.first || address
+              method = req.method.to_s.upcase
+              path, query = req.path.split('?')
+
+              url = use_ssl? ? +'https://' : +'http://'
+              url << host
+              url << ":#{port}" if port
+              url << path
+              url << "?#{query}" if query
+              uri = URI(url)
 
-              host ||= address
+              destination =
+                Atatus::Span::Context::Destination.from_uri(uri)
 
-              name = "#{method} #{host}"
+              context =
+                Atatus::Span::Context.new(
+                  http: { url: uri, method: method },
+                  destination: destination
+                )
 
               Atatus.with_span(
-                name,
+                "#{method} #{host}",
                 TYPE,
                 subtype: SUBTYPE,
-                action: method.to_s
+                action: method,
+                context: context
               ) do |span|
                 trace_context = span&.trace_context || transaction.trace_context
-                req['Atatus-Apm-Traceparent'] = trace_context.to_header
-                request_without_apm(req, body, &block)
+                trace_context.apply_headers { |key, value| req[key] = value }
+
+                result = request_without_apm(req, body, &block)
+
+                if (http = span&.context&.http)
+                  http.status_code = result.code
+                end
+
+                result
               end
             end
           end
+
         end
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:enable Metrics/CyclomaticComplexity
     end
 
     register 'Net::HTTP', 'net/http', NetHTTPSpy.new

data/lib/atatus/spies/rake.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus
@@ -5,40 +22,42 @@ module Atatus
   module Spies
     # @api private
     class RakeSpy
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def install
-        ::Rake::Task.class_eval do
-          alias execute_without_apm execute
+        if defined?(::Rake) && defined?(::Rake::Task)
 
-          def execute(*args)
-            agent = Atatus.start
+          ::Rake::Task.class_eval do
+            alias execute_without_apm execute
 
-            unless agent && agent.config.instrumented_rake_tasks.include?(name)
-              return execute_without_apm(*args)
-            end
+            def execute(*args)
+              agent = Atatus.start
 
-            transaction =
-              Atatus.start_transaction("Rake::Task[#{name}]", 'Rake')
+              unless agent && agent.config.instrumented_rake_tasks.include?(name)
+                return execute_without_apm(*args)
+              end
 
-            begin
-              result = execute_without_apm(*args)
+              transaction =
+                Atatus.start_transaction("Rake::Task[#{name}]", 'Rake')
 
-              transaction.result = 'success' if transaction
-            rescue StandardError => e
-              transaction.result = 'error' if transaction
-              Atatus.report(e)
+              begin
+                result = execute_without_apm(*args)
 
-              raise
-            ensure
-              Atatus.end_transaction
-              Atatus.stop
-            end
+                transaction.result = 'success' if transaction
+              rescue StandardError => e
+                transaction.result = 'error' if transaction
+                Atatus.report(e)
 
-            result
+                raise
+              ensure
+                Atatus.end_transaction
+                Atatus.stop
+              end
+
+              result
+            end
           end
+
         end
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     end
     register 'Rake::Task', 'rake', RakeSpy.new
   end

data/lib/atatus/spies/redis.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus

data/lib/atatus/spies/resque.rb

@@ -0,0 +1,57 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# frozen_string_literal: true
+
+module Atatus
+  # @api private
+  module Spies
+    # @api private
+    class ResqueSpy
+      TYPE = 'Resque'
+
+      def install
+        install_perform_spy
+      end
+
+      def install_perform_spy
+        if defined?(::Resque) && defined?(::Resque::Job)
+
+          ::Resque::Job.class_eval do
+            alias :perform_without_atatus :perform
+
+            def perform
+              name = @payload && @payload['class']&.to_s
+              transaction = Atatus.start_transaction(name, TYPE)
+              perform_without_atatus
+              transaction.done 'success'
+            rescue ::Exception => e
+              Atatus.report(e, handled: false)
+              transaction.done 'error' if transaction
+              raise
+            ensure
+              Atatus.end_transaction
+            end
+          end
+
+        end
+      end
+    end
+
+    register 'Resque', 'resque', ResqueSpy.new
+  end
+end

data/lib/atatus/spies/sequel.rb

@@ -1,47 +1,84 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
-require 'atatus/sql_summarizer'
+require 'atatus/sql'
 
 module Atatus
   # @api private
   module Spies
     # @api private
     class SequelSpy
-      TYPE = 'db.sequel.sql'
+      TYPE = 'db'
+      ACTION = 'query'
 
       def self.summarizer
-        @summarizer ||= SqlSummarizer.new
-      end
-
-      def self.build_context(sql, opts)
-        Span::Context.new(
-          db: { statement: sql, type: 'sql', user: opts[:user] }
-        )
+        @summarizer ||= Sql.summarizer
       end
 
-      # rubocop:disable Metrics/MethodLength
       def install
         require 'sequel/database/logging'
 
         if defined?(::Sequel) && defined?(::Sequel::Database)
+
           ::Sequel::Database.class_eval do
             alias log_connection_yield_without_apm log_connection_yield
 
-            def log_connection_yield(sql, *args, &block)
+            def log_connection_yield(sql, connection, args = nil, &block)
               unless Atatus.current_transaction
-                return log_connection_yield_without_apm(sql, *args, &block)
+                return log_connection_yield_without_apm(
+                  sql, connection, args, &block
+                )
               end
 
-              summarizer = Atatus::Spies::SequelSpy.summarizer
-              name = summarizer.summarize sql
-              context = Atatus::Spies::SequelSpy.build_context(sql, opts)
+              subtype = database_type.to_s
 
-              Atatus.with_span(name, TYPE, context: context, &block)
+              name =
+                Atatus::Spies::SequelSpy.summarizer.summarize sql
+
+              context = Atatus::Span::Context.new(
+                db: { statement: sql, type: 'sql', user: opts[:user] },
+                destination: { name: subtype, resource: subtype, type: TYPE }
+              )
+
+              span = Atatus.start_span(
+                name,
+                TYPE,
+                subtype: subtype,
+                action: ACTION,
+                context: context
+              )
+              yield.tap do |result|
+                if name =~ /^(UPDATE|DELETE)/
+                  if connection.respond_to?(:changes)
+                    span.context.db.rows_affected = connection.changes
+                  elsif result.is_a?(Integer)
+                    span.context.db.rows_affected = result
+                  end
+                end
+              end
+            ensure
+              Atatus.end_span
             end
           end
+
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
 
     register 'Sequel', 'sequel', SequelSpy.new

data/lib/atatus/spies/shoryuken.rb

@@ -0,0 +1,69 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# frozen_string_literal: true
+
+module Atatus
+  # @api private
+  module Spies
+    # @api private
+    class ShoryukenSpy
+      # @api private
+      class Middleware
+        def call(worker_instance, queue, sqs_msg, body)
+          transaction =
+            Atatus.start_transaction(
+              job_class(worker_instance, body),
+              'shoryuken.job'
+            )
+
+          Atatus.set_label('shoryuken.id', sqs_msg.message_id)
+          Atatus.set_label('shoryuken.queue', queue)
+
+          yield
+
+          transaction&.done :success
+        rescue ::Exception => e
+          Atatus.report(e, handled: false)
+          transaction&.done :error
+          raise
+        ensure
+          Atatus.end_transaction
+        end
+
+        private
+
+        def job_class(worker_instance, body)
+          klass = body['job_class'] if body.is_a?(Hash)
+          klass || worker_instance.class.name
+        end
+      end
+
+      def install
+        if defined?(::Shoryuken)
+
+          ::Shoryuken.server_middleware do |chain|
+            chain.add Middleware
+          end
+
+        end
+      end
+    end
+
+    register 'Shoryuken', 'shoryuken', ShoryukenSpy.new
+  end
+end

data/lib/atatus/spies/sidekiq.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus
@@ -10,7 +27,6 @@ module Atatus
 
       # @api private
       class Middleware
-        # rubocop:disable Metrics/MethodLength
         def call(_worker, job, queue)
           name = SidekiqSpy.name_for(job)
           transaction = Atatus.start_transaction(name, 'Sidekiq')
@@ -18,15 +34,14 @@ module Atatus
 
           yield
 
-          transaction.done :success if transaction
+          transaction&.done :success
         rescue ::Exception => e
           Atatus.report(e, handled: false)
-          transaction.done :error if transaction
+          transaction&.done :error
           raise
         ensure
           Atatus.end_transaction
         end
-        # rubocop:enable Metrics/MethodLength
       end
 
       def self.name_for(job)
@@ -41,42 +56,48 @@ module Atatus
       end
 
       def install_middleware
-        Sidekiq.configure_server do |config|
-          config.server_middleware do |chain|
-            chain.add Middleware
+        if defined?(::Sidekiq)
+
+          Sidekiq.configure_server do |config|
+            config.server_middleware do |chain|
+              chain.add Middleware
+            end
           end
+
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
       def install_processor
         require 'sidekiq/processor'
 
-        Sidekiq::Processor.class_eval do
-          alias start_without_apm start
-          alias terminate_without_apm terminate
+        if defined?(::Sidekiq) && defined?(::Sidekiq::Processor)
 
-          def start
-            result = start_without_apm
+          Sidekiq::Processor.class_eval do
+            alias start_without_apm start
+            alias terminate_without_apm terminate
 
-            # Already running from Railtie if Rails
-            if Atatus.running?
-              Atatus.agent.config.logger = Sidekiq.logger
-            else
-              Atatus.start
-            end
+            def start
+              result = start_without_apm
 
-            result
-          end
+              # Already running from Railtie if Rails
+              if Atatus.running?
+                Atatus.agent.config.logger = Sidekiq.logger
+              else
+                Atatus.start
+              end
+
+              result
+            end
 
-          def terminate
-            terminate_without_apm
+            def terminate
+              terminate_without_apm
 
-            Atatus.stop
+              Atatus.stop
+            end
           end
+
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
       def install
         install_processor