instana 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 968b0d69a6812e078d8e16552798b28005fc9cf1
-  data.tar.gz: 23b3315b9dce25b258156e85e3eebbc221b81396
+  metadata.gz: d45e4817a11c73f3e703e38cacb884cc2219393e
+  data.tar.gz: 099bd8ed5eb581eb5f550c1d22c1cb3744e1fc97
 SHA512:
-  metadata.gz: f99acdde5c0fe11ca3ef729c82f43b4f8e28647a67c7f92f3f6ff04ab3c1e3967e7a89ee0466c6fd7d57ef6bc8b18fee4706690bb69c12e33e55a84d08826afb
-  data.tar.gz: d48ea584fd211c9a3533654155610c2ac776ca5a852ac69b34781bca374837f28203ec66d8b17f4a20793eb91a29086e90e6acefdb60ea473edac7839bd07bc3
+  metadata.gz: 43ff3857a545a20eaea8295aa513abe77f3e5e15e7641235bcdcfaf146b502e28d75119f680a6c6933bf53151ed5ed3f7a5f0d9636ea46de26172bb4eaf4d733
+  data.tar.gz: 7fba5eb8b19c8c5a3da7df4cdc25af0e57de41c375eb2fff90059649950cc3c9566c8ccb43ddb5e81b49145727031babe10438c2ad3e62686e946b3e5aff557a

data/instana.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
+  spec.licenses      = ['MIT']
+
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
@@ -33,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency('sys-proctable', '>= 1.1.3')
   spec.add_runtime_dependency('get_process_mem', '>= 0.2.1')
   spec.add_runtime_dependency('timers', '>= 4.0.0')
+  spec.add_runtime_dependency('oj', '~> 3.3')
 
   # Indirect dependency
   # https://github.com/instana/ruby-sensor/issues/10

data/lib/instana/agent.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'oj'
 require 'net/http'
 require 'socket'
 require 'sys/proctable'
@@ -7,6 +7,8 @@ require 'uri'
 require 'thread'
 include Sys
 
+Oj.default_options = {:mode => :strict}
+
 module Instana
   class Agent
     attr_accessor :state
@@ -205,14 +207,14 @@ module Instana
 
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{DISCOVERY_PATH}")
       req = Net::HTTP::Put.new(uri)
-      req.body = announce_payload.to_json
+      req.body = Oj.dump(announce_payload)
 
       ::Instana.logger.debug "Announce: http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{DISCOVERY_PATH} - payload: #{req.body}"
 
       response = make_host_agent_request(req)
 
       if response && (response.code.to_i == 200)
-        data = JSON.parse(response.body)
+        data = Oj.load(response.body)
         @process[:report_pid] = data['pid']
         @agent_uuid = data['agentUuid']
         true
@@ -243,7 +245,7 @@ module Instana
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{path}")
       req = Net::HTTP::Post.new(uri)
 
-      req.body = payload.to_json
+      req.body = Oj.dump(payload)
       response = make_host_agent_request(req)
 
       if response
@@ -271,7 +273,7 @@ module Instana
     # @param json_string [String] the request from the host agent
     #
     def handle_response(json_string)
-      their_request = JSON.parse(json_string).first
+      their_request = Oj.load(json_string)
 
       if their_request.key?("action")
         if their_request["action"] == "ruby.source"
@@ -286,7 +288,7 @@ module Instana
       path = "com.instana.plugin.ruby/response.#{@process[:report_pid]}?messageId=#{URI.encode(their_request['messageId'])}"
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{path}")
       req = Net::HTTP::Post.new(uri)
-      req.body = payload.to_json
+      req.body = Oj.dump(payload)
       ::Instana.logger.debug "Responding to agent request: #{req.inspect}"
       make_host_agent_request(req)
     end
@@ -308,7 +310,7 @@ module Instana
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{path}")
       req = Net::HTTP::Post.new(uri)
 
-      req.body = spans.to_json
+      req.body = Oj.dump(spans)
       response = make_host_agent_request(req)
 
       if response

data/lib/instana/version.rb

@@ -1,4 +1,4 @@
 module Instana
-  VERSION = "1.7.5"
+  VERSION = "1.7.6"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/agent/agent_test.rb

@@ -1,4 +1,7 @@
 require 'test_helper'
+require 'oj'
+
+Oj.default_options = {:mode => :strict}
 
 class AgentTest < Minitest::Test
   def test_agent_host_detection
@@ -65,7 +68,7 @@ class AgentTest < Minitest::Test
     ::Instana.agent.instance_variable_set(:@discovered, discovery)
 
     url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/com.instana.plugin.ruby.discovery"
-    json = { 'pid' => Process.pid, 'agentUuid' => 'abc' }.to_json
+    json = Oj.dump({ 'pid' => Process.pid, 'agentUuid' => 'abc' })
     stub_request(:put, url).to_return(:body => json, :status => 200)
 
     assert_equal true, ::Instana.agent.announce_sensor
@@ -92,7 +95,7 @@ class AgentTest < Minitest::Test
     ::Instana.agent.instance_variable_set(:@discovered, discovery)
 
     url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/com.instana.plugin.ruby.discovery"
-    json = { 'pid' => Process.pid, 'agentUuid' => 'abc' }.to_json
+    json = Oj.dump({ 'pid' => Process.pid, 'agentUuid' => 'abc' })
     stub_request(:put, url).to_return(:body => json, :status => 200)
     ::Instana.agent.announce_sensor
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +290,8 @@ files:
 - test/tracing/tracer_async_test.rb
 - test/tracing/tracer_test.rb
 homepage: https://www.instana.com/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -294,51 +309,51 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby sensor for Instana
 test_files:
-- test/agent/agent_test.rb
-- test/apps/cuba.rb
-- test/apps/grpc_server.rb
 - test/apps/roda.rb
 - test/apps/sinatra.rb
+- test/apps/grpc_server.rb
+- test/apps/cuba.rb
+- test/config_test.rb
+- test/agent/agent_test.rb
+- test/servers/sidekiq/worker.rb
+- test/servers/rackapp_6511.rb
+- test/servers/rails_3205.rb
+- test/servers/grpc_50051.rb
+- test/servers/helpers/sidekiq_worker_initializer.rb
+- test/instrumentation/excon_test.rb
+- test/instrumentation/net-http_test.rb
+- test/instrumentation/dalli_test.rb
+- test/instrumentation/sidekiq-client_test.rb
+- test/instrumentation/redis_test.rb
+- test/instrumentation/grpc_test.rb
+- test/instrumentation/sidekiq-worker_test.rb
+- test/instrumentation/rest-client_test.rb
+- test/test_helper.rb
+- test/models/block.rb
 - test/benchmarks/bench_id_generation.rb
 - test/benchmarks/bench_opentracing.rb
-- test/config_test.rb
-- test/frameworks/cuba_test.rb
-- test/frameworks/rack_test.rb
-- test/frameworks/rails/actioncontroller_test.rb
+- test/frameworks/rails/activerecord4_test.rb
+- test/frameworks/rails/actionview5_test.rb
+- test/frameworks/rails/activerecord5_test.rb
 - test/frameworks/rails/actionview3_test.rb
 - test/frameworks/rails/actionview4_test.rb
-- test/frameworks/rails/actionview5_test.rb
+- test/frameworks/rails/actioncontroller_test.rb
 - test/frameworks/rails/activerecord3_test.rb
-- test/frameworks/rails/activerecord4_test.rb
-- test/frameworks/rails/activerecord5_test.rb
-- test/frameworks/roda_test.rb
+- test/frameworks/rack_test.rb
 - test/frameworks/sinatra_test.rb
+- test/frameworks/roda_test.rb
+- test/frameworks/cuba_test.rb
 - test/instana_test.rb
-- test/instrumentation/dalli_test.rb
-- test/instrumentation/excon_test.rb
-- test/instrumentation/grpc_test.rb
-- test/instrumentation/net-http_test.rb
-- test/instrumentation/redis_test.rb
-- test/instrumentation/rest-client_test.rb
-- test/instrumentation/sidekiq-client_test.rb
-- test/instrumentation/sidekiq-worker_test.rb
-- test/jobs/sidekiq_job_1.rb
-- test/jobs/sidekiq_job_2.rb
-- test/models/block.rb
-- test/servers/grpc_50051.rb
-- test/servers/helpers/sidekiq_worker_initializer.rb
-- test/servers/rackapp_6511.rb
-- test/servers/rails_3205.rb
-- test/servers/sidekiq/worker.rb
-- test/test_helper.rb
-- test/tracing/custom_test.rb
-- test/tracing/id_management_test.rb
 - test/tracing/opentracing_test.rb
-- test/tracing/trace_test.rb
+- test/tracing/custom_test.rb
 - test/tracing/tracer_async_test.rb
+- test/tracing/trace_test.rb
 - test/tracing/tracer_test.rb
+- test/tracing/id_management_test.rb
+- test/jobs/sidekiq_job_2.rb
+- test/jobs/sidekiq_job_1.rb