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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a90206bab165ef353e02a1584fce0aff9c3194737eb25e4add978320da5cbe65
-  data.tar.gz: 2d8fde246e4b9269e310910e4a2a25ba68b8a3f66b2039bb5ba000a4efd0743c
+  metadata.gz: d77184dc9fb0c21ddad6ff2cb8613ebf3efb3bf93d046310baa4c00c0a42d622
+  data.tar.gz: 24f5e9f7db817215d3a0351e024b911cf36aac842c5f24ac58f463477e87aef1
 SHA512:
-  metadata.gz: a61432c09b74eb8828ce728d3e21c83f2b79b965a9c468f9ad29836235f65e517900e217ad46fdc1f62c57821b2805f5a8a6c17ec60fac690e2f7c985bfac1a8
-  data.tar.gz: 8df4a94cccf09d2129c6646f9c856a98dba70288a7cbeada550be95f5681e52793577ad627c31747b6cda7a2e78535ca199a1f6426f8acbbb87c42783ff40af5
+  metadata.gz: 97e9ed46cadce46c053a7fee2a8c1c07520f1d8bec1bc77ee7a8e5849649d79052e4170321aa590398c9cd3de7a96c6d7987ec3635c3e9f4c850a3fa4a805c6c
+  data.tar.gz: b1b585e82f45d0f19e6ef15fcddd7469c6c2a9c601717622a7c67456ecef92e39936b04cbc7aee0d2f5e3d3d30d5a11c5e18c8bf462c3cdf70c1c37038cbd774

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/CODE_OF_CONDUCT.md

@@ -0,0 +1,69 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

data/Changelog.md

@@ -4,10 +4,31 @@ 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
+### 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.
+- Replace deprecated calls to internal agent API.
+
+## [0.1.2] - 2018-10-11
+### Fixed
+Detection whether manticore is used inside a database segment was not reliable and is now more robust
+
 ## [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
+- Time spent inside Manticore requests inside database calls where not included in the exclusive time stats of the database request.
+- Fixed instrumentation when using manticore with faraday adapter.
 
 ## [0.1.0] - 2018-10-09
 ### Added
-Basic manticore instrumentation
+- Basic manticore instrumentation.

data/README.md

@@ -1,33 +1,54 @@
-[travis]: https://travis-ci.org/runtastic/newrelic-manticore
-[rubygems]: https://rubygems.org/gems/newrelic-manticore
-[manticore]: https://gitlab.com/cheald/manticore
-[mit]: http://opensource.org/licenses/MIT
-[cc]: http://contributor-covenant.org
-
-# NewrelicManticore
+# Newrelic-Manticore
 
-[![Build Status](https://travis-ci.org/runtastic/newrelic-manticore.svg?branch=master)][travis] [![Gem Version](https://badge.fury.io/rb/newrelic-manticore.svg)][rubygems]
+[![Build Status](https://travis-ci.org/runtastic/newrelic-manticore.svg?branch=master)][travis]
+[![Gem Version](https://badge.fury.io/rb/newrelic-manticore.svg)][rubygems]
 
 Adds NewRelic instrumentation for the [Manticore JRuby HTTP client][manticore].
 
 ## Installation
 Add this line to your application's Gemfile:
 
-`$ gem 'newrelic-manticore'`
+```ruby
+gem 'newrelic-manticore'
+```
 
 And then execute:
 
-`$ bundle`
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install newrelic-manticore
+
+## Usage
 
-## How it works
 When `newrelic/manticore` is required (e.g. automatically by Bundler), the gem becomes active.
-It hooks itself into `Manticore::Client#request` and traces your HTTP calls as external requests,
+It wraps `Manticore::Response#call` and traces your HTTP calls as external requests,
 adding also the necessary headers for cross application tracing.
 
+### What about parallel requests?
+The NewRelic agent is currently not set up to support multithreaded requests. As [any of the other client integrations](https://docs.newrelic.com/docs/agents/ruby-agent/features/http-client-tracing-ruby#typhoeus),
+_newrelic-manticore_ will trace all parallel requests as [one external service call](https://github.com/runtastic/newrelic-manticore/blob/master/test/new_relic/manticore/instrumentation_test.rb#L50).
+
+### What about async "background" requests?
+Those are traced normally as any other request would be.
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
 ## Contributing
 Bug reports and pull requests are welcome on GitHub at https://github.com/runtastic/newrelic-manticore.
-This project is intended to be a safe, welcoming space for collaboration, and contributors are expected
-to adhere to the [Contributor Covenant code of conduct][cc].
+This project is intended to be a safe, welcoming space for collaboration, and
+contributors are expected to adhere to the [code of conduct][cc].
 
 ## License
 The gem is available as open source under [the terms of the MIT License][mit].
+
+[travis]: https://travis-ci.org/runtastic/newrelic-manticore
+[rubygems]: https://rubygems.org/gems/newrelic-manticore
+[manticore]: https://gitlab.com/cheald/manticore
+[mit]: http://opensource.org/licenses/MIT
+[cc]: ../CODE_OF_CONDUCT.md

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,14 +18,13 @@ 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
 
-      existing_segments = state.current_transaction.segments
+      return true unless state.current_transaction.current_segment
 
-      existing_segments.empty? ||
-        !existing_segments.last.is_a?(
-          ::NewRelic::Agent::Transaction::DatastoreSegment
-        )
+      !state.current_transaction.current_segment.is_a?(
+        ::NewRelic::Agent::Transaction::DatastoreSegment
+      )
     end
 
     # rubocop:disable Metrics/BlockLength
@@ -57,8 +55,8 @@ module NewRelic
           def execute_with_newrelic_trace!
             if NewRelic::Manticore.create_segment?
               segment = NewRelic::Agent::External.start_segment(
-                library: "Manticore",
-                uri: @async_requests.first.request.uri.to_s,
+                library:   "Manticore",
+                uri:       @async_requests.first.request.uri.to_s,
                 procedure: "Parallel batch"
               )
               segment.add_request_headers(PARALLEL_REQUEST_DUMMY)
@@ -81,7 +79,6 @@ module NewRelic
           def call_with_newrelic_trace
             if NewRelic::Manticore.create_segment?
               segment = create_newrelic_segment
-
               segment.add_request_headers(WrappedRequest.new(@request))
               on_complete do |response|
                 begin
@@ -102,9 +99,9 @@ module NewRelic
           alias_method :call, :call_with_newrelic_trace
 
           def create_newrelic_segment
-            NewRelic::Agent::External.start_segment(
-              library: "Manticore",
-              uri: @request.uri.to_s,
+            NewRelic::Agent::Tracer.start_external_request_segment(
+              library:   "Manticore",
+              uri:       @request.uri.to_s,
               procedure: @request.method
             ).tap do |segment|
               segment.record_metrics = false if segment.parent.is_a?(::NewRelic::Agent::Transaction::DatastoreSegment)

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,3 +1,5 @@
+# frozen_string_literal: true
+
 module NewRelic
   module Manticore
     class WrappedResponse

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 = "0.1.1.rc2".freeze
+    VERSION = "1.0.2.rc1"
   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.add_runtime_dependency     "newrelic_rpm", "~> 5"
+  gem.required_ruby_version = ">= 2.0.0"
 
-  gem.add_development_dependency "bundler", "~> 1.13"
+  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: 0.1.1.rc2
+  version: 1.0.2.rc1
 platform: java
 authors:
 - Dominik Goltermann
@@ -9,48 +9,54 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
-  name: newrelic_rpm
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  name: manticore
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        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: '1.13'
-  name: bundler
+        version: '6'
+  name: newrelic_rpm
   prerelease: false
-  type: :development
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '6'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: faraday
+  name: bundler
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -59,7 +65,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-  name: manticore
+  name: faraday
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,7 +106,10 @@ 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
@@ -108,7 +117,10 @@ dependencies:
     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:
@@ -163,6 +175,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CODE_OF_CONDUCT.md
 - Changelog.md
 - Gemfile
 - LICENSE
@@ -189,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: 1.3.1
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Newrelic support for manticore