Move metrics config to base extractor config (#484)

* Move metrics config to Base extractor config

* Fix flaky tests

* Fix the comments

* Remove flaky test fixes

Author: Hmnt39

cognite/extractorutils/unstable/configuration/models.py

@@ -866,6 +866,7 @@ class ExtractorConfig(ConfigModel):
     """
 
     state_store: StateStoreConfig | None = None
+    metrics: MetricsConfig | None = None
     log_handlers: list[LogHandlerConfig] = Field(default_factory=_log_handler_default)
     retry_startup: bool = True
 

cognite/extractorutils/unstable/core/base.py

@@ -73,7 +73,6 @@ def my_task_function(self, task_context: TaskContext) -> None:
     ExtractorConfig,
     LogConsoleHandlerConfig,
     LogFileHandlerConfig,
-    MetricsConfig,
 )
 from cognite.extractorutils.unstable.core._dto import (
     CogniteModel,
@@ -118,13 +117,11 @@ def __init__(
         application_config: _T,
         current_config_revision: ConfigRevision,
         log_level_override: str | None = None,
-        metrics_config: MetricsConfig | None = None,
     ) -> None:
         self.connection_config = connection_config
         self.application_config = application_config
         self.current_config_revision: ConfigRevision = current_config_revision
         self.log_level_override = log_level_override
-        self.metrics_config = metrics_config
 
 
 class Extractor(Generic[ConfigType], CogniteLogger):
@@ -162,7 +159,7 @@ def __init__(
 
         self.connection_config = config.connection_config
         self.application_config = config.application_config
-        self.metrics_config = config.metrics_config
+        self.metrics_config = config.application_config.metrics
         self.current_config_revision: ConfigRevision = config.current_config_revision
         self.log_level_override = config.log_level_override
 

tests/test_unstable/test_base.py

@@ -249,7 +249,6 @@ def test_raw_state_store_integration(
 @pytest.mark.parametrize("metrics_type", ["prometheus", "cognite"])
 def test_extractor_with_metrics_pushers(connection_config: ConnectionConfig, metrics_type: str) -> None:
     override_level = "INFO"
-    app_config = TestConfig(parameter_one=1, parameter_two="a")
     call_count = {"count": 0}
 
     if metrics_type == "prometheus":
@@ -293,12 +292,17 @@ def counting_push(self: CognitePusher) -> None:
 
         original_push = pusher_cls._push_to_server
 
+    app_config = TestConfig(
+        parameter_one=1,
+        parameter_two="a",
+        metrics=metrics_config,
+    )
+
     full_config = FullConfig(
         connection_config=connection_config,
         application_config=app_config,
         current_config_revision=1,
         log_level_override=override_level,
-        metrics_config=metrics_config,
     )
     worker = get_checkin_worker(connection_config)
     extractor = TestExtractor(full_config, worker, metrics=TestMetrics)

tests/test_unstable/test_errors.py

@@ -225,7 +225,6 @@ def test_reporting_errors(
             headers={"cdf-version": "alpha"},
         ).json()["items"]
         assert len(res) == 1
-
         assert res[0]["externalId"] == err.external_id
         assert res[0]["startTime"] == err.start_time
         assert res[0]["description"] == err.description

tests/test_unstable/test_runtime.py

@@ -121,7 +121,6 @@ def cancel_after_delay() -> None:
     assert config.parameter_one == 123
     assert config.parameter_two == "abc"
 
-    # There should be one error reported from initially attempting to run without a config
     errors = cognite_client.get(
         url=f"/api/v1/projects/{cognite_client.config.project}/integrations/errors",
         params={"integration": connection_config.integration.external_id},