Merge pull request #1126 from code-corps/update-scout-config

Update scout config

Author: joshsmith

config/scout_apm.exs

@@ -4,8 +4,8 @@
 use Mix.Config
 
 config :scout_apm,
-  name: System.get_env("SCOUT_APP_NAME") || "", # The app name that will appear within the Scout UI
-  key: System.get_env("SCOUT_APP_KEY") || ""
+  name: {:system, "SCOUT_APP_NAME"}, # The app name that will appear within the Scout UI
+  key: {:system, "SCOUT_APP_KEY"}
 
 config :phoenix, :template_engines,
   eex: ScoutApm.Instruments.EExEngine,

lib/code_corps/task/query.ex

@@ -3,7 +3,9 @@ defmodule CodeCorps.Task.Query do
   Holds queries used to retrieve a list of, or a single `Task` record from the
   database, using a provided map of parameters/filters.
   """
+
   import Ecto.Query
+  import ScoutApm.Tracing
 
   alias CodeCorps.{Helpers, Task, Repo}
   alias Ecto.Queryable
@@ -18,13 +20,15 @@ defmodule CodeCorps.Task.Query do
   """
   @spec list(map) :: list(Project.t)
   def list(%{} = params) do
-    Task
-    |> Helpers.Query.id_filter(params)
-    |> apply_archived_status(params)
-    |> apply_status(params)
-    |> apply_optional_filters(params)
-    |> order_by([asc: :order])
-    |> Repo.all()
+    timing("Task.Query", "list") do
+      Task
+      |> Helpers.Query.id_filter(params)
+      |> apply_archived_status(params)
+      |> apply_status(params)
+      |> apply_optional_filters(params)
+      |> order_by([asc: :order])
+      |> Repo.all()
+    end
   end
 
   @spec apply_optional_filters(Queryable.t, map) :: Queryable.t

lib/code_corps_web/controllers/task_controller.ex

@@ -4,15 +4,17 @@ defmodule CodeCorpsWeb.TaskController do
 
   alias CodeCorps.{Analytics.SegmentTracker, Task, Policy, User}
 
+  import ScoutApm.Tracing
+
   action_fallback CodeCorpsWeb.FallbackController
   plug CodeCorpsWeb.Plug.DataToAttributes
   plug CodeCorpsWeb.Plug.IdsToIntegers
 
   @spec index(Conn.t, map) :: Conn.t
   def index(%Conn{} = conn, %{} = params) do
-    with tasks <- Task.Query.list(params),
-         tasks <- preload(tasks)
-    do
+    tasks = Task.Query.list(params)
+    tasks = preload(tasks)
+    timing("JaSerializer", "render") do
       conn |> render("index.json-api", data: tasks)
     end
   end
@@ -21,7 +23,7 @@ defmodule CodeCorpsWeb.TaskController do
   def show(%Conn{} = conn, %{} = params) do
     with %Task{} = task <- Task.Query.find(params),
          task <- preload(task)
-   do
+    do
       conn |> render("show.json-api", data: task)
     end
   end
@@ -63,7 +65,9 @@ defmodule CodeCorpsWeb.TaskController do
   @preloads [:comments, :github_pull_request, :task_skills, :user_task]
 
   def preload(data) do
-    Repo.preload(data, @preloads)
+    timing("TaskController", "preload") do
+      Repo.preload(data, @preloads)
+    end
   end
 
   # tracking