instana 1.204.0.pre2 → 1.204.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f20d275265e9f179c0dffa1bd49f6aa549722f76dc6b4eb49e564f7b7b0fd99
-  data.tar.gz: ce3aedd1cf2ee6231431654fd3d9f2a28da1df82ee9db26a79c46cc24259888e
+  metadata.gz: d6c2235234526a14bbb8818b104e9417f4683179b2166cb222fe136af32794d4
+  data.tar.gz: 16a190359fa7208ceeaf7170db5cfc732bcb464837f6acde9eb1c5be08b09eba
 SHA512:
-  metadata.gz: b32619dddf8005f6af816e6c4a3987fc5815a6e65a2cc41363e8c40899b89f1731d8117a7e714309ae4f5439fc9a272a69bcb51a0735de537d59c062078f99bb
-  data.tar.gz: fb1a7e2f0ba48819309236a99db3a97a417f1919cce9bf5519954466d5aba3902dc8d006ca15d650e80a66b6ab47affc682b6d260cc9e068cedf5da25e46e0c3
+  metadata.gz: d1465d42aeee46d0db43c2563b6bea541efddb553bb30fec875cc1cc2b5de30303476258ad889ccc9c6b10c4e1164f12001c743c16de0dafebce8e0020fd850b
+  data.tar.gz: b87b819750e3901f524609b89c2c8a96ac54965d8c6db2f4100a9cc2586cfafd55be20b30516364fdbec1199da7db8c987b6fb8f4edfc82761624caf5ea5d94b

data/lib/instana/secrets.rb

@@ -11,7 +11,7 @@ module Instana
     end
 
     def remove_from_query(str, secret_values = Instana.agent.secret_values)
-      return str unless secret_values
+      return str unless secret_values && str
 
       begin
         url = URI(str)

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.204.0.pre2"
+  VERSION = "1.204.0.pre3"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/instrumentation/net_http_test.rb

@@ -29,6 +29,24 @@ class NetHTTPTest < Minitest::Test
     WebMock.disable_net_connect!
   end
 
+  def test_get_without_query
+    clear_all!
+    WebMock.allow_net_connect!
+
+    Instana.tracer.start_or_continue_trace(:"net-http-test") do
+      Net::HTTP.get(URI('http://127.0.0.1:6511/'))
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
+
+    http_span = find_first_span_by_name(spans, :'net-http')
+    assert_equal "http://127.0.0.1:6511/", http_span[:data][:http][:url]
+    assert_equal "200", http_span[:data][:http][:status]
+
+    WebMock.disable_net_connect!
+  end
+
   def test_block_request
     clear_all!
     WebMock.allow_net_connect!

data/test/secrets_test.rb

@@ -88,6 +88,15 @@ class SecretsTest < Minitest::Test
     assert_redacted @subject.remove_from_query(url, sample_config), %w(filter[instantiate]), raw_str: true
   end
 
+  def test_with_nil
+    sample_config = {
+      "matcher"=>"contains",
+      "list"=>["stan"]
+    }
+
+    assert_equal @subject.remove_from_query(nil, sample_config), nil
+  end
+
   private
 
   def url_for(keys)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.204.0.pre2
+  version: 1.204.0.pre3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo