speed up weaver tests

Author: lmolkova

tests/opentelemetry-test-utils/src/opentelemetry/test/weaver_live_check.py

@@ -252,6 +252,7 @@ def test_my_telemetry(self):
 
     def __init__(
         self,
+        registry: str | None = None,
         schema_version: str | None = None,
         policies_dir: str | None = None,
         inactivity_timeout: int = 30,
@@ -285,13 +286,14 @@ def __init__(
         if policies_dir:
             command += ["--advice-policies", os.path.abspath(policies_dir)]
 
-        if schema_version is None:
-            schema_version = list(Schemas)[-1].value.rsplit("/", 1)[-1]
+        if registry is None:
+            if schema_version is None:
+                schema_version = list(Schemas)[-1].value.rsplit("/", 1)[-1]
+            registry = f"https://github.com/open-telemetry/semantic-conventions/archive/refs/tags/v{schema_version}.tar.gz[model]"
+        elif os.path.isdir(registry):
+            registry = os.path.abspath(registry)
 
-        command += [
-            "--registry",
-            f"https://github.com/open-telemetry/semantic-conventions/archive/refs/tags/v{schema_version}.tar.gz[model]",
-        ]
+        command += ["--registry", registry]
 
         self._command = command
         logger.debug("Weaver command: %s", command)
@@ -304,15 +306,15 @@ def __exit__(self, exc_type: Any, *_: Any) -> None:
             self._stopped = True
         self.close()
 
-    def start(self, timeout: int = 60) -> "WeaverLiveCheck":
+    def start(self) -> "WeaverLiveCheck":
         logger.debug("Starting WeaverLiveCheck process...")
         self._process = subprocess.Popen(  # pylint: disable=consider-using-with
             self._command,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
         )
         try:
-            self._wait_for_ready(timeout=timeout)
+            self._wait_for_ready()
             self._ready = True
         except Exception as exc:  # pylint: disable=broad-except
             logs = self._read_weaver_logs()
@@ -322,22 +324,22 @@ def start(self, timeout: int = 60) -> "WeaverLiveCheck":
             raise
         return self
 
-    def _wait_for_ready(self, timeout: int = 60) -> None:
+    def _wait_for_ready(self) -> None:
         retry = Retry(
-            total=timeout,
+            total=10,
             backoff_factor=1,
             backoff_max=1,
             # Any non-2xx response from /health means weaver isn't ready yet.
             status_forcelist=list(range(300, 600)),
+            raise_on_status=True,
             allowed_methods=["GET"],
         )
         session = Session()
         session.mount("http://", HTTPAdapter(max_retries=retry))
         try:
-            response = session.get(
+            session.get(
                 f"http://localhost:{self._admin_port}/health", timeout=5
             )
-            response.raise_for_status()
         except Exception as exc:  # pylint: disable=broad-except
             if self._process is not None and self._process.poll() is not None:
                 raise RuntimeError(

tests/opentelemetry-test-utils/tests/test_weaver_live_check.py

@@ -41,6 +41,7 @@
     _HAS_GRPC = False
 
 _TESTDATA_DIR = os.path.join(os.path.dirname(__file__), "testdata")
+_REGISTRY_DIR = os.path.join(_TESTDATA_DIR, "registry")
 
 
 def _make_provider(otlp_endpoint: str) -> TracerProvider:
@@ -62,7 +63,7 @@ def _make_provider(otlp_endpoint: str) -> TracerProvider:
 class TestSDKInitLiveCheck(unittest.TestCase):
     def test_end_and_check_no_violations(self):
         """end_and_check() returns a LiveCheckReport with no violations on conformant telemetry."""
-        with WeaverLiveCheck() as weaver:
+        with WeaverLiveCheck(registry=_REGISTRY_DIR) as weaver:
             provider = _make_provider(weaver.otlp_endpoint)
             with provider.get_tracer("test-tracer").start_as_current_span(
                 "test-span"
@@ -76,7 +77,9 @@ def test_end_and_check_no_violations(self):
 
     def test_end_and_check_raises_on_violations(self):
         """end_and_check() raises LiveCheckError with the report attached."""
-        with WeaverLiveCheck(policies_dir=_TESTDATA_DIR) as weaver:
+        with WeaverLiveCheck(
+            registry=_REGISTRY_DIR, policies_dir=_TESTDATA_DIR
+        ) as weaver:
             provider = _make_provider(weaver.otlp_endpoint)
             with provider.get_tracer("test-tracer").start_as_current_span(
                 "test-span"
@@ -105,7 +108,7 @@ def test_end_and_check_raises_on_violations(self):
 
     def test_end_no_violations(self):
         """end() returns a LiveCheckReport with no violations on conformant telemetry."""
-        with WeaverLiveCheck() as weaver:
+        with WeaverLiveCheck(registry=_REGISTRY_DIR) as weaver:
             provider = _make_provider(weaver.otlp_endpoint)
             with provider.get_tracer("test-tracer").start_as_current_span(
                 "test-span"
@@ -123,7 +126,9 @@ def test_end_no_violations(self):
 
     def test_end_with_violations(self):
         """end() returns a LiveCheckReport with violations without raising."""
-        with WeaverLiveCheck(policies_dir=_TESTDATA_DIR) as weaver:
+        with WeaverLiveCheck(
+            registry=_REGISTRY_DIR, policies_dir=_TESTDATA_DIR
+        ) as weaver:
             provider = _make_provider(weaver.otlp_endpoint)
             with provider.get_tracer("test-tracer").start_as_current_span(
                 "test-span"
@@ -150,7 +155,7 @@ def test_end_with_violations(self):
 
     def test_report_span_statistics(self):
         """The full report exposes span counts and individual span samples."""
-        with WeaverLiveCheck() as weaver:
+        with WeaverLiveCheck(registry=_REGISTRY_DIR) as weaver:
             provider = _make_provider(weaver.otlp_endpoint)
             with provider.get_tracer("test-tracer").start_as_current_span(
                 "test-span"