diff --git a/lib/entitlements.rb b/lib/entitlements.rb
index e083389..e8d053a 100644
--- a/lib/entitlements.rb
+++ b/lib/entitlements.rb
@@ -421,6 +421,9 @@ def self.timed_operation(phase:, provider: nil, target: nil, span: "leaf", concu
       result = yield
       tags[1] = "status:success"
       result
+    rescue => e
+      tags << "error_class:#{e.class.name}"
+      raise
     end
   end
 
diff --git a/spec/unit/entitlements_spec.rb b/spec/unit/entitlements_spec.rb
index 9d54a1b..79bbe0e 100644
--- a/spec/unit/entitlements_spec.rb
+++ b/spec/unit/entitlements_spec.rb
@@ -300,7 +300,8 @@
           "phase:audit_setup",
           "status:error",
           "span:leaf",
-          "concurrent:false"
+          "concurrent:false",
+          "error_class:RuntimeError"
         ]
       )
     end