Split cannon benchmarks and tests

changelog.d/5-internal/split-cannon-benchmarks

@@ -0,0 +1 @@
+Split cannon benchmarks and tests

services/cannon/bench/Main.hs

@@ -0,0 +1,24 @@
+-- This file is part of the Wire Server implementation.
+--
+-- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
+--
+-- This program is free software: you can redistribute it and/or modify it under
+-- the terms of the GNU Affero General Public License as published by the Free
+-- Software Foundation, either version 3 of the License, or (at your option) any
+-- later version.
+--
+-- This program is distributed in the hope that it will be useful, but WITHOUT
+-- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+-- details.
+--
+-- You should have received a copy of the GNU Affero General Public License along
+-- with this program. If not, see <https://www.gnu.org/licenses/>.
+
+module Main where
+
+import Bench
+import Imports
+
+main :: IO ()
+main = benchmark

services/cannon/cannon.cabal

@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 6c53d0a25079c3947f669ee6cf4a32b3e9a9472db9050997e478fc8fdb7b3858
+-- hash: 87d683d193f2ad916c72f4c84d0816911f7d894cfbffed36f361436005571339
 
 name:           cannon
 version:        0.31.0
@@ -100,7 +100,6 @@ test-suite cannon-tests
   type: exitcode-stdio-1.0
   main-is: Main.hs
   other-modules:
-      Bench
       Test.Cannon.Dict
       Paths_cannon
   hs-source-dirs:
@@ -125,3 +124,32 @@ test-suite cannon-tests
     , uuid
     , wai-utilities
   default-language: Haskell2010
+
+benchmark cannon-bench
+  type: exitcode-stdio-1.0
+  main-is: Main.hs
+  other-modules:
+      Bench
+      Paths_cannon
+  hs-source-dirs:
+      bench
+  default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns
+  ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N
+  build-depends:
+      QuickCheck >=2.7
+    , async
+    , base
+    , bytestring
+    , cannon
+    , criterion >=1.0
+    , extended
+    , imports
+    , metrics-wai
+    , random >=1.0
+    , tasty >=0.8
+    , tasty-hunit >=0.8
+    , tasty-quickcheck >=0.8
+    , types-common
+    , uuid
+    , wai-utilities
+  default-language: Haskell2010

services/cannon/package.yaml

@@ -88,6 +88,28 @@ tests:
     - types-common
     - uuid
     - wai-utilities
+benchmarks:
+  cannon-bench:
+    main: Main.hs
+    source-dirs: bench
+    ghc-options:
+    - -threaded
+    - -with-rtsopts=-N
+    dependencies:
+    - async
+    - base
+    - bytestring
+    - cannon
+    - criterion >=1.0
+    - metrics-wai
+    - QuickCheck >=2.7
+    - random >=1.0
+    - tasty >=0.8
+    - tasty-hunit >=0.8
+    - tasty-quickcheck >=0.8
+    - types-common
+    - uuid
+    - wai-utilities
 flags:
   static:
     description: Enable static linking

services/cannon/test/Main.hs

@@ -17,7 +17,6 @@
 
 module Main where
 
-import qualified Bench as B
 import qualified Cannon.API
 import Data.Metrics.Test (pathsConsistencyCheck)
 import Data.Metrics.WaiRoute (treeToPaths)
@@ -28,8 +27,7 @@ import Test.Tasty
 import Test.Tasty.HUnit
 
 main :: IO ()
-main = do
-  B.benchmark
+main =
   defaultMain $
     testGroup
       "Tests"