atatus 1.3.0 → 1.4.0

data/lib/atatus/spies/faraday.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
@@ -16,8 +33,6 @@ module Atatus
         end
       end
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      # rubocop:disable Metrics/BlockLength, Metrics/PerceivedComplexity
       # rubocop:disable Metrics/CyclomaticComplexity
       def install
         if defined?(::Faraday) && defined?(::Faraday::Connection)
@@ -30,42 +45,61 @@ module Atatus
                 return run_request_without_apm(method, url, body, headers, &block)
               end
 
-              host = if url_prefix.is_a?(URI) && url_prefix.host
-                       url_prefix.host
-                     elsif url.nil?
-                       tmp_request = build_request(method) do |req|
-                         yield(req) if block_given?
-                       end
-                       URI(tmp_request.path).host
-                     else
-                       URI(url).host
-                     end
+              uri = URI(build_url(url))
+
+              # If url is set inside block it isn't available until yield,
+              # so we temporarily build the request to yield. This could be a
+              # problem if the block has side effects as it will be yielded twice
+              # ~mikker
+              unless uri.host
+                tmp_request = build_request(method) do |req|
+                  yield(req) if block_given?
+                end
+                uri = URI(tmp_request.path)
+              end
+
+              host = uri.host
 
-              name = "#{method.upcase} #{host}"
+              upcased_method = method.to_s.upcase
+
+              destination = Atatus::Span::Context::Destination.from_uri(uri)
+
+              context =
+                Atatus::Span::Context.new(
+                  http: { url: uri, method: upcased_method },
+                  destination: destination
+                )
 
               Atatus.with_span(
-                name,
+                "#{upcased_method} #{host}",
                 TYPE,
                 subtype: SUBTYPE,
-                action: method.to_s
+                action: upcased_method,
+                context: context
               ) do |span|
                 Atatus::Spies::FaradaySpy.without_net_http do
                   trace_context = span&.trace_context || transaction.trace_context
 
-                  run_request_without_apm(method, url, body, headers) do |req|
-                    req['Atatus-Apm-Traceparent'] = trace_context.to_header
+                  result =
+                    run_request_without_apm(method, url, body, headers) do |req|
+                      trace_context.apply_headers { |k, v| req[k] = v }
+
+                      yield req if block_given?
+                    end
 
-                    yield req if block_given?
+                  if (http = span&.context&.http)
+                    http.status_code = result.status.to_s
                   end
+
+                  result
                 end
               end
             end
           end
+
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity
-      # rubocop:enable Metrics/BlockLength, Metrics/PerceivedComplexity
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
     end
 
     register 'Faraday', 'faraday', FaradaySpy.new

data/lib/atatus/spies/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
@@ -7,8 +24,6 @@ module Atatus
     class HTTPSpy
       TYPE = 'ext'
       SUBTYPE = 'http_rb'
-
-      # rubocop:disable Metrics/MethodLength
       def install
         if defined?(::HTTP) && defined?(::HTTP::Client)
 
@@ -23,23 +38,38 @@ module Atatus
               method = req.verb.to_s.upcase
               host = req.uri.host
 
+              destination =
+                Atatus::Span::Context::Destination.from_uri(req.uri)
+              context = Atatus::Span::Context.new(
+                http: { url: req.uri, method: method },
+                destination: destination
+              )
+
               name = "#{method} #{host}"
 
               Atatus.with_span(
                 name,
                 TYPE,
                 subtype: SUBTYPE,
-                action: method
+                action: method,
+                context: context
               ) do |span|
                 trace_context = span&.trace_context || transaction.trace_context
-                req['Atatus-Apm-Traceparent'] = trace_context.to_header
-                perform_without_apm(req, options)
+                trace_context.apply_headers { |key, value| req[key] = value }
+
+                result = perform_without_apm(req, options)
+
+                if (http = span&.context&.http)
+                  http.status_code = result.status.to_s
+                end
+
+                result
               end
             end
           end
+
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
 
     register 'HTTP', 'http', HTTPSpy.new

data/lib/atatus/spies/json.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
 
 require 'atatus/span_helpers'
@@ -16,6 +33,7 @@ module Atatus
             span_class_method :parse!, 'JSON#parse!', 'json.parse'
             span_class_method :generate, 'JSON#generate', 'json.generate'
           end
+
         end
       end
     end

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