Merge pull request #2414 from tsundberg/timed-and-meterd-cannot-be-us…

…ed-at-the-same-time Document that the Timed and Metered can't be used at the same time.
dropwizard · Jun 27, 2018 · 4cb87b0 · 4cb87b0
2 parents 3b14a58 + 1359051
commit 4cb87b0
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/docs/source/manual/core.rst b/docs/source/manual/core.rst
@@ -1300,6 +1300,11 @@ Dropwizard augments Jersey to automatically record runtime information about you
 * ``@Metered`` measures the rate at which the resource is accessed
 * ``@ExceptionMetered`` measures how often exceptions occur processing the resource
 
+.. important::
+
+    ``@Timed`` and ``@Metered`` cannot be used at the same time. ``@Timed`` includes ``@Metered`` and
+    an ``IllegalArgumentException`` will be thrown if you try to annotate a method with both.
+
 .. _man-core-resources-parameters:
 
 Parameters