fb

Author: NSHkr

lib/elixir_scope/foundation/config.ex

@@ -123,6 +123,8 @@ defmodule ElixirScope.Foundation.Config do
   end
 
   @impl Access
+  @spec get_and_update(ElixirScope.Foundation.Config.t(), any(), (any() -> :pop | {any(), any()})) ::
+          {any(), struct()}
   def get_and_update(%__MODULE__{} = config, key, function) do
     map_config = Map.from_struct(config)
 

lib/elixir_scope/foundation/telemetry.ex

@@ -7,7 +7,7 @@ defmodule ElixirScope.Foundation.Telemetry do
   """
 
   require Logger
-  alias ElixirScope.Foundation.{Utils, Error, ErrorContext}
+  alias ElixirScope.Foundation.{Utils} #, Error} #, ErrorContext}
 
   @telemetry_events [
     # Configuration events
@@ -39,26 +39,34 @@ defmodule ElixirScope.Foundation.Telemetry do
 
   @spec measure_event([atom(), ...], map(), (() -> t)) :: t when t: var
   def measure_event(event_name, metadata \\ %{}, fun) when is_function(fun, 0) do
-    context = ErrorContext.new(__MODULE__, :measure_event,
-      metadata: %{event_name: event_name, metadata: metadata})
-
     start_time = Utils.monotonic_timestamp()
 
-    result = ErrorContext.with_context(context, fun)
+    # Don't wrap in ErrorContext - let exceptions propagate
+    try do
+      result = fun.()
 
-    end_time = Utils.monotonic_timestamp()
-    duration = end_time - start_time
+      end_time = Utils.monotonic_timestamp()
+      duration = end_time - start_time
 
-    measurements = %{duration: duration, timestamp: end_time}
-    :telemetry.execute(event_name, measurements, metadata)
+      measurements = %{duration: duration, timestamp: end_time}
+      :telemetry.execute(event_name, measurements, metadata)
+
+      result
+    rescue
+      exception ->
+        # Still measure the duration even if it failed
+        end_time = Utils.monotonic_timestamp()
+        duration = end_time - start_time
+
+        measurements = %{duration: duration, timestamp: end_time}
+        error_metadata = Map.put(metadata, :exception, exception)
+
+        # Emit both the normal event and an error event
+        :telemetry.execute(event_name, measurements, error_metadata)
+        emit_error_event(event_name, metadata, {:error, exception})
 
-    # If there was an error in the function, we still measured it
-    case result do
-      {:error, _} = error ->
-        emit_error_event(event_name, metadata, error)
-        error
-      other ->
-        other
+        # Re-raise the exception so the test can catch it
+        reraise exception, __STACKTRACE__
     end
   end
 
@@ -125,19 +133,18 @@ defmodule ElixirScope.Foundation.Telemetry do
     """)
   end
 
-  @spec emit_error_event([atom(), ...], map(), {:error, term()}) :: :ok
-  defp emit_error_event(event_name, metadata, error) do
-    error_metadata = case error do
-      {:error, %Error{} = err} ->
-        Map.merge(metadata, %{
-          error_code: err.code,
-          error_message: err.message
-        })
-      {:error, reason} ->
-        Map.merge(metadata, %{
-          error_type: :external_error,
-          error_message: inspect(reason)
-        })
+  @spec emit_error_event([atom(), ...], map(), {:error, struct()}) :: :ok
+  defp emit_error_event(event_name, metadata, {:error, err}) do
+    error_metadata = if err.__struct__ == ElixirScope.Foundation.Error do
+      Map.merge(metadata, %{
+        error_code: err.code,
+        error_message: err.message
+      })
+    else
+      Map.merge(metadata, %{
+        error_type: :external_error,
+        error_message: inspect(err)
+      })
     end
 
     measurements = %{error_count: 1, timestamp: Utils.monotonic_timestamp()}

test/support/foundation_test_helpers.ex …/elixir_scope/foundation/test_helpers.extest/support/foundation_test_helpers.ex renamed to lib/elixir_scope/foundation/test_helpers.ex test/support/foundation_test_helpers.ex renamed to lib/elixir_scope/foundation/test_helpers.ex

@@ -46,7 +46,7 @@ defmodule ElixirScope.Foundation.TestHelpers do
     original_config = Config.get()
 
     # Apply overrides
-    test_config = deep_merge_config(original_config, config_overrides)
+    _test_config = deep_merge_config(original_config, config_overrides)
 
     try do
       # This would require additional Config API in a real implementation

test/smoke/foundation_smoke_test.exs

@@ -5,6 +5,7 @@ defmodule ElixirScope.Smoke.FoundationTest do
   """
 
   use ExUnit.Case
+  @moduletag :foundation
 
   alias ElixirScope.Foundation
   alias ElixirScope.Foundation.{Config, Events, Utils, Telemetry, Error}

test/unit/foundation/config_test.exs

@@ -1,5 +1,6 @@
 defmodule ElixirScope.Foundation.ConfigTest do
   use ExUnit.Case, async: false  # Config tests must be synchronous
+  @moduletag :foundation
 
   alias ElixirScope.Foundation.{Config, Error}
   alias ElixirScope.Foundation.TestHelpers

test/unit/foundation/events_test.exs

@@ -1,7 +1,8 @@
 defmodule ElixirScope.Foundation.EventsTest do
   use ExUnit.Case, async: true
+  @moduletag :foundation
 
-  alias ElixirScope.Foundation.{Events, Utils, Error}
+  alias ElixirScope.Foundation.{Events}
 
   describe "event creation" do
     test "creates basic event with required fields" do

test/unit/foundation/utils_test.exs

@@ -1,5 +1,6 @@
 defmodule ElixirScope.Foundation.UtilsTest do
   use ExUnit.Case, async: true
+  @moduletag :foundation
 
   alias ElixirScope.Foundation.Utils