fixing odd merge

DataDog · Sep 19, 2024 · e0f127e · e0f127e
1 parent 2fec350
commit e0f127e
Showing 1 changed file with 0 additions and 65 deletions.
diff --git a/sidecar/src/service/sidecar_server.rs b/sidecar/src/service/sidecar_server.rs
@@ -249,71 +249,6 @@ impl SidecarServer {
             .expect("Unable to acquire lock on sessions")
     }
 
-    async fn get_app(
-        &self,
-        instance_id: &InstanceId,
-        runtime_meta: &RuntimeMetadata,
-        service_name: &str,
-        env_name: &str,
-        initial_actions: Vec<TelemetryActions>,
-    ) -> Option<AppInstance> {
-        let rt_info = self.get_runtime(instance_id);
-
-        let manual_app_future = rt_info.get_app(service_name, env_name);
-
-        if manual_app_future.completer.is_none() {
-            return manual_app_future.app_future.await;
-        }
-
-        let mut builder = TelemetryWorkerBuilder::new_fetch_host(
-            service_name.to_owned(),
-            runtime_meta.language_name.to_owned(),
-            runtime_meta.language_version.to_owned(),
-            runtime_meta.tracer_version.to_owned(),
-        );
-        builder.runtime_id = Some(instance_id.runtime_id.to_owned());
-        builder.application.env = Some(env_name.to_owned());
-        let session_info = self.get_session(&instance_id.session_id);
-        let mut config = session_info
-            .session_config
-            .lock()
-            .expect("Unable to acquire lock on session_config")
-            .clone()
-            .unwrap_or_else(ddtelemetry::config::Config::from_env);
-        config.restartable = true;
-
-        let instance_option = match builder.spawn_with_config(config.clone()).await {
-            Ok((handle, worker_join)) => {
-                info!("spawning telemetry worker {config:?}");
-
-                let instance = AppInstance {
-                    telemetry: handle,
-                    telemetry_worker_shutdown: worker_join.map(Result::ok).boxed().shared(),
-                    telemetry_metrics: Default::default(),
-                };
-
-                instance.telemetry.send_msgs(initial_actions).await.ok();
-
-                instance
-                    .telemetry
-                    .send_msg(TelemetryActions::Lifecycle(LifecycleAction::Start))
-                    .await
-                    .ok();
-                Some(instance)
-            }
-            Err(e) => {
-                error!("could not spawn telemetry worker {:?}", e);
-                None
-            }
-        };
-        manual_app_future
-            .completer
-            .expect("Completed expected Some ManualFuture for application instance, but found none")
-            .complete(instance_option)
-            .await;
-        manual_app_future.app_future.await
-    }
-
     fn send_trace_v04(
         &self,
         headers: &SerializedTracerHeaderTags,