clean up warnings

herp-inc · Mar 8, 2024 · 7066a40 · 7066a40
1 parent e563430
commit 7066a40
Show file tree

Hide file tree

Showing 51 changed files with 287 additions and 498 deletions.
diff --git a/api/hs-opentelemetry-api.cabal b/api/hs-opentelemetry-api.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.1.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -69,7 +69,7 @@ library
   default-extensions:
       OverloadedStrings
       RecordWildCards
-  ghc-options: -Wall
+  ghc-options: -Wunused-packages -Wall
   build-depends:
       async
     , attoparsec
@@ -78,17 +78,14 @@ library
     , bytestring
     , charset
     , clock
-    , containers
     , data-default-class
-    , ghc-prim
     , hashable
     , http-types
     , memory
     , mtl
     , template-haskell
     , text
     , thread-utils-context ==0.2.*
-    , transformers
     , unliftio-core
     , unordered-containers
     , vault
@@ -109,31 +106,14 @@ test-suite hs-opentelemetry-api-test
   default-extensions:
       OverloadedStrings
       RecordWildCards
-  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+  ghc-options: -Wunused-packages -threaded -rtsopts -with-rtsopts=-N
   build-depends:
-      async
-    , attoparsec
-    , base >=4.7 && <5
-    , binary
-    , bytestring
-    , charset
-    , clock
-    , containers
-    , data-default-class
-    , ghc-prim
-    , hashable
+      base >=4.7 && <5
     , hs-opentelemetry-api
     , hspec
-    , http-types
-    , memory
     , mtl
-    , template-haskell
-    , text
-    , thread-utils-context ==0.2.*
-    , transformers
     , unliftio-core
     , unordered-containers
-    , vault
     , vector
     , vector-builder
   default-language: Haskell2010
diff --git a/api/package.yaml b/api/package.yaml
@@ -21,37 +21,37 @@ default-extensions:
 - OverloadedStrings
 - RecordWildCards
 
+ghc-options: -Wunused-packages
+
 dependencies:
 - base >= 4.7 && < 5
-- async
-- bytestring
-- text
-- vault
-- containers
-- hashable
-- thread-utils-context == 0.2.*
-- unordered-containers
-- binary
-- vector
-- clock
-- memory
 - mtl
-- transformers
-- http-types
-- attoparsec
-- template-haskell
-- charset
-- ghc-prim
 - unliftio-core
+- unordered-containers
+- vector
 - vector-builder
-- data-default-class
 
 library:
   source-dirs: src
   ghc-options: -Wall
   other-modules:
   - OpenTelemetry.Context.Types
   - OpenTelemetry.Internal.Trace.Types
+  dependencies:
+  - async
+  - attoparsec
+  - binary
+  - bytestring
+  - charset
+  - clock
+  - data-default-class
+  - hashable
+  - http-types
+  - memory
+  - template-haskell
+  - text
+  - thread-utils-context == 0.2.*
+  - vault
 
 tests:
   hs-opentelemetry-api-test:
@@ -62,7 +62,7 @@ tests:
     - -rtsopts
     - -with-rtsopts=-N
     dependencies:
-    - hspec
     - hs-opentelemetry-api
+    - hspec
     - vector
     - vector-builder
diff --git a/api/test/Spec.hs b/api/test/Spec.hs
@@ -31,7 +31,7 @@ instance Exception TestException
 exceptionTest :: IO ()
 exceptionTest = do
   tp <- getGlobalTracerProvider
-  t <- OpenTelemetry.Trace.Core.getTracer tp "test" tracerOptions
+  let t = OpenTelemetry.Trace.Core.makeTracer tp "test" tracerOptions
   spanToCheck <- newIORef undefined
   handle (\(TestException _) -> pure ()) $ do
     inSpan' t "test" defaultSpanArguments $ \span -> do

diff --git a/examples/aws-s3/aws-s3-example.cabal b/examples/aws-s3/aws-s3-example.cabal
@@ -39,7 +39,6 @@ executable aws-s3-example
                  amazonka-s3,
                  bytestring,
                  conduit,
-                 hs-opentelemetry-api,
                  hs-opentelemetry-instrumentation-amazonka,
                  hs-opentelemetry-instrumentation-http-client,
                  hs-opentelemetry-sdk,

diff --git a/examples/hspec/package.yaml b/examples/hspec/package.yaml
@@ -1,5 +1,7 @@
 name: hspec-example
 
+ghc-options: -Wunused-packages
+
 dependencies:
 # minimal example dependencies
 - base

diff --git a/examples/http-server/http-server.cabal b/examples/http-server/http-server.cabal
@@ -9,12 +9,10 @@ executable http-server
   main-is: main.hs
   build-depends: base == 4.*,
                  hs-opentelemetry-api,
-                 hs-opentelemetry-sdk,
-                 hs-opentelemetry-propagator-datadog,
-                 hs-opentelemetry-propagator-w3c,
-                 hs-opentelemetry-instrumentation-wai,
                  hs-opentelemetry-instrumentation-http-client,
-                 bytestring,
+                 hs-opentelemetry-instrumentation-wai,
+                 hs-opentelemetry-propagator-datadog,
+                 hs-opentelemetry-sdk,
                  http-client,
                  http-types,
                  text,

diff --git a/examples/yesod-minimal/package.yaml b/examples/yesod-minimal/package.yaml
@@ -1,45 +1,37 @@
 name: yesod-minimal
 
-dependencies:
-# minimal example dependencies
-- base
-- bytestring
-- conduit
-- yesod-core
-- yesod-form
-- http-client
-- http-types
-- wai
-- warp
-- text
-- vault
-- unliftio
-# database
-- yesod-persistent
-- monad-logger
-- persistent >= 2.13.3
-- persistent-postgresql >= 2.13.4
-- persistent-qq
-- resource-pool
-# convenience
-- microlens
-# opentelemetry dependencies
-- hs-opentelemetry-sdk
-- hs-opentelemetry-exporter-handle
-- hs-opentelemetry-instrumentation-wai
-- hs-opentelemetry-instrumentation-yesod
-- hs-opentelemetry-instrumentation-http-client
-- hs-opentelemetry-instrumentation-persistent
-- hs-opentelemetry-instrumentation-postgresql-simple
-- hs-opentelemetry-propagator-w3c
-- hs-opentelemetry-exporter-otlp
-
 executables:
   yesod-minimal:
     main: Minimal
     source-dirs: src
     dependencies:
-    - yesod-minimal
-
-library:
-    source-dirs: src
+    # minimal example dependencies
+    - base
+    - bytestring
+    - conduit
+    - http-client
+    - http-types
+    - text
+    - unliftio
+    - vault
+    - wai
+    - warp
+    - yesod-core
+    # database
+    - monad-logger
+    - persistent >= 2.13.3
+    - persistent-postgresql >= 2.13.4
+    - persistent-qq
+    - resource-pool
+    - yesod-persistent
+    # convenience
+    - microlens
+    # opentelemetry dependencies
+    - hs-opentelemetry-exporter-otlp
+    - hs-opentelemetry-instrumentation-http-client
+    - hs-opentelemetry-instrumentation-persistent
+    - hs-opentelemetry-instrumentation-postgresql-simple
+    - hs-opentelemetry-instrumentation-wai
+    - hs-opentelemetry-instrumentation-yesod
+    - hs-opentelemetry-propagator-w3c
+    - hs-opentelemetry-sdk
diff --git a/examples/yesod-minimal/yesod-minimal.cabal b/examples/yesod-minimal/yesod-minimal.cabal
@@ -1,51 +1,13 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.5.
+-- This file has been generated from package.yaml by hpack version 0.35.2.
 --
 -- see: https://github.com/sol/hpack
 
 name:           yesod-minimal
 version:        0.0.0
 build-type:     Simple
 
-library
-  exposed-modules:
-      Minimal
-  other-modules:
-      Paths_yesod_minimal
-  hs-source-dirs:
-      src
-  build-depends:
-      base
-    , bytestring
-    , conduit
-    , hs-opentelemetry-exporter-handle
-    , hs-opentelemetry-exporter-otlp
-    , hs-opentelemetry-instrumentation-http-client
-    , hs-opentelemetry-instrumentation-persistent
-    , hs-opentelemetry-instrumentation-postgresql-simple
-    , hs-opentelemetry-instrumentation-wai
-    , hs-opentelemetry-instrumentation-yesod
-    , hs-opentelemetry-propagator-w3c
-    , hs-opentelemetry-sdk
-    , http-client
-    , http-types
-    , microlens
-    , monad-logger
-    , persistent >=2.13.3
-    , persistent-postgresql >=2.13.4
-    , persistent-qq
-    , resource-pool
-    , text
-    , unliftio
-    , vault
-    , wai
-    , warp
-    , yesod-core
-    , yesod-form
-    , yesod-persistent
-  default-language: Haskell2010
-
 executable yesod-minimal
   main-is: Minimal.hs
   other-modules:
@@ -57,7 +19,6 @@ executable yesod-minimal
       base
     , bytestring
     , conduit
-    , hs-opentelemetry-exporter-handle
     , hs-opentelemetry-exporter-otlp
     , hs-opentelemetry-instrumentation-http-client
     , hs-opentelemetry-instrumentation-persistent
@@ -80,7 +41,5 @@ executable yesod-minimal
     , wai
     , warp
     , yesod-core
-    , yesod-form
-    , yesod-minimal
     , yesod-persistent
   default-language: Haskell2010
diff --git a/exporters/handle/hs-opentelemetry-exporter-handle.cabal b/exporters/handle/hs-opentelemetry-exporter-handle.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.35.2.
 --
 -- see: https://github.com/sol/hpack
 
@@ -30,6 +30,7 @@ library
       Paths_hs_opentelemetry_exporter_handle
   hs-source-dirs:
       src
+  ghc-options: -Wunused-packages
   build-depends:
       base >=4.7 && <5
     , hs-opentelemetry-api >=0.0.3 && <0.2
@@ -43,10 +44,7 @@ test-suite hs-opentelemetry-exporter-handle-test
       Paths_hs_opentelemetry_exporter_handle
   hs-source-dirs:
       test
-  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+  ghc-options: -Wunused-packages -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base >=4.7 && <5
-    , hs-opentelemetry-api >=0.0.3 && <0.2
-    , hs-opentelemetry-exporter-handle
-    , text
   default-language: Haskell2010
diff --git a/exporters/handle/package.yaml b/exporters/handle/package.yaml
@@ -19,13 +19,16 @@ extra-source-files:
 # common to point users to the README.md file.
 description:         Please see the README on GitHub at <https://github.com/iand675/hs-opentelemetry/tree/main/exporters/handle#readme>
 
+ghc-options: -Wunused-packages
+
 dependencies:
 - base >= 4.7 && < 5
-- hs-opentelemetry-api >= 0.0.3 && < 0.2
-- text
 
 library:
   source-dirs: src
+  dependencies:
+  - hs-opentelemetry-api >= 0.0.3 && < 0.2
+  - text
 
 tests:
   hs-opentelemetry-exporter-handle-test:
@@ -35,5 +38,3 @@ tests:
     - -threaded
     - -rtsopts
     - -with-rtsopts=-N
-    dependencies:
-    - hs-opentelemetry-exporter-handle