chore: Updated supportability metric names for OTel Bridge enablement… (#3383)

Author: mrickard

lib/otel/metrics/index.js

@@ -42,7 +42,7 @@ class SetupMetrics extends SetupSignal {
  const getMeter = provider.getMeter
  provider.getMeter = function nrGetMeter(...args) {
  agent.metrics
- .getOrCreateMetric('Supportability/Nodejs/OpenTelemetryBridge/Metrics/getMeter')
+ .getOrCreateMetric('Supportability/Metrics/Nodejs/OpenTelemetryBridge/getMeter')
  .incrementCallCount()
 
  const meter = getMeter.apply(provider, args)
@@ -61,7 +61,7 @@ class SetupMetrics extends SetupSignal {
  // + createObservableUpDownCounter
  meter[method] = function nrWrappedMethod(...args) {
  agent.metrics
- .getOrCreateMetric(`Supportability/Nodejs/OpenTelemetryBridge/Metrics/meter/${method}`)
+ .getOrCreateMetric(`Supportability/Metrics/Nodejs/OpenTelemetryBridge/meter/${method}`)
  .incrementCallCount()
  return originals[method].apply(meter, args)
  }
@@ -73,7 +73,7 @@ class SetupMetrics extends SetupSignal {
  this.coreApi.metrics.setGlobalMeterProvider(provider)
 
  agent.metrics
- .getOrCreateMetric('Supportability/Nodejs/OpenTelemetryBridge/Metrics')
+ .getOrCreateMetric('Supportability/Metrics/Nodejs/OpenTelemetryBridge/enabled')
  .incrementCallCount()
 
  // We need access to `agent.config.entity_guid` in order to attach metrics

lib/otel/setup.js

@@ -23,9 +23,6 @@ function setupOtel(agent, logger = defaultLogger) {
  logger.warn(
  '`opentelemetry_bridge` is not enabled, skipping setup of opentelemetry-bridge'
  )
- agent.metrics
- .getOrCreateMetric('Supportability/Tracing/Nodejs/OpenTelemetryBridge/disabled')
- .incrementCallCount()
  return
  }
 
@@ -44,13 +41,19 @@ function setupOtel(agent, logger = defaultLogger) {
  signals.push(signal)
  } else {
  logger.debug('`opentelemetry_bridge.traces` is not enabled, skipping')
+ agent.metrics
+ .getOrCreateMetric('Supportability/Tracing/Nodejs/OpenTelemetryBridge/disabled')
+ .incrementCallCount()
  }
 
  if (agent.config.opentelemetry_bridge.metrics.enabled === true) {
  const signal = new SetupMetrics({ agent })
  signals.push(signal)
  } else {
  logger.debug('`opentelemetry_bridge.metrics` is not enabled, skipping')
+ agent.metrics
+ .getOrCreateMetric('Supportability/Metrics/Nodejs/OpenTelemetryBridge/disabled')
+ .incrementCallCount()
  }
 
  if (agent.config.opentelemetry_bridge.logs.enabled === true) {

test/integration/otel/metrics.test.js

@@ -139,9 +139,9 @@ test('sends metrics', { timeout: 5_000 }, async (t) => {
  const supportMetrics = agent.metrics._metrics.unscoped
  const expectedMetricNames = [
  'Supportability/Nodejs/OpenTelemetryBridge/Setup',
- 'Supportability/Nodejs/OpenTelemetryBridge/Metrics',
- 'Supportability/Nodejs/OpenTelemetryBridge/Metrics/getMeter',
- 'Supportability/Nodejs/OpenTelemetryBridge/Metrics/meter/createCounter'
+ 'Supportability/Metrics/Nodejs/OpenTelemetryBridge/enabled',
+ 'Supportability/Metrics/Nodejs/OpenTelemetryBridge/getMeter',
+ 'Supportability/Metrics/Nodejs/OpenTelemetryBridge/meter/createCounter'
  ]
  for (const expectedMetricName of expectedMetricNames) {
  assert.equal(supportMetrics[expectedMetricName].callCount, 1)

test/unit/lib/otel/metrics/index.test.js

@@ -30,7 +30,7 @@ test('configures global provider after agent start', async (t) => {
  },
  metrics: {
  getOrCreateMetric(name) {
- plan.equal(name, 'Supportability/Nodejs/OpenTelemetryBridge/Metrics')
+ plan.equal(name, 'Supportability/Metrics/Nodejs/OpenTelemetryBridge/enabled')
  return this
  },
  incrementCallCount() {