Merge remote-tracking branch 'origin/local-telemetry-agent' into obj-…

…store-otel-export

runhouse/resources/envs/env.py

@@ -185,17 +185,6 @@ def install(self, force: bool = False, cluster: Cluster = None, node: str = "all
                 on the current cluster. (Default: ``None``)
             node (str, optional): Node to install the env on. (Default: ``"all"``)
         """
-
-        # Hash the config_for_rns to check if we need to install
-        env_config = self.config()
-        # Remove the name because auto-generated names will be different, but the installed components are the same
-        env_config.pop("name")
-        install_hash = hash(str(env_config))
-        # Check the existing hash
-        if install_hash in obj_store.installed_envs and not force:
-            logger.debug("Env already installed, skipping")
-            return
-        obj_store.installed_envs[install_hash] = self.name
         # If we're doing the install remotely via SSH (e.g. for default_env), there is no cache
         if not cluster:
             # Hash the config_for_rns to check if we need to install

runhouse/resources/hardware/cluster.py

@@ -194,29 +194,6 @@ def default_env(self, env):
                 "Run `cluster.restart_server()` to restart the Runhouse server on the new default env."
             )
 
-    @classmethod
-    def from_name(
-        cls,
-        name,
-        load_from_den: bool = True,
-        dryrun: bool = False,
-        _alt_options: Dict = None,
-        _resolve_children: bool = True,
-    ):
-        cluster = super().from_name(
-            name=name,
-            load_from_den=load_from_den,
-            dryrun=dryrun,
-            _alt_options=_alt_options,
-            _resolve_children=_resolve_children,
-        )
-        if hasattr(cluster, "_update_from_sky_status"):
-            try:
-                cluster._update_from_sky_status(dryrun=True)
-            except:
-                pass
-        return cluster
-
     def save_config_to_cluster(
         self,
         node: str = None,
@@ -1958,4 +1935,4 @@ def _folder_mv(
         )
 
     def _folder_exists(self, path: Union[str, Path]):
-        return self.client.folder_exists(path=path)
+        return self.client.folder_exists(path=path)

runhouse/servers/env_servlet.py

@@ -269,7 +269,6 @@ def _get_env_cpu_usage(self, cluster_config: dict = None):
             node_index,
         )
 
-
     def _get_env_gpu_usage(self):
         # currently works correctly for a single node GPU. Multinode-clusters will be supported shortly.
 

runhouse/servers/http/http_server.py

@@ -604,13 +604,11 @@ async def get_object(
         serialization: Optional[str] = "json",
         remote: bool = False,
     ):
-        request_id = request.headers.get("X-Request-ID", str(uuid.uuid4()))
         try:
             return await obj_store.aget(
                 key=key,
                 serialization=serialization,
                 remote=remote,
-                request_id=request_id,
             )
         except Exception as e:
             return handle_exception_response(

tests/test_resources/test_clusters/test_cluster.py

@@ -534,6 +534,7 @@ def test_rh_status_pythonic(self, cluster):
             "env_cpu_usage",
             "env_gpu_usage",
             "env_resource_mapping",
+            "node_index",
             "node_ip",
             "node_name",
             "pid",
@@ -934,4 +935,4 @@ def test_switch_default_env(self, cluster):
 
         # set it back
         cluster.default_env = test_env
-        cluster.delete(new_env.name)
+        cluster.delete(new_env.name)

tests/test_servers/conftest.py

@@ -214,4 +214,4 @@ def setup_cluster_config(local_cluster):
 
     finally:
         if cluster_config_path.exists():
-            cluster_config_path.unlink()
+            cluster_config_path.unlink()

tests/test_servers/test_telemetry_agent.py

@@ -39,7 +39,6 @@ def test_send_span_to_collector_backend(self, local_telemetry_collector):
     def test_send_span_with_local_agent_to_local_collector_backend(
         self, local_telemetry_collector, local_telemetry_agent_for_local_backend
     ):
-
         """Generate a span and have a locally running Otel agent send it to a locally running collector backend"""
         provider = TracerProvider()
         trace.set_tracer_provider(provider)
@@ -74,7 +73,8 @@ def test_send_span_with_local_agent_to_collector_backend(
         # Have the agent be responsible for sending the spans to the collector backend
         endpoint = f"grpc://localhost:{local_telemetry_agent_for_runhouse_backend.agent_config.grpc_port}"
         span_processor = BatchSpanProcessor(
-            OTLPSpanExporter(endpoint=endpoint, insecure=True))
+            OTLPSpanExporter(endpoint=endpoint, insecure=True)
+        )
         trace.get_tracer_provider().add_span_processor(span_processor)
 
         with tracer.start_as_current_span(f"span-from-agent-{str(uuid.uuid4())}"):