Merge pull request #1952 from DataDog/cbeauchesne/add-features

cbeauchesne · web-flow · commit 34f2ca80cb6b · 2023-12-21T17:12:53.000+01:00
Add features decorators
diff --git a/pyproject.toml b/pyproject.toml
@@ -33,43 +33,25 @@ allow_no_feature_nodes = [
     "tests/apm_tracing_e2e/test_otel.py",
     "tests/apm_tracing_e2e/test_single_span.py",
     "tests/apm_tracing_e2e/test_smoke.py",
-    "tests/debugger/test_debugger.py",
-    "tests/integrations/test_cassandra.py",
-    "tests/integrations/test_db_integrations_sql.py",
-    "tests/integrations/test_dbm.py",
-    "tests/integrations/test_dsm.py",
-    "tests/integrations/test_mongo.py",
-    "tests/integrations/test_open_telemetry.py",
-    "tests/integrations/test_sql.py",
     "tests/onboarding/test_onboarding_install.py",
     "tests/otel_tracing_e2e/test_e2e.py",
     "tests/parametric/test_128_bit_traceids.py",
-    "tests/parametric/test_dynamic_configuration.py",
-    "tests/parametric/test_headers_b3.py",
-    "tests/parametric/test_headers_b3multi.py",
-    "tests/parametric/test_headers_datadog.py",
     "tests/parametric/test_headers_none.py",
     "tests/parametric/test_headers_precedence.py",
     "tests/parametric/test_headers_tracecontext.py",
     "tests/parametric/test_headers_tracestate_dd.py",
-    "tests/parametric/test_library_tracestats.py",
     "tests/parametric/test_otel_span_methods.py",
     "tests/parametric/test_otel_span_with_w3c.py",
     "tests/parametric/test_otel_tracer.py",
-    "tests/parametric/test_partial_flushing.py",
     "tests/parametric/test_sampling_span_tags.py",
     "tests/parametric/test_span_links.py",
-    "tests/parametric/test_span_sampling.py",
-    "tests/parametric/test_trace_sampling.py",
-    "tests/parametric/test_tracer_flare.py",
     "tests/parametric/test_tracer.py",
     "tests/perfs/test_performances.py",
     "tests/remote_config/test_remote_configuration.py",
     "tests/test_data_integrity.py",
     "tests/test_distributed.py",
     "tests/test_library_logs.py",
     "tests/test_miscs.py",
-    "tests/test_profiling.py",
     "tests/test_schemas.py",
     "tests/test_semantic_conventions.py",
     "tests/test_smoke.py",
diff --git a/tests/debugger/test_debugger.py b/tests/debugger/test_debugger.py
@@ -2,7 +2,7 @@
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2021 Datadog, Inc.
 
-from utils import scenarios, interfaces, weblog
+from utils import scenarios, interfaces, weblog, features
 from utils.tools import logger
 
 
@@ -95,6 +95,7 @@ def check_trace(expected_id, trace_map):
         check_trace(expected_trace, span_map)
 
 
+@features.debugger
 @scenarios.debugger_probes_status
 class Test_Debugger_Probe_Statuses:
     def test_method_probe_status(self):
@@ -170,6 +171,7 @@ def wait_for_all_probes_installed(self, data):
         return False
 
 
+@features.debugger
 @scenarios.debugger_method_probes_snapshot
 class Test_Debugger_Method_Probe_Snaphots(_Base_Debugger_Snapshot_Test):
     log_probe_response = None
@@ -215,6 +217,7 @@ def test_method_probe_snaphots(self):
         validate_spans(expected_spans)
 
 
+@features.debugger
 @scenarios.debugger_line_probes_snapshot
 class Test_Debugger_Line_Probe_Snaphots(_Base_Debugger_Snapshot_Test):
     log_probe_response = None
@@ -255,6 +258,7 @@ def test_line_probe_snaphots(self):
         validate_spans(expected_spans)
 
 
+@features.debugger
 @scenarios.debugger_mix_log_probe
 class Test_Debugger_Mix_Log_Probe(_Base_Debugger_Snapshot_Test):
     multi_probe_response = None
diff --git a/tests/integrations/test_cassandra.py b/tests/integrations/test_cassandra.py
@@ -2,10 +2,11 @@
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2021 Datadog, Inc.
 
-from utils import weblog, interfaces, context, missing_feature, scenarios
+from utils import weblog, interfaces, context, missing_feature, scenarios, features
 
 
 @missing_feature(condition=context.library != "java", reason="Endpoint is not implemented on weblog")
+@features.cassandra_support
 @scenarios.integrations
 class Test_Cassandra:
     """ Verify that a cassandra span is created """
diff --git a/tests/integrations/test_db_integrations_sql.py b/tests/integrations/test_db_integrations_sql.py
@@ -1,7 +1,7 @@
 # Unless explicitly stated otherwise all files in this repository are licensed under the the Apache License Version 2.0.
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2021 Datadog, Inc.
-from utils import context, bug, missing_feature, irrelevant, scenarios, flaky
+from utils import context, bug, missing_feature, irrelevant, scenarios, features
 from utils.tools import logger
 
 from .sql_utils import BaseDbIntegrationsTestClass
@@ -222,6 +222,7 @@ def test_obfuscate_query(self, excluded_operations=()):
                 ), f"The query is not properly obfuscated for operation {db_operation}"
 
 
+@features.postgres_support
 @scenarios.integrations
 class Test_Postgres(_BaseDatadogDbIntegrationTestClass):
     """ Postgres integration with Datadog tracer+agent """
@@ -234,6 +235,7 @@ def test_db_type(self):
         super().test_db_type()
 
 
+@features.mysql_support
 @scenarios.integrations
 class Test_MySql(_BaseDatadogDbIntegrationTestClass):
     """ MySql integration with Datadog tracer+agent """
@@ -250,6 +252,7 @@ def test_db_user(self, excluded_operations=()):
         super().test_db_user()
 
 
+@features.mssql_support
 @scenarios.integrations
 class Test_MsSql(_BaseDatadogDbIntegrationTestClass):
     """ MsSql integration with Datadog tracer+agent """
diff --git a/tests/integrations/test_dbm.py b/tests/integrations/test_dbm.py
@@ -5,10 +5,11 @@
 
 import json
 
-from utils import weblog, interfaces, context, scenarios
+from utils import weblog, interfaces, context, scenarios, features
 from utils.tools import logger
 
 
+@features.database_monitoring_correlation
 class Test_Dbm:
     """Verify behavior of DBM propagation"""
 
diff --git a/tests/integrations/test_dsm.py b/tests/integrations/test_dsm.py
@@ -2,10 +2,11 @@
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2023 Datadog, Inc.
 
-from utils import weblog, interfaces, scenarios, irrelevant, context, bug
+from utils import weblog, interfaces, scenarios, irrelevant, context, bug, features
 from utils.tools import logger
 
 
+@features.datastreams_monitoring_support_for_kafka
 @scenarios.integrations
 class Test_DsmKafka:
     """ Verify DSM stats points for Kafka """
@@ -37,6 +38,7 @@ def test_dsm_kafka(self):
         )
 
 
+@features.datastreams_monitoring_support_for_http
 @scenarios.integrations
 class Test_DsmHttp:
     def setup_dsm_http(self):
@@ -52,6 +54,7 @@ def test_dsm_http(self):
         )
 
 
+@features.datastreams_monitoring_support_for_rabbitmq
 @scenarios.integrations
 class Test_DsmRabbitmq:
     """ Verify DSM stats points for RabbitMQ """
@@ -101,6 +104,7 @@ def test_dsm_rabbitmq_dotnet_legacy(self):
         )
 
 
+@features.datastreams_monitoring_support_for_rabbitmq_topicexchange
 @scenarios.integrations
 class Test_DsmRabbitmq_TopicExchange:
     """ Verify DSM stats points for RabbitMQ Topic Exchange"""
@@ -136,6 +140,7 @@ def test_dsm_rabbitmq(self):
         )
 
 
+@features.datastreams_monitoring_support_for_rabbitmq_fanout
 @scenarios.integrations
 class Test_DsmRabbitmq_FanoutExchange:
     """ Verify DSM stats points for RabbitMQ Fanout Exchange"""
diff --git a/tests/integrations/test_mongo.py b/tests/integrations/test_mongo.py
@@ -2,9 +2,10 @@
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2021 Datadog, Inc.
 
-from utils import weblog, interfaces, context, missing_feature, scenarios
+from utils import weblog, interfaces, context, missing_feature, scenarios, features
 
 
+@features.mongo_support
 @missing_feature(condition=context.library != "java", reason="Endpoint is not implemented on weblog")
 @scenarios.integrations
 class Test_Mongo:
diff --git a/tests/integrations/test_open_telemetry.py b/tests/integrations/test_open_telemetry.py
@@ -1,4 +1,4 @@
-from utils import context, bug, flaky, irrelevant, missing_feature, scenarios
+from utils import context, bug, features, irrelevant, missing_feature, scenarios
 from utils.tools import logger
 from .sql_utils import BaseDbIntegrationsTestClass
 
@@ -132,20 +132,23 @@ def test_db_statement_query(self):
             ), f"{db_operation}  not found in {span['meta']['db.statement']}"
 
 
+@features.otel_postgres_support
 @scenarios.otel_integrations
 class Test_Postgres(_BaseOtelDbIntegrationTestClass):
     """ OpenTelemetry/Postgres integration """
 
     db_service = "postgresql"
 
 
+@features.otel_mysql_support
 @scenarios.otel_integrations
 class Test_MySql(_BaseOtelDbIntegrationTestClass):
     """ OpenTelemetry/MySql integration """
 
     db_service = "mysql"
 
 
+@features.otel_mssql_support
 @scenarios.otel_integrations
 class Test_MsSql(_BaseOtelDbIntegrationTestClass):
     """ OpenTelemetry/MsSql integration """
diff --git a/tests/integrations/test_sql.py b/tests/integrations/test_sql.py
@@ -2,9 +2,10 @@
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2021 Datadog, Inc.
 
-from utils import weblog, interfaces, context, missing_feature, scenarios
+from utils import weblog, interfaces, context, missing_feature, scenarios, features
 
 
+@features.sql_support
 @missing_feature(condition=context.library != "java", reason="Endpoint is not implemented on weblog")
 @scenarios.integrations
 class Test_Sql:
diff --git a/tests/parametric/test_dynamic_configuration.py b/tests/parametric/test_dynamic_configuration.py
@@ -8,7 +8,7 @@
 
 from utils.parametric.spec.remoteconfig import Capabilities
 from utils.parametric.spec.trace import Span, assert_trace_has_tags
-from utils import context, missing_feature, irrelevant, rfc, scenarios
+from utils import context, missing_feature, irrelevant, rfc, scenarios, features
 
 import pytest
 
@@ -99,6 +99,7 @@ def assert_sampling_rate(trace: List[Dict], rate: float):
 
 @rfc("https://docs.google.com/document/d/1SVD0zbbAAXIsobbvvfAEXipEUO99R9RMsosftfe9jx0")
 @scenarios.parametric
+@features.dynamic_configuration
 class TestDynamicConfigV1:
     """Tests covering the v1 release of the dynamic configuration feature.
 
@@ -341,6 +342,7 @@ def test_tracing_client_http_header_tags(
 
 @rfc("https://docs.google.com/document/d/1V4ZBsTsRPv8pAVG5WCmONvl33Hy3gWdsulkYsE4UZgU/edit")
 @scenarios.parametric
+@features.dynamic_configuration
 class TestDynamicConfigV2:
     @parametrize(
         "library_env", [{**DEFAULT_ENVVARS}, {**DEFAULT_ENVVARS, "DD_TAGS": "key1:val1,key2:val2"},],
diff --git a/tests/parametric/test_headers_b3.py b/tests/parametric/test_headers_b3.py
@@ -6,7 +6,7 @@
 from utils.parametric.spec.trace import span_has_no_parent
 from utils.parametric.headers import make_single_request_and_get_inject_headers
 from utils.parametric.test_agent import get_span
-from utils import missing_feature, context, scenarios
+from utils import missing_feature, context, scenarios, features
 
 parametrize = pytest.mark.parametrize
 
@@ -41,6 +41,7 @@ def enable_migrated_b3_single_key() -> Any:
     return parametrize("library_env", [env])
 
 
+@features.b3_headers_propagation
 @scenarios.parametric
 class Test_Headers_B3:
     @enable_b3()
diff --git a/tests/parametric/test_headers_b3multi.py b/tests/parametric/test_headers_b3multi.py
@@ -6,7 +6,7 @@
 from utils.parametric.spec.trace import span_has_no_parent
 from utils.parametric.headers import make_single_request_and_get_inject_headers
 from utils.parametric.test_agent import get_span
-from utils import missing_feature, irrelevant, context, scenarios
+from utils import missing_feature, irrelevant, context, scenarios, features
 
 parametrize = pytest.mark.parametrize
 
@@ -48,6 +48,7 @@ def enable_case_insensitive_b3multi() -> Any:
     return parametrize("library_env", [env1, env2])
 
 
+@features.b3_headers_propagation
 @scenarios.parametric
 class Test_Headers_B3multi:
     @enable_b3multi()
diff --git a/tests/parametric/test_headers_datadog.py b/tests/parametric/test_headers_datadog.py
@@ -1,12 +1,11 @@
-import pytest
-
 from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY, ORIGIN
 from utils.parametric.spec.trace import span_has_no_parent
 from utils.parametric.headers import make_single_request_and_get_inject_headers
 from utils.parametric.test_agent import get_span
-from utils import bug, context, scenarios
+from utils import features, scenarios
 
 
+@features.datadog_headers_propagation
 @scenarios.parametric
 class Test_Headers_Datadog:
     def test_distributed_headers_extract_datadog_D001(self, test_agent, test_library):
diff --git a/tests/parametric/test_library_tracestats.py b/tests/parametric/test_library_tracestats.py
@@ -11,7 +11,7 @@
 
 from utils.parametric.spec.trace import SPAN_MEASURED_KEY
 from utils.parametric.spec.trace import V06StatsAggr
-from utils import missing_feature, context, scenarios
+from utils import missing_feature, context, scenarios, features
 
 parametrize = pytest.mark.parametrize
 
@@ -40,6 +40,7 @@ def enable_tracestats(sample_rate: Optional[float] = None) -> Any:
 
 
 @scenarios.parametric
+@features.client_side_stats_supported
 class Test_Library_Tracestats:
     @enable_tracestats()
     @missing_feature(context.library == "cpp", reason="cpp has not implemented stats computation yet")
diff --git a/tests/parametric/test_partial_flushing.py b/tests/parametric/test_partial_flushing.py
@@ -1,9 +1,10 @@
 import pytest
 from utils.parametric.spec.trace import Span
 from utils.parametric.spec.trace import find_span_in_traces
-from utils import missing_feature, bug, context, scenarios
+from utils import missing_feature, features, context, scenarios
 
 
+@features.partial_flush
 @scenarios.parametric
 class Test_Partial_Flushing:
     @pytest.mark.parametrize(
diff --git a/tests/parametric/test_span_sampling.py b/tests/parametric/test_span_sampling.py
@@ -1,3 +1,5 @@
+import time
+import json
 import pytest
 from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY
 from utils.parametric.spec.trace import SINGLE_SPAN_SAMPLING_MAX_PER_SEC
@@ -8,11 +10,10 @@
 from utils.parametric.spec.trace import USER_KEEP
 from utils.parametric.spec.trace import Span
 from utils.parametric.spec.trace import find_span_in_traces
-import time
-import json
-from utils import missing_feature, context, scenarios
+from utils import missing_feature, context, scenarios, features
 
 
+@features.single_span_sampling
 @scenarios.parametric
 class Test_Span_Sampling:
     @missing_feature(context.library == "ruby", reason="Issue: _dd.span_sampling.max_per_second is always set in Ruby")
diff --git a/tests/parametric/test_trace_sampling.py b/tests/parametric/test_trace_sampling.py
diff --git a/tests/parametric/test_tracer_flare.py b/tests/parametric/test_tracer_flare.py
diff --git a/tests/test_profiling.py b/tests/test_profiling.py
diff --git a/tests/test_the_test/test_json_report.py b/tests/test_the_test/test_json_report.py
diff --git a/utils/_features.py b/utils/_features.py
