newrelic-manticore 1.0.0-java → 1.1.0.rc2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb2d3219e744b60a994ed584157e1eb84d6418c5a25e59b8832cb98a2c916ff
-  data.tar.gz: 1db486a5d91524f4d41ca0e090c600399c4b558ca6bcb77983f0ec54b6ef3cca
+  metadata.gz: 70d9a32e1f3c655b7a83f025beed26355ebcf44ca69de03415d29ea732180760
+  data.tar.gz: 027645a9e5180c9fbec6d4925dfcf53b3b5264edce2cfde531fa304b1ad84da0
 SHA512:
-  metadata.gz: efeca68b6ba35ae88ac95e7d3117c379751248dae758c73ba515dd842576a5982ed2025e3652fb5ce2b09cafd7e9410547dd6451ba852ba8a39801143bc65df4
-  data.tar.gz: 1ec84cdfc32381e4930656758e23efc01bdbcd9180f8699cb5d7dabad859393f8864a221d22b859db2aea8b10f7df34347165baf8af3598021d0dc1fa178cbf6
+  metadata.gz: 899866c9048e05703ca290c64a3a84ebf73ce8f1435faf9bd12273801beec32f0d66e3866adfe122ff3569f1ccaa4084966914008b5523dbc82b1511d654c49b
+  data.tar.gz: 4359006a763ff62b241620e8ac60ba63f281e9a5df3c1b9b47d185307d83c3521878ae986416161834ecfcf7afb8fc5b210d4ba2d94463f7746cbacb3eaaad27

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rt_rubocop_defaults
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
 
 Metrics/BlockLength:
   Exclude:
@@ -10,3 +10,6 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Exclude:
     - test/**/*
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - jruby-9.1.17.0 # ruby 2.3
   - jruby-9.2.0.0 # ruby 2.5
 jobs:
   include:

data/Changelog.md

@@ -4,6 +4,20 @@ 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).
 
+## Unreleased
+### Added
+- Record response status on external request span
+
+### Changed
+- Require ruby > 2.0.0
+
+### Fixed
+- Added manticore as dependency
+
+## [1.0.1] - 2020-04-30
+### Added
+- Compatibility with agent versions ~> 6.10
+
 ## [1.0.0] - 2019-03-12
 ### Changed
 - Update newrelic agent dependency to major version 6.

data/lib/new_relic/manticore/instrumentation.rb

@@ -3,7 +3,6 @@
 require "ostruct"
 
 require "new_relic/agent/method_tracer"
-require "new_relic/agent/http_clients/abstract_request"
 
 require "new_relic/manticore/wrapped_request"
 require "new_relic/manticore/wrapped_response"
@@ -19,8 +18,7 @@ module NewRelic
     # operation
     def self.create_segment?
       state = NewRelic::Agent::TransactionState.tl_get
-      return false unless state &&
-        state.current_transaction
+      return false unless state&.current_transaction
 
       return true unless state.current_transaction.current_segment
 
@@ -84,7 +82,7 @@ module NewRelic
               segment.add_request_headers(WrappedRequest.new(@request))
               on_complete do |response|
                 begin
-                  segment.read_response_headers(WrappedResponse.new(response))
+                  segment.process_response_headers(WrappedResponse.new(response))
                 ensure
                   segment.finish
                 end

data/lib/new_relic/manticore/wrapped_request.rb

@@ -1,3 +1,14 @@
+# frozen_string_literal: true
+
+# Check version to account for a breaking path change
+# introduced in 6.10
+#
+if NewRelic::VERSION::MAJOR == 6 && NewRelic::VERSION::MINOR < 10
+  require "new_relic/agent/http_clients/abstract_request"
+else
+  require "new_relic/agent/http_clients/abstract"
+end
+
 module NewRelic
   module Manticore
     class WrappedRequest < Agent::HTTPClients::AbstractRequest

data/lib/new_relic/manticore/wrapped_response.rb

@@ -1,7 +1,12 @@
+# frozen_string_literal: true
+
+require "new_relic/agent/http_clients/abstract"
+
 module NewRelic
   module Manticore
-    class WrappedResponse
+    class WrappedResponse < NewRelic::Agent::HTTPClients::AbstractResponse
       def initialize(response)
+        super(response)
         @headers = response.headers
       end
 

data/lib/newrelic/manticore.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 # Necessary for bundler auto require (as gem name does not match namespace)
 require "new_relic/manticore"

data/lib/newrelic/manticore/version.rb

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

data/newrelic-manticore.gemspec

@@ -27,14 +27,16 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^exe/}) { |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
+  gem.required_ruby_version = ">= 2.0.0"
+
+  gem.add_runtime_dependency     "manticore", "~> 0.6", ">= 0.6.4"
   gem.add_runtime_dependency     "newrelic_rpm", "~> 6"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "faraday", "~> 0"
-  gem.add_development_dependency "manticore", "~> 0"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "pry"
-  gem.add_development_dependency "rake", "~> 10.0"
+  gem.add_development_dependency "rake", "~> 12.3", ">= 12.3.3"
   gem.add_development_dependency "rspec", "~> 3.0"
   gem.add_development_dependency "rt_rubocop_defaults", "~> 1"
   gem.add_development_dependency "rubocop_runner", "~> 2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-manticore
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.rc2
 platform: java
 authors:
 - Dominik Goltermann
@@ -9,48 +9,54 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
-  name: newrelic_rpm
-  prerelease: false
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  name: manticore
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  name: bundler
+        version: '6'
+  name: newrelic_rpm
+  type: :runtime
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: faraday
-  prerelease: false
+  name: bundler
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -59,9 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-  name: manticore
-  prerelease: false
+  name: faraday
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -74,8 +80,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: minitest
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,8 +94,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: pry
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -100,15 +106,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
   name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -116,8 +128,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
   name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -130,8 +142,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
   name: rt_rubocop_defaults
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -144,8 +156,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
   name: rubocop_runner
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -190,15 +202,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Newrelic support for manticore