Some fixes and add migration

apps/lenra/lib/lenra/apps.ex

@@ -334,7 +334,7 @@ defmodule Lenra.Apps do
   end
 
   def deploy_in_main_env(%Build{} = build) do
-    Lenra.Telemetry.start(:app_deployment, build.application_id)
+    Lenra.Monitor.ApplicationDeploymentMonitor.monitor(build.application_id, %{})
 
     with loaded_build <- Repo.preload(build, :application),
          loaded_app <- Repo.preload(loaded_build.application, main_env: [:environment]),
@@ -407,7 +407,7 @@ defmodule Lenra.Apps do
           |> Repo.transaction()
 
         ApplicationServices.stop_app("#{OpenfaasServices.get_function_name(service_name, build_number)}")
-        Lenra.Telemetry.stop(:app_deployment, deployment.application_id)
+        Lenra.Monitor.ApplicationDeploymentMonitor.stop(deployment.application_id, %{})
         transaction
 
       # Function not found in openfaas, 30 retry (15s),

apps/lenra/lib/monitor.ex

@@ -19,7 +19,7 @@ defmodule Lenra.Monitor do
   def setup do
     events = [
       [:lenra, :app_deployment, :start],
-      [:lenra, :app_deployment, :stop],
+      [:lenra, :app_deployment, :stop]
     ]
 
     :telemetry.attach_many(
@@ -32,14 +32,16 @@ defmodule Lenra.Monitor do
 
   def handle_event([:lenra, :app_deployment, :start], measurements, metadata, _config) do
     application_id = Map.get(metadata, :application_id)
+    build_id = Map.get(metadata, :build_id)
 
-    Repo.insert(ApplicationDeploymentMeasurement.new(application_id, measurements))
+    Repo.insert(ApplicationDeploymentMeasurement.new(application_id, build_id, measurements))
   end
 
   def handle_event([:lenra, :app_deployment, :stop], measurements, metadata, _config) do
     application_id = Map.get(metadata, :application_id)
+    build_id = Map.get(metadata, :build_id)
 
-    Repo.get_by!(ApplicationDeploymentMeasurement, application_id: application_id)
+    Repo.get_by!(ApplicationDeploymentMeasurement, %{application_id: application_id, build_id: build_id})
     |> ApplicationDeploymentMeasurement.update(measurements)
     |> Repo.update()
   end

apps/lenra/lib/monitor/application_deployment_measurement.ex

@@ -5,10 +5,11 @@ defmodule Lenra.Monitor.ApplicationDeploymentMeasurement do
   use Ecto.Schema
   import Ecto.Changeset
 
-  alias Lenra.Apps.App
+  alias Lenra.Apps.{App, Build}
 
-  schema "session_measurement" do
+  schema "application_deployment_measurement" do
     belongs_to(:application, App)
+    belongs_to(:build, Build)
 
     field(:start_time, :utc_datetime)
     field(:end_time, :utc_datetime)
@@ -21,12 +22,12 @@ defmodule Lenra.Monitor.ApplicationDeploymentMeasurement do
   def changeset(application_deployment_measurement, params \\ %{}) do
     application_deployment_measurement
     |> cast(params, [:start_time, :end_time, :duration])
-    |> validate_required([:start_time, :application_id])
+    |> validate_required([:start_time, :application_id, :build_id])
     |> foreign_key_constraint(:application_id)
   end
 
-  def new(application_id, params \\ %{}) do
-    %__MODULE__{application_id: application_id}
+  def new(application_id, build_id, params \\ %{}) do
+    %__MODULE__{application_id: application_id, build_id: build_id}
     |> __MODULE__.changeset(params)
   end
 

apps/lenra/priv/repo/migrations/20240713140043_application_deployment_measurement.exs

@@ -0,0 +1,17 @@
+defmodule Lenra.Repo.Migrations.ApplicationDeploymentMeasurement do
+  use Ecto.Migration
+
+  def change do
+    create table(:application_deployment_measurement) do
+      add(:user_id, references(:users), null: false)
+      add(:build_id, references(:builds), null: false)
+
+      add(:start_time, :timestamp, null: false)
+      add(:end_time, :timestamp)
+
+      add(:duration, :integer)
+
+      timestamps()
+    end
+  end
+end