rename run_client to on_script_start

pmcollins · pmcollins · commit 478013dd7175 · 2024-04-11T11:57:52.000-04:00
diff --git a/tests/oteltest/example_scripts/simple_loop.py b/tests/oteltest/example_scripts/simple_loop.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import time
-from typing import Mapping, Optional, Sequence
 
 from opentelemetry import trace
 from oteltest import OtelTest, Telemetry
@@ -39,8 +38,7 @@ def environment_variables(self):
     def wrapper_script(self):
         return "opentelemetry-instrument"
 
-    def run_client(self):
-        print("run_client()")
+    def on_script_start(self):
         return None
 
     def validate(self, telemetry: Telemetry):
diff --git a/tests/oteltest/src/oteltest/__init__.py b/tests/oteltest/src/oteltest/__init__.py
@@ -129,7 +129,7 @@ def wrapper_script(self) -> str:
         pass
 
     @abc.abstractmethod
-    def run_client(self) -> Optional[float]:
+    def on_script_start(self) -> Optional[float]:
         pass
 
     @abc.abstractmethod
diff --git a/tests/oteltest/src/oteltest/private.py b/tests/oteltest/src/oteltest/private.py
@@ -96,10 +96,10 @@ def run_python_script(script, script_dir, oteltest_instance: OtelTest, v):
         env=oteltest_instance.environment_variables(),
     )
 
-    timeout = oteltest_instance.run_client()
+    timeout = oteltest_instance.on_script_start()
     if timeout is None:
         print(
-            f"- Will wait indefinitely for {script} to finish (max_wait is None)"
+            f"- Will wait indefinitely for {script} to finish (on_script_start() returned None)"
         )
     else:
         print(

Original file line number	Diff line number	Diff line change
`@@ -96,10 +96,10 @@ def run_python_script(script, script_dir, oteltest_instance: OtelTest, v):`
`96`	`96`	`env=oteltest_instance.environment_variables(),`
`97`	`97`	`)`
`98`	`98`
`99`		`- timeout = oteltest_instance.run_client()`
	`99`	`+ timeout = oteltest_instance.on_script_start()`
`100`	`100`	`if timeout is None:`
`101`	`101`	`print(`
`102`		`- f"- Will wait indefinitely for {script} to finish (max_wait is None)"`
	`102`	`+ f"- Will wait indefinitely for {script} to finish (on_script_start() returned None)"`
`103`	`103`	`)`
`104`	`104`	`else:`
`105`	`105`	`print(`