test/instrumentation/dalli_test.rb in instana-1.214.0 vs test/instrumentation/dalli_test.rb in instana-1.214.1

@@ -45,11 +45,11 @@
     assert second_span[:data][:memcache].key?(:key)
     assert_equal :instana, second_span[:data][:memcache][:key]
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_basic_set
     clear_all!
 
@@ -78,11 +78,11 @@
     assert second_span[:data][:memcache].key?(:key)
     assert_equal :instana, second_span[:data][:memcache][:key]
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_replace
     clear_all!
 
@@ -112,11 +112,11 @@
     assert second_span[:data][:memcache].key?(:key)
     assert_equal :instana, second_span[:data][:memcache][:key]
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_delete
     clear_all!
 
@@ -146,11 +146,11 @@
     assert second_span[:data][:memcache].key?(:key)
     assert_equal :instana, second_span[:data][:memcache][:key]
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_incr
     clear_all!
 
@@ -180,11 +180,11 @@
     assert second_span[:data][:memcache].key?(:key)
     assert_equal :counter, second_span[:data][:memcache][:key]
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_decr
     clear_all!
 
@@ -214,11 +214,11 @@
     assert second_span[:data][:memcache].key?(:key)
     assert_equal :counter, second_span[:data][:memcache][:key]
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_get_multi
     clear_all!
 
@@ -247,10 +247,10 @@
     assert second_span[:data][:memcache].key?(:keys)
     assert_equal "one, two, three, four", second_span[:data][:memcache][:keys]
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
     assert second_span[:data][:memcache].key?(:hits)
     assert_equal 2, second_span[:data][:memcache][:hits]
   end
 
   def test_get_error_logging