Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test the metadata for counter metrics again #16630

Merged
merged 1 commit into from
Jan 17, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 1 addition & 20 deletions tomcat/tests/test_e2e.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,6 @@

from .common import TOMCAT_E2E_METRICS

COUNTER_METRICS = [
# TODO: JMXFetch is not reporting in-app type for JMX `counter` type.
# Remove this exclusion list when fixed.
'tomcat.bytes_rcvd',
'tomcat.bytes_sent',
'tomcat.error_count',
'tomcat.jsp.count',
'tomcat.jsp.reload_count',
'tomcat.processing_time',
'tomcat.request_count',
'tomcat.servlet.error_count',
'tomcat.servlet.processing_time',
'tomcat.servlet.request_count',
'tomcat.string_cache.access_count',
'tomcat.string_cache.hit_count',
'tomcat.web.cache.hit_count',
'tomcat.web.cache.lookup_count',
]


def test_metrics(dd_agent_check, instance):
aggregator = dd_agent_check(instance, rate=True)
Expand All @@ -36,7 +17,7 @@ def test_metrics(dd_agent_check, instance):
aggregator.assert_metric_has_tag(metric, 'dd.internal.jmx_check_name:tomcat')

aggregator.assert_all_metrics_covered()
aggregator.assert_metrics_using_metadata(get_metadata_metrics(), exclude=JVM_E2E_METRICS_NEW + COUNTER_METRICS)
aggregator.assert_metrics_using_metadata(get_metadata_metrics(), exclude=JVM_E2E_METRICS_NEW)


def test_service_checks(dd_agent_check, instance):
Expand Down
Loading