instana 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfd06dbcdef17ee23af827a31d44a8164cf411741f6b1e24cf663db29525aa78
-  data.tar.gz: cd225402ace448611a928ea3d791f6e5b14a1f0ce84d466cceb9946a9cb79c40
+  metadata.gz: 5b516628bd567b0a6fd89f7efc692769c8c5b8c4835c997b3a82ddcb89252020
+  data.tar.gz: d4ec473e20dde540a70a2a5a10a551f40ac9d5abc9ea13d78b159bda560c7fcc
 SHA512:
-  metadata.gz: c66287deebd47b616870b4bc662ce5036f0bcb107dc722935c0c8c9df63b6c7a7e0cba6df2d0a7114980e77419d6f4e9972995c5d9427bf4c9af710b6349749f
-  data.tar.gz: 8c44efe3ab78a4a889ed829ece255fae612e1b5438024253a4577960a7634d891011c0b750a210040c215f2838746d5451c860f4b98bbd57a7a5ae725db5be7d
+  metadata.gz: 98e0fbce0e3dc7f41e9e9f6b5c1c422b0896e549e78eda9492d5113e8bea603dd8697740bac12f52a2f3bd0bca1339dddd40fea95f55c15aff2093d90ce93f36
+  data.tar.gz: 20083670850c5288a7a6fb88f9eb40e3508d1b33912adec99fbf9757bbe49e49d21a624bb20d14a7589711716803677a007904d1afb0da4eb86c2cbd94ae8384

data/lib/instana/agent.rb

@@ -12,9 +12,9 @@ require 'instana/agent/tasks'
 
 include Sys
 
-Oj.default_options = {:mode => :strict}
-
 module Instana
+  OJ_OPTIONS = {:mode => :strict}
+
   class Agent
     include AgentHelpers
     include AgentHooks
@@ -209,14 +209,14 @@ module Instana
 
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{DISCOVERY_PATH}")
       req = Net::HTTP::Put.new(uri)
-      req.body = Oj.dump(announce_payload)
+      req.body = Oj.dump(announce_payload, OJ_OPTIONS)
 
       ::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 = Oj.load(response.body)
+        data = Oj.load(response.body, OJ_OPTIONS)
         @process[:report_pid] = data['pid']
         @agent_uuid = data['agentUuid']
 
@@ -251,7 +251,7 @@ module Instana
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{path}")
       req = Net::HTTP::Post.new(uri)
 
-      req.body = Oj.dump(payload)
+      req.body = Oj.dump(payload, OJ_OPTIONS)
       response = make_host_agent_request(req)
 
       if response
@@ -290,7 +290,9 @@ module Instana
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{path}")
       req = Net::HTTP::Post.new(uri)
 
-      req.body = Oj.dump(spans, :omit_nil => true)
+      opts = OJ_OPTIONS.merge({omit_nil: true})
+
+      req.body = Oj.dump(spans, opts)
       response = make_host_agent_request(req)
 
       if response

data/lib/instana/agent/tasks.rb

@@ -4,8 +4,11 @@ module AgentTasks
   #
   # @param json_string [String] the requests from the host agent
   #
+
+  OJ_OPTIONS = {mode: :strict}
+
   def handle_agent_tasks(json_string)
-    tasks = Oj.load(json_string)
+    tasks = Oj.load(json_string, OJ_OPTIONS)
 
     if tasks.is_a?(Hash)
       process_agent_task(tasks)
@@ -34,7 +37,7 @@ module AgentTasks
     path = "com.instana.plugin.ruby/response.#{@process[:report_pid]}?messageId=#{URI.encode(task['messageId'])}"
     uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{path}")
     req = Net::HTTP::Post.new(uri)
-    req.body = Oj.dump(payload)
+    req.body = Oj.dump(payload, OJ_OPTIONS)
     ::Instana.logger.debug "Responding to agent request: #{req.inspect}"
     make_host_agent_request(req)
 

data/lib/instana/version.rb

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

data/test/agent/agent_test.rb

@@ -1,8 +1,6 @@
 require 'test_helper'
 require 'oj'
 
-Oj.default_options = {:mode => :strict}
-
 class AgentTest < Minitest::Test
   def test_agent_host_detection
     url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-05 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler