newrelic-manticore 0.1.1.rc1-java → 0.1.1.rc2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b38c4ab104bc852c4ed3577ef140bb789d94b2c90dbc5eff9731f02b53c9b5c
-  data.tar.gz: fdc50f491ff45a927dd4f7e6c9de73082abcea07499924de32a254d12bbacbd7
+  metadata.gz: a90206bab165ef353e02a1584fce0aff9c3194737eb25e4add978320da5cbe65
+  data.tar.gz: 2d8fde246e4b9269e310910e4a2a25ba68b8a3f66b2039bb5ba000a4efd0743c
 SHA512:
-  metadata.gz: 73aad16695870625c6fe3d73264abe1e84c7d9b23d49bf6707bc20e4ec4d2a6f0fbcd2ba95cea354aeb790c7f23e3a9e8a2f7aaff33a78dd6e205716f362fbf8
-  data.tar.gz: ec437b319a31643f9851a1b27f79744cc74942deea6bf203fa07a2708c715c86c6fccf65abc4332db2c67412200bf4d41fd4b8f42e56108aed6cce5cb9cf4bd9
+  metadata.gz: a61432c09b74eb8828ce728d3e21c83f2b79b965a9c468f9ad29836235f65e517900e217ad46fdc1f62c57821b2805f5a8a6c17ec60fac690e2f7c985bfac1a8
+  data.tar.gz: 8df4a94cccf09d2129c6646f9c856a98dba70288a7cbeada550be95f5681e52793577ad627c31747b6cda7a2e78535ca199a1f6426f8acbbb87c42783ff40af5

data/.rubocop.yml

@@ -7,3 +7,6 @@ Metrics/BlockLength:
   Exclude:
     - test/**/*
 
+Metrics/ClassLength:
+  Exclude:
+    - test/**/*

data/Changelog.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.1] - 2018-10-09
+### Fixed
+Time spent inside Manticore requests inside database calls where not included in the exclusive time stats of the database request
+
 ## [0.1.0] - 2018-10-09
 ### Added
 Basic manticore instrumentation

data/lib/new_relic/manticore/instrumentation.rb

@@ -10,6 +10,25 @@ require "new_relic/manticore/wrapped_response"
 
 module NewRelic
   module Manticore
+    # We do not want to create a segment if there is no newrelic
+    # transaction or if we are inside a database segment.
+    #
+    # An external call segment inside a database segment would
+    # deduct the time needed in manticore from the database call,
+    # which we want to be the total time needed for the database
+    # operation
+    def self.create_segment?
+      state = NewRelic::Agent::TransactionState.tl_get
+      return false unless state && state.current_transaction
+
+      existing_segments = state.current_transaction.segments
+
+      existing_segments.empty? ||
+        !existing_segments.last.is_a?(
+          ::NewRelic::Agent::Transaction::DatastoreSegment
+        )
+    end
+
     # rubocop:disable Metrics/BlockLength
     DependencyDetection.defer do
       @name = :manticore
@@ -31,38 +50,50 @@ module NewRelic
         )
 
         ::Manticore::Client.class_eval do
+          # This is called for parallel requests that are executed in
+          # a batch
+          #
+          # rubocop:disable Metrics/MethodLength
           def execute_with_newrelic_trace!
-            segment = NewRelic::Agent::External.start_segment(
-              library: "Manticore",
-              uri: @async_requests.first.request.uri.to_s,
-              procedure: "Parallel batch"
-            )
-            segment.add_request_headers(PARALLEL_REQUEST_DUMMY)
+            if NewRelic::Manticore.create_segment?
+              segment = NewRelic::Agent::External.start_segment(
+                library: "Manticore",
+                uri: @async_requests.first.request.uri.to_s,
+                procedure: "Parallel batch"
+              )
+              segment.add_request_headers(PARALLEL_REQUEST_DUMMY)
+            end
             execute_without_newrelic_trace!
           ensure
-            segment.finish if segment
+            segment.finish if defined?(segment) && segment
           end
+          # rubocop:enable Metrics/MethodLength
 
           alias_method :execute_without_newrelic_trace!, :execute!
           alias_method :execute!, :execute_with_newrelic_trace!
         end
 
         ::Manticore::Response.class_eval do
+          # This is called for every request, also parallel and async
+          # requests.
+          #
           # rubocop:disable Metrics/MethodLength
           def call_with_newrelic_trace
-            segment = create_newrelic_segment
-
-            segment.add_request_headers(WrappedRequest.new(@request))
-            on_complete do |response|
-              begin
-                segment.read_response_headers(WrappedResponse.new(response))
-              ensure
-                segment.finish
+            if NewRelic::Manticore.create_segment?
+              segment = create_newrelic_segment
+
+              segment.add_request_headers(WrappedRequest.new(@request))
+              on_complete do |response|
+                begin
+                  segment.read_response_headers(WrappedResponse.new(response))
+                ensure
+                  segment.finish
+                end
               end
             end
             call_without_newrelic_trace
           rescue StandardError => e
-            segment.finish if segment
+            segment.finish if defined?(segment) && segment
             raise e
           end
           # rubocop:enable Metrics/MethodLength

data/lib/newrelic/manticore/version.rb

@@ -2,6 +2,6 @@
 
 module Newrelic
   module Manticore
-    VERSION = "0.1.1.rc1".freeze
+    VERSION = "0.1.1.rc2".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-manticore
 version: !ruby/object:Gem::Version
-  version: 0.1.1.rc1
+  version: 0.1.1.rc2
 platform: java
 authors:
 - Dominik Goltermann
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: Newrelic support for manticore