diff --git a/test/versioned/ioredis/ioredis-3.tap.js b/test/versioned/ioredis/ioredis-3.tap.js index 3bbbe993da..825effdc66 100644 --- a/test/versioned/ioredis/ioredis-3.tap.js +++ b/test/versioned/ioredis/ioredis-3.tap.js @@ -10,6 +10,7 @@ const helper = require('../../lib/agent_helper') const { removeMatchedModules } = require('../../lib/cache-buster') require('../../lib/metrics_helper') const params = require('../../lib/params') +const urltils = require('../../../lib/util/urltils') // Indicates unique database in Redis. 0-15 supported. const DB_INDEX = 4 @@ -17,11 +18,17 @@ const DB_INDEX = 4 tap.test('ioredis instrumentation', function (t) { let agent let redisClient + let METRIC_HOST_NAME + let HOST_ID t.beforeEach(async function () { const result = await setup(t) agent = result.agent redisClient = result.client + METRIC_HOST_NAME = urltils.isLocalhost(params.redis_host) + ? agent.config.getHostnameSafe() + : params.redis_host + HOST_ID = METRIC_HOST_NAME + '/' + params.redis_port }) t.afterEach(function () { @@ -40,6 +47,7 @@ tap.test('ioredis instrumentation', function (t) { [{ name: 'Datastore/Redis/all' }], [{ name: 'Datastore/operation/Redis/set' }] ] + expected['Datastore/instance/Redis/' + HOST_ID] = 2 t.assertMetrics(tx.metrics, expected, false, false) t.end() }) diff --git a/test/versioned/ioredis/ioredis.tap.js b/test/versioned/ioredis/ioredis.tap.js index 0ed9c7b727..f854d219cd 100644 --- a/test/versioned/ioredis/ioredis.tap.js +++ b/test/versioned/ioredis/ioredis.tap.js @@ -9,6 +9,7 @@ const tap = require('tap') const helper = require('../../lib/agent_helper') require('../../lib/metrics_helper') const params = require('../../lib/params') +const urltils = require('../../../lib/util/urltils') // Indicates unique database in Redis. 0-15 supported. const DB_INDEX = 3 @@ -16,6 +17,8 @@ const DB_INDEX = 3 tap.test('ioredis instrumentation', (t) => { let agent = null let redisClient = null + let METRIC_HOST_NAME + let HOST_ID t.autoend() t.beforeEach(async () => { @@ -23,6 +26,10 @@ tap.test('ioredis instrumentation', (t) => { const Redis = require('ioredis') redisClient = new Redis(params.redis_port, params.redis_host) await helper.flushRedisDb(redisClient, DB_INDEX) + METRIC_HOST_NAME = urltils.isLocalhost(params.redis_host) + ? agent.config.getHostnameSafe() + : params.redis_host + HOST_ID = METRIC_HOST_NAME + '/' + params.redis_port await new Promise(async (resolve, reject) => { redisClient.select(DB_INDEX, (err) => { @@ -48,6 +55,7 @@ tap.test('ioredis instrumentation', (t) => { [{ name: 'Datastore/Redis/all' }], [{ name: 'Datastore/operation/Redis/set' }] ] + expected['Datastore/instance/Redis/' + HOST_ID] = 2 t.assertMetrics(tx.metrics, expected, false, false) t.end()