newrelic_em_http 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d22a371cab67537920b39cee9ca725e8834e4dddff7ce05d6eadb2538b40dcd
-  data.tar.gz: bafd05123128eb9528472301bfd27f7871f714abd7b16a500bf9f1bed37efe13
+  metadata.gz: dc07435abe9a9aa46b536d502c969585fc580b365da0309ad31726d1cfce4388
+  data.tar.gz: 4c316021428ad2437316b0e60f831b66771ede72fac660e9f9c34de4de648a80
 SHA512:
-  metadata.gz: 8b17c49f73d72cb3250a420618c4936fca28794530611c3e3bd537f8e0584145df8cee5bf7390ba19065d6054c019a1d1aa53103feca84ea185e42f26c83d215
-  data.tar.gz: fe855cc41cd7fb1087c632c9098ad7433ceb12b01e2b5bf0224f6a0eafd2f8e2234a4419e25c78c5b2d4871522a43f35247cd41afcdaa35e03525d7f8e282dba
+  metadata.gz: ddfc9d407d9fd91063b0792be516b31cc4b511e2e77ca40c4ea3a26db66eb893b7e609ad10195db678bd6dfbc0e081db1055970325366d9381cc060bf5d9196e
+  data.tar.gz: 5755d1fba62fb2b903f4fa60fe25aadb00b0097365beca86a96d73fe8b8c2ef141bf79a0ca7fa3527741b9cd0afa168d380be56a04b68bb5a7abd5c0e88db403

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## v0.0.5
+* Fix issue with tracking persistent (keep-alive) connections
+* Simplify instrumentation by moving it to EM::HttpClient level

data/lib/new_relic/agent/instrumentation/em_http.rb

@@ -13,43 +13,41 @@ DependencyDetection.defer do
   end
 
   executes do
-    class EventMachine::HttpConnection
-      def activate_connection_with_newrelic(client)
-        wrapped_request = ::NewRelic::Agent::HTTPClients::EmHttpRequest.new(client)
+    class EventMachine::HttpClient
+      def initialize_with_newrelic(conn, options)
+        initialize_without_newrelic(conn, options)
 
-        client.newrelic_segment = ::NewRelic::Agent::Tracer.start_external_request_segment(
+        wrapped_request = ::NewRelic::Agent::HTTPClients::EmHttpRequest.new(self)
+        @newrelic_segment = ::NewRelic::Agent::Tracer.start_external_request_segment(
           library: wrapped_request.type,
           uri: wrapped_request.uri,
           procedure: wrapped_request.method
         )
-
-        client.callback do
-          wrapped_response = ::NewRelic::Agent::HTTPClients::EmHttpResponse.new(client)
-          client.newrelic_segment.read_response_headers wrapped_response
-          client.newrelic_segment.finish
-        end
-
-        activate_connection_without_newrelic(client)
       end
 
-      alias_method :activate_connection_without_newrelic, :activate_connection
-      alias_method :activate_connection, :activate_connection_with_newrelic
-    end
-  end
-
-  executes do
-    class EventMachine::HttpClient
-      attr_accessor :newrelic_segment
+      alias_method :initialize_without_newrelic, :initialize
+      alias_method :initialize, :initialize_with_newrelic
 
       def send_request_with_newrelic(head, body)
         wrapped_request = ::NewRelic::Agent::HTTPClients::EmHttpRequest.new(self, head)
-        newrelic_segment.add_request_headers wrapped_request
+        @newrelic_segment.add_request_headers wrapped_request
+
         send_request_without_newrelic(head, body)
       end
 
       alias_method :send_request_without_newrelic, :send_request
       alias_method :send_request, :send_request_with_newrelic
+
+      def succeed_with_newrelic(client)
+        wrapped_response = ::NewRelic::Agent::HTTPClients::EmHttpResponse.new(self)
+        @newrelic_segment.read_response_headers wrapped_response
+        @newrelic_segment.finish
+
+        succeed_without_newrelic(client)
+      end
+
+      alias_method :succeed_without_newrelic, :succeed
+      alias_method :succeed, :succeed_with_newrelic
     end
   end
-
 end

data/newrelic_em_http.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "newrelic_em_http"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["Andriy Yanko"]
   spec.email         = ["andriy.yanko@railsware.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_em_http
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Andriy Yanko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
@@ -104,6 +104,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -131,8 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: EM::HTTP instrumentation for New Relic RPM