From 7066a405c2515fc9bdb98bf7a854330114d2b9cc Mon Sep 17 00:00:00 2001 From: Kazuki Okamoto Date: Fri, 8 Mar 2024 17:22:05 +0900 Subject: [PATCH] clean up warnings --- api/hs-opentelemetry-api.cabal | 28 ++------ api/package.yaml | 40 +++++------ api/test/Spec.hs | 2 +- examples/aws-s3/aws-s3-example.cabal | 1 - examples/hspec/package.yaml | 2 + examples/http-server/http-server.cabal | 8 +-- examples/yesod-minimal/package.yaml | 68 ++++++++----------- examples/yesod-minimal/yesod-minimal.cabal | 43 +----------- .../hs-opentelemetry-exporter-handle.cabal | 8 +-- exporters/handle/package.yaml | 9 +-- .../hs-opentelemetry-exporter-in-memory.cabal | 12 ++-- exporters/in-memory/package.yaml | 11 +-- .../hs-opentelemetry-exporter-jaeger.cabal | 5 +- exporters/jaeger/package.yaml | 2 + .../otlp/hs-opentelemetry-exporter-otlp.cabal | 26 +------ exporters/otlp/package.yaml | 34 +++++----- ...hs-opentelemetry-exporter-prometheus.cabal | 5 +- exporters/prometheus/package.yaml | 2 + .../hs-opentelemetry-exporter-zipkin.cabal | 5 +- exporters/zipkin/package.yaml | 2 + ...telemetry-instrumentation-cloudflare.cabal | 14 +--- instrumentation/cloudflare/package.yaml | 18 ++--- ...pentelemetry-instrumentation-conduit.cabal | 10 +-- instrumentation/conduit/package.yaml | 12 ++-- ...-opentelemetry-instrumentation-hspec.cabal | 18 +---- instrumentation/hspec/package.yaml | 17 ++--- ...elemetry-instrumentation-http-client.cabal | 14 +--- instrumentation/http-client/package.yaml | 19 +++--- ...telemetry-instrumentation-persistent.cabal | 14 +--- instrumentation/persistent/package.yaml | 21 +++--- ...ry-instrumentation-postgresql-simple.cabal | 16 +---- .../postgresql-simple/package.yaml | 22 +++--- ...hs-opentelemetry-instrumentation-wai.cabal | 16 +---- instrumentation/wai/package.yaml | 20 +++--- ...-opentelemetry-instrumentation-yesod.cabal | 17 +---- instrumentation/yesod/package.yaml | 25 +++---- otlp/hs-opentelemetry-otlp.cabal | 2 +- otlp/package.yaml | 9 ++- .../b3/hs-opentelemetry-propagator-b3.cabal | 18 ++--- propagators/b3/package.yaml | 17 +++-- .../hs-opentelemetry-propagator-datadog.cabal | 1 - propagators/datadog/old-src/Raw.hs | 8 +-- .../hs-opentelemetry-propagator-jaeger.cabal | 14 +--- propagators/jaeger/package.yaml | 7 +- .../w3c/hs-opentelemetry-propagator-w3c.cabal | 15 ++-- propagators/w3c/package.yaml | 14 ++-- sdk/hs-opentelemetry-sdk.cabal | 28 ++------ sdk/package.yaml | 44 ++++++------ .../hs-opentelemetry-utils-exceptions.cabal | 9 +-- utils/exceptions/package.yaml | 11 +-- vendors/honeycomb/package.yaml | 2 + 51 files changed, 287 insertions(+), 498 deletions(-) diff --git a/api/hs-opentelemetry-api.cabal b/api/hs-opentelemetry-api.cabal index 7ebd3bd7..76b20ecd 100644 --- 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,9 +78,7 @@ library , bytestring , charset , clock - , containers , data-default-class - , ghc-prim , hashable , http-types , memory @@ -88,7 +86,6 @@ library , 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 index e174e458..acee53dc 100644 --- a/api/package.yaml +++ b/api/package.yaml @@ -21,30 +21,15 @@ 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 @@ -52,6 +37,21 @@ library: 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 index 7c3253a5..32a41f98 100644 --- 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 index 890e7de6..f92ced4a 100644 --- 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 index 8c6915cc..0f673c43 100644 --- 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 index bfcdd414..019c97c5 100644 --- 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 index ab995e79..ab08b22f 100644 --- 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 index 813596a9..241860b5 100644 --- a/examples/yesod-minimal/yesod-minimal.cabal +++ b/examples/yesod-minimal/yesod-minimal.cabal @@ -1,6 +1,6 @@ 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 @@ -8,44 +8,6 @@ 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 index ca3cb0e1..c0136095 100644 --- 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 index 08319bd7..b4527160 100644 --- 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 +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 diff --git a/exporters/in-memory/hs-opentelemetry-exporter-in-memory.cabal b/exporters/in-memory/hs-opentelemetry-exporter-in-memory.cabal index 9d77cfa9..b41264b7 100644 --- a/exporters/in-memory/hs-opentelemetry-exporter-in-memory.cabal +++ b/exporters/in-memory/hs-opentelemetry-exporter-in-memory.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,7 +30,7 @@ library Paths_hs_opentelemetry_exporter_in_memory hs-source-dirs: src - ghc-options: -Wall + ghc-options: -Wunused-packages -Wall build-depends: async , base >=4.7 && <5 @@ -45,11 +45,7 @@ test-suite hs-opentelemetry-exporter-in-memory-test Paths_hs_opentelemetry_exporter_in_memory hs-source-dirs: test - ghc-options: -threaded -rtsopts -with-rtsopts=-N + ghc-options: -Wunused-packages -threaded -rtsopts -with-rtsopts=-N build-depends: - async - , base >=4.7 && <5 - , hs-opentelemetry-api >=0.0.3 && <0.2 - , hs-opentelemetry-exporter-in-memory - , unagi-chan + base >=4.7 && <5 default-language: Haskell2010 diff --git a/exporters/in-memory/package.yaml b/exporters/in-memory/package.yaml index e417eb67..42ab6712 100644 --- a/exporters/in-memory/package.yaml +++ b/exporters/in-memory/package.yaml @@ -19,15 +19,18 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- hs-opentelemetry-api >= 0.0.3 && < 0.2 -- async -- unagi-chan library: ghc-options: -Wall source-dirs: src + dependencies: + - async + - hs-opentelemetry-api >= 0.0.3 && < 0.2 + - unagi-chan tests: hs-opentelemetry-exporter-in-memory-test: @@ -37,5 +40,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-exporter-in-memory diff --git a/exporters/jaeger/hs-opentelemetry-exporter-jaeger.cabal b/exporters/jaeger/hs-opentelemetry-exporter-jaeger.cabal index 92134791..1474f846 100644 --- a/exporters/jaeger/hs-opentelemetry-exporter-jaeger.cabal +++ b/exporters/jaeger/hs-opentelemetry-exporter-jaeger.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.7. +-- 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_jaeger hs-source-dirs: src + ghc-options: -Wunused-packages build-depends: base >=4.7 && <5 default-language: Haskell2010 @@ -41,7 +42,7 @@ test-suite hs-opentelemetry-exporter-jaeger-test Paths_hs_opentelemetry_exporter_jaeger 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-exporter-jaeger diff --git a/exporters/jaeger/package.yaml b/exporters/jaeger/package.yaml index 3342e80b..4e41ccea 100644 --- a/exporters/jaeger/package.yaml +++ b/exporters/jaeger/package.yaml @@ -19,6 +19,8 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 diff --git a/exporters/otlp/hs-opentelemetry-exporter-otlp.cabal b/exporters/otlp/hs-opentelemetry-exporter-otlp.cabal index 187e6d8b..395779b1 100644 --- a/exporters/otlp/hs-opentelemetry-exporter-otlp.cabal +++ b/exporters/otlp/hs-opentelemetry-exporter-otlp.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 @@ -32,24 +32,21 @@ library Paths_hs_opentelemetry_exporter_otlp hs-source-dirs: src - ghc-options: -Wall + ghc-options: -Wunused-packages -Wall build-depends: base >=4.7 && <5 , bytestring , case-insensitive - , clock , hs-opentelemetry-api >=0.0.3 && <0.2 , hs-opentelemetry-otlp ==0.0.1.* , http-client , http-conduit , http-types , microlens - , mtl , proto-lens >=0.7.1.0 , text , unordered-containers , vector - , vector-builder , zlib default-language: Haskell2010 @@ -60,24 +57,7 @@ test-suite hs-opentelemetry-exporter-otlp-test Paths_hs_opentelemetry_exporter_otlp 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 - , bytestring - , case-insensitive - , clock - , hs-opentelemetry-api >=0.0.3 && <0.2 - , hs-opentelemetry-exporter-otlp - , hs-opentelemetry-otlp ==0.0.1.* - , http-client - , http-conduit - , http-types - , microlens - , mtl - , proto-lens >=0.7.1.0 - , text - , unordered-containers - , vector - , vector-builder - , zlib default-language: Haskell2010 diff --git a/exporters/otlp/package.yaml b/exporters/otlp/package.yaml index 7924a9a3..fbad6bff 100644 --- a/exporters/otlp/package.yaml +++ b/exporters/otlp/package.yaml @@ -19,28 +19,28 @@ category: OpenTelemetry, Telemetry, Monitoring, Observability, Metric # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- hs-opentelemetry-api >= 0.0.3 && < 0.2 -- hs-opentelemetry-otlp == 0.0.1.* -- text -- bytestring -- case-insensitive -- http-types -- http-client -- http-conduit -- mtl -- vector -- vector-builder -- proto-lens >= 0.7.1.0 -- microlens -- clock -- unordered-containers -- zlib library: ghc-options: -Wall source-dirs: src + dependencies: + - bytestring + - case-insensitive + - hs-opentelemetry-api >= 0.0.3 && < 0.2 + - hs-opentelemetry-otlp == 0.0.1.* + - http-client + - http-conduit + - http-types + - microlens + - proto-lens >= 0.7.1.0 + - text + - unordered-containers + - vector + - zlib tests: hs-opentelemetry-exporter-otlp-test: @@ -50,5 +50,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-exporter-otlp diff --git a/exporters/prometheus/hs-opentelemetry-exporter-prometheus.cabal b/exporters/prometheus/hs-opentelemetry-exporter-prometheus.cabal index 91f41c54..2071e7a0 100644 --- a/exporters/prometheus/hs-opentelemetry-exporter-prometheus.cabal +++ b/exporters/prometheus/hs-opentelemetry-exporter-prometheus.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.7. +-- 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_prometheus hs-source-dirs: src + ghc-options: -Wunused-packages build-depends: base >=4.7 && <5 , hs-opentelemetry-api ==0.0.1.* @@ -42,7 +43,7 @@ test-suite hs-opentelemetry-exporter-prometheus-test Paths_hs_opentelemetry_exporter_prometheus 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.1.* diff --git a/exporters/prometheus/package.yaml b/exporters/prometheus/package.yaml index a81bea93..6c3eb386 100644 --- a/exporters/prometheus/package.yaml +++ b/exporters/prometheus/package.yaml @@ -19,6 +19,8 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 - hs-opentelemetry-api == 0.0.1.* diff --git a/exporters/zipkin/hs-opentelemetry-exporter-zipkin.cabal b/exporters/zipkin/hs-opentelemetry-exporter-zipkin.cabal index 3a320ff3..e450bcae 100644 --- a/exporters/zipkin/hs-opentelemetry-exporter-zipkin.cabal +++ b/exporters/zipkin/hs-opentelemetry-exporter-zipkin.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.7. +-- 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_zipkin hs-source-dirs: src + ghc-options: -Wunused-packages build-depends: base >=4.7 && <5 default-language: Haskell2010 @@ -41,7 +42,7 @@ test-suite hs-opentelemetry-exporter-zipkin-test Paths_hs_opentelemetry_exporter_zipkin 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-exporter-zipkin diff --git a/exporters/zipkin/package.yaml b/exporters/zipkin/package.yaml index eb7b053e..22d2b05c 100644 --- a/exporters/zipkin/package.yaml +++ b/exporters/zipkin/package.yaml @@ -19,6 +19,8 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 diff --git a/instrumentation/cloudflare/hs-opentelemetry-instrumentation-cloudflare.cabal b/instrumentation/cloudflare/hs-opentelemetry-instrumentation-cloudflare.cabal index 7e37506a..3ac51d10 100644 --- a/instrumentation/cloudflare/hs-opentelemetry-instrumentation-cloudflare.cabal +++ b/instrumentation/cloudflare/hs-opentelemetry-instrumentation-cloudflare.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,12 +30,12 @@ library Paths_hs_opentelemetry_instrumentation_cloudflare hs-source-dirs: src + ghc-options: -Wunused-packages build-depends: base >=4.7 && <5 , case-insensitive , hs-opentelemetry-api ==0.1.* , hs-opentelemetry-instrumentation-wai - , http-types , text , unordered-containers , wai @@ -48,15 +48,7 @@ test-suite cloudflare-test Paths_hs_opentelemetry_instrumentation_cloudflare 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 - , case-insensitive - , hs-opentelemetry-api ==0.1.* - , hs-opentelemetry-instrumentation-conduit - , hs-opentelemetry-instrumentation-wai - , http-types - , text - , unordered-containers - , wai default-language: Haskell2010 diff --git a/instrumentation/cloudflare/package.yaml b/instrumentation/cloudflare/package.yaml index 8dc823f3..cd9b898e 100644 --- a/instrumentation/cloudflare/package.yaml +++ b/instrumentation/cloudflare/package.yaml @@ -18,18 +18,20 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- http-types -- wai -- hs-opentelemetry-api == 0.1.* -- hs-opentelemetry-instrumentation-wai -- case-insensitive -- text -- unordered-containers library: source-dirs: src + dependencies: + - wai + - hs-opentelemetry-api == 0.1.* + - hs-opentelemetry-instrumentation-wai + - case-insensitive + - text + - unordered-containers tests: cloudflare-test: @@ -39,5 +41,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-instrumentation-conduit diff --git a/instrumentation/conduit/hs-opentelemetry-instrumentation-conduit.cabal b/instrumentation/conduit/hs-opentelemetry-instrumentation-conduit.cabal index 6d45cfc7..3ba4d1b1 100644 --- a/instrumentation/conduit/hs-opentelemetry-instrumentation-conduit.cabal +++ b/instrumentation/conduit/hs-opentelemetry-instrumentation-conduit.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,7 +30,7 @@ library Paths_hs_opentelemetry_instrumentation_conduit hs-source-dirs: src - ghc-options: -Wall + ghc-options: -Wunused-packages -Wall build-depends: base >=4.7 && <5 , conduit @@ -45,11 +45,7 @@ test-suite hs-opentelemetry-instrumentation-conduit-test Paths_hs_opentelemetry_instrumentation_conduit 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 - , conduit - , hs-opentelemetry-api ==0.1.* - , hs-opentelemetry-instrumentation-conduit - , text default-language: Haskell2010 diff --git a/instrumentation/conduit/package.yaml b/instrumentation/conduit/package.yaml index f845293a..b9930541 100644 --- a/instrumentation/conduit/package.yaml +++ b/instrumentation/conduit/package.yaml @@ -18,15 +18,19 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- conduit -- text -- hs-opentelemetry-api == 0.1.* library: ghc-options: -Wall source-dirs: src + dependencies: + - base >= 4.7 && < 5 + - conduit + - text + - hs-opentelemetry-api == 0.1.* tests: hs-opentelemetry-instrumentation-conduit-test: @@ -36,5 +40,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-instrumentation-conduit diff --git a/instrumentation/hspec/hs-opentelemetry-instrumentation-hspec.cabal b/instrumentation/hspec/hs-opentelemetry-instrumentation-hspec.cabal index f48d1410..fd20df3c 100644 --- a/instrumentation/hspec/hs-opentelemetry-instrumentation-hspec.cabal +++ b/instrumentation/hspec/hs-opentelemetry-instrumentation-hspec.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.36.0. -- -- see: https://github.com/sol/hpack @@ -30,16 +30,13 @@ library Paths_hs_opentelemetry_instrumentation_hspec hs-source-dirs: src + ghc-options: -Wunused-packages build-depends: base >=4.7 && <5 , hs-opentelemetry-api >=0.0.3 && <0.2 - , hspec >=2.9.4 , hspec-core >=2.9.4 , mtl - , resourcet , text - , unliftio - , vault default-language: Haskell2010 test-suite hs-opentelemetry-hspec-test @@ -49,16 +46,7 @@ test-suite hs-opentelemetry-hspec-test Paths_hs_opentelemetry_instrumentation_hspec 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-instrumentation-hspec - , hspec >=2.9.4 - , hspec-core >=2.9.4 - , mtl - , resourcet - , text - , unliftio - , vault default-language: Haskell2010 diff --git a/instrumentation/hspec/package.yaml b/instrumentation/hspec/package.yaml index 3cdd1684..3175819d 100644 --- a/instrumentation/hspec/package.yaml +++ b/instrumentation/hspec/package.yaml @@ -18,20 +18,19 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- hs-opentelemetry-api >= 0.0.3 && < 0.2 -- hspec >= 2.9.4 -- hspec-core >= 2.9.4 -- text -- vault -- resourcet -- unliftio # TODO, unliftio-core -- mtl library: # ghc-options: -Wall source-dirs: src + dependencies: + - hs-opentelemetry-api >= 0.0.3 && < 0.2 + - hspec-core >= 2.9.4 + - text + - mtl tests: hs-opentelemetry-hspec-test: @@ -41,5 +40,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-instrumentation-hspec diff --git a/instrumentation/http-client/hs-opentelemetry-instrumentation-http-client.cabal b/instrumentation/http-client/hs-opentelemetry-instrumentation-http-client.cabal index d42c2a73..9eb248b3 100644 --- a/instrumentation/http-client/hs-opentelemetry-instrumentation-http-client.cabal +++ b/instrumentation/http-client/hs-opentelemetry-instrumentation-http-client.cabal @@ -1,6 +1,6 @@ cabal-version: 2.0 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.35.2. -- -- see: https://github.com/sol/hpack @@ -32,7 +32,7 @@ library Paths_hs_opentelemetry_instrumentation_http_client hs-source-dirs: src - ghc-options: -Wall + ghc-options: -Wunused-packages -Wall build-depends: base >=4.7 && <5 , case-insensitive @@ -53,15 +53,7 @@ test-suite hs-opentelemetry-instrumentation-http-client-test Paths_hs_opentelemetry_instrumentation_http_client 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 - , case-insensitive - , hs-opentelemetry-api ==0.1.* - , hs-opentelemetry-instrumentation-http-client - , hs-opentelemetry-semantic-conventions - , http-client - , http-types - , text - , thread-local-storage default-language: Haskell2010 diff --git a/instrumentation/http-client/package.yaml b/instrumentation/http-client/package.yaml index 5b754063..c86e62da 100644 --- a/instrumentation/http-client/package.yaml +++ b/instrumentation/http-client/package.yaml @@ -18,20 +18,23 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- case-insensitive -- hs-opentelemetry-api == 0.1.* -- hs-opentelemetry-semantic-conventions -- http-client -- http-types -- text -- thread-local-storage library: ghc-options: -Wall source-dirs: src generated-other-modules: Paths_hs_opentelemetry_instrumentation_http_client + dependencies: + - case-insensitive + - hs-opentelemetry-api == 0.1.* + - hs-opentelemetry-semantic-conventions + - http-client + - http-types + - text + - thread-local-storage tests: hs-opentelemetry-instrumentation-http-client-test: @@ -41,5 +44,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-instrumentation-http-client diff --git a/instrumentation/persistent/hs-opentelemetry-instrumentation-persistent.cabal b/instrumentation/persistent/hs-opentelemetry-instrumentation-persistent.cabal index aba099d2..0f2dc966 100644 --- a/instrumentation/persistent/hs-opentelemetry-instrumentation-persistent.cabal +++ b/instrumentation/persistent/hs-opentelemetry-instrumentation-persistent.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_instrumentation_persistent hs-source-dirs: src + ghc-options: -Wunused-packages build-depends: base >=4.7 && <5 , hs-opentelemetry-api ==0.1.* @@ -49,16 +50,7 @@ test-suite hs-opentelemetry-persistent-test Paths_hs_opentelemetry_instrumentation_persistent 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.1.* - , hs-opentelemetry-instrumentation-persistent - , mtl - , persistent >=2.13.3 - , resourcet - , text - , unliftio - , unordered-containers - , vault default-language: Haskell2010 diff --git a/instrumentation/persistent/package.yaml b/instrumentation/persistent/package.yaml index 5d37c4f7..520c8ded 100644 --- a/instrumentation/persistent/package.yaml +++ b/instrumentation/persistent/package.yaml @@ -18,20 +18,23 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- hs-opentelemetry-api == 0.1.* -- persistent >= 2.13.3 -- text -- vault -- resourcet -- unliftio # TODO, unliftio-core -- mtl -- unordered-containers library: # ghc-options: -Wall source-dirs: src + dependencies: + - hs-opentelemetry-api == 0.1.* + - mtl + - persistent >= 2.13.3 + - resourcet + - text + - unliftio # TODO, unliftio-core + - unordered-containers + - vault tests: hs-opentelemetry-persistent-test: @@ -41,5 +44,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-instrumentation-persistent diff --git a/instrumentation/postgresql-simple/hs-opentelemetry-instrumentation-postgresql-simple.cabal b/instrumentation/postgresql-simple/hs-opentelemetry-instrumentation-postgresql-simple.cabal index dbaf34b0..ddbc8219 100644 --- a/instrumentation/postgresql-simple/hs-opentelemetry-instrumentation-postgresql-simple.cabal +++ b/instrumentation/postgresql-simple/hs-opentelemetry-instrumentation-postgresql-simple.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.36.0. -- -- see: https://github.com/sol/hpack @@ -30,12 +30,12 @@ library Paths_hs_opentelemetry_instrumentation_postgresql_simple hs-source-dirs: src + ghc-options: -Wunused-packages build-depends: base >=4.7 && <5 , bytestring , hs-opentelemetry-api ==0.1.* , iproute - , network , postgresql-libpq , postgresql-simple , text @@ -50,17 +50,7 @@ test-suite hs-opentelemetry-instrumentation-postgresql-simple-test Paths_hs_opentelemetry_instrumentation_postgresql_simple 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 - , bytestring - , hs-opentelemetry-api ==0.1.* - , hs-opentelemetry-instrumentation-postgresql-simple - , iproute - , network - , postgresql-libpq - , postgresql-simple - , text - , unliftio - , unordered-containers default-language: Haskell2010 diff --git a/instrumentation/postgresql-simple/package.yaml b/instrumentation/postgresql-simple/package.yaml index 1b8b57da..cb80e080 100644 --- a/instrumentation/postgresql-simple/package.yaml +++ b/instrumentation/postgresql-simple/package.yaml @@ -18,20 +18,22 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- hs-opentelemetry-api == 0.1.* -- network -- iproute -- postgresql-simple -- postgresql-libpq -- text -- bytestring -- unliftio # todo, unliftio-core -- unordered-containers library: source-dirs: src + dependencies: + - bytestring + - hs-opentelemetry-api == 0.1.* + - iproute + - postgresql-libpq + - postgresql-simple + - text + - unliftio # todo, unliftio-core + - unordered-containers tests: hs-opentelemetry-instrumentation-postgresql-simple-test: @@ -41,5 +43,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-instrumentation-postgresql-simple diff --git a/instrumentation/wai/hs-opentelemetry-instrumentation-wai.cabal b/instrumentation/wai/hs-opentelemetry-instrumentation-wai.cabal index 67bc42e9..e34fc44c 100644 --- a/instrumentation/wai/hs-opentelemetry-instrumentation-wai.cabal +++ b/instrumentation/wai/hs-opentelemetry-instrumentation-wai.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 @@ -32,10 +32,9 @@ library Paths_hs_opentelemetry_instrumentation_wai hs-source-dirs: src - ghc-options: -Wall + ghc-options: -Wunused-packages -Wall build-depends: base >=4.7 && <5 - , bytestring , hs-opentelemetry-api ==0.1.* , http-types , iproute @@ -52,16 +51,7 @@ test-suite hs-opentelemetry-instrumentation-wai-test Paths_hs_opentelemetry_instrumentation_wai 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 - , bytestring - , hs-opentelemetry-api ==0.1.* - , hs-opentelemetry-instrumentation-wai - , http-types - , iproute - , network - , text - , vault - , wai default-language: Haskell2010 diff --git a/instrumentation/wai/package.yaml b/instrumentation/wai/package.yaml index 2f8aaf23..ecfc1353 100644 --- a/instrumentation/wai/package.yaml +++ b/instrumentation/wai/package.yaml @@ -18,20 +18,22 @@ category: OpenTelemetry, Web # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- http-types -- wai -- hs-opentelemetry-api == 0.1.* -- vault -- text -- bytestring -- network -- iproute library: ghc-options: -Wall source-dirs: src + dependencies: + - hs-opentelemetry-api == 0.1.* + - http-types + - iproute + - network + - text + - vault + - wai tests: hs-opentelemetry-instrumentation-wai-test: @@ -41,5 +43,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-instrumentation-wai diff --git a/instrumentation/yesod/hs-opentelemetry-instrumentation-yesod.cabal b/instrumentation/yesod/hs-opentelemetry-instrumentation-yesod.cabal index 63508528..4c3504b0 100644 --- a/instrumentation/yesod/hs-opentelemetry-instrumentation-yesod.cabal +++ b/instrumentation/yesod/hs-opentelemetry-instrumentation-yesod.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.7. +-- This file has been generated from package.yaml by hpack version 0.35.2. -- -- see: https://github.com/sol/hpack @@ -32,7 +32,7 @@ library Paths_hs_opentelemetry_instrumentation_yesod hs-source-dirs: src - ghc-options: -Wall + ghc-options: -Wunused-packages -Wall build-depends: base >=4.7 && <5 , containers @@ -54,18 +54,7 @@ test-suite hs-opentelemetry-instrumentation-yesod-test Paths_hs_opentelemetry_instrumentation_yesod 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 - , containers - , hs-opentelemetry-api ==0.1.* - , hs-opentelemetry-instrumentation-yesod - , microlens - , template-haskell - , text - , unliftio - , unordered-containers - , vault - , wai - , yesod-core default-language: Haskell2010 diff --git a/instrumentation/yesod/package.yaml b/instrumentation/yesod/package.yaml index 581e57e2..40d7f34f 100644 --- a/instrumentation/yesod/package.yaml +++ b/instrumentation/yesod/package.yaml @@ -18,22 +18,25 @@ category: OpenTelemetry, Web # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- containers -- microlens -- yesod-core -- hs-opentelemetry-api == 0.1.* -- unliftio -- text -- template-haskell -- vault -- wai -- unordered-containers library: ghc-options: -Wall source-dirs: src + dependencies: + - containers + - microlens + - yesod-core + - hs-opentelemetry-api == 0.1.* + - unliftio + - text + - template-haskell + - vault + - wai + - unordered-containers tests: hs-opentelemetry-instrumentation-yesod-test: @@ -43,5 +46,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-instrumentation-yesod diff --git a/otlp/hs-opentelemetry-otlp.cabal b/otlp/hs-opentelemetry-otlp.cabal index 6712d4e4..78e4d864 100644 --- a/otlp/hs-opentelemetry-otlp.cabal +++ b/otlp/hs-opentelemetry-otlp.cabal @@ -1,6 +1,6 @@ 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 diff --git a/otlp/package.yaml b/otlp/package.yaml index 205aabfb..690918fe 100644 --- a/otlp/package.yaml +++ b/otlp/package.yaml @@ -17,11 +17,10 @@ category: OpenTelemetry # common to point users to the README.md file. description: Please see the README on GitHub at -dependencies: -- base >= 4.7 && < 5 -- proto-lens -- proto-lens-runtime - library: source-dirs: src + dependencies: + - base >= 4.7 && < 5 + - proto-lens + - proto-lens-runtime diff --git a/propagators/b3/hs-opentelemetry-propagator-b3.cabal b/propagators/b3/hs-opentelemetry-propagator-b3.cabal index 6462777e..bad83d83 100644 --- a/propagators/b3/hs-opentelemetry-propagator-b3.cabal +++ b/propagators/b3/hs-opentelemetry-propagator-b3.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.36.0. -- -- see: https://github.com/sol/hpack @@ -33,15 +33,13 @@ library Paths_hs_opentelemetry_propagator_b3 hs-source-dirs: src - ghc-options: -Wall + ghc-options: -Wunused-packages -Wall build-depends: attoparsec , base >=4.7 && <5 , bytestring , hs-opentelemetry-api >=0.0.3 && <0.2 , http-types - , memory - , primitive , text default-language: Haskell2010 @@ -52,15 +50,7 @@ test-suite hs-opentelemetry-propagator-b3-test Paths_hs_opentelemetry_propagator_b3 hs-source-dirs: test - ghc-options: -threaded -rtsopts -with-rtsopts=-N + ghc-options: -Wunused-packages -threaded -rtsopts -with-rtsopts=-N build-depends: - attoparsec - , base >=4.7 && <5 - , bytestring - , hs-opentelemetry-api >=0.0.3 && <0.2 - , hs-opentelemetry-propagator-b3 - , http-types - , memory - , primitive - , text + base >=4.7 && <5 default-language: Haskell2010 diff --git a/propagators/b3/package.yaml b/propagators/b3/package.yaml index 4af5eab7..89ded2a5 100644 --- a/propagators/b3/package.yaml +++ b/propagators/b3/package.yaml @@ -19,19 +19,20 @@ category: OpenTelemetry, Tracing, Web # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: -- attoparsec - base >=4.7 && <5 -- bytestring -- hs-opentelemetry-api >= 0.0.3 && < 0.2 -- http-types -- memory -- primitive -- text library: ghc-options: -Wall source-dirs: src + dependencies: + - attoparsec + - bytestring + - hs-opentelemetry-api >= 0.0.3 && < 0.2 + - http-types + - text tests: hs-opentelemetry-propagator-b3-test: @@ -41,5 +42,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-propagator-b3 diff --git a/propagators/datadog/hs-opentelemetry-propagator-datadog.cabal b/propagators/datadog/hs-opentelemetry-propagator-datadog.cabal index e427744d..c3bf1f3f 100644 --- a/propagators/datadog/hs-opentelemetry-propagator-datadog.cabal +++ b/propagators/datadog/hs-opentelemetry-propagator-datadog.cabal @@ -64,7 +64,6 @@ test-suite spec Raw String build-depends: hs-opentelemetry-propagator-datadog, - hs-opentelemetry-api, bytestring, hspec, pretty-hex, diff --git a/propagators/datadog/old-src/Raw.hs b/propagators/datadog/old-src/Raw.hs index fb9f8a22..37fbacd1 100644 --- a/propagators/datadog/old-src/Raw.hs +++ b/propagators/datadog/old-src/Raw.hs @@ -139,11 +139,11 @@ showWord64BS v = writeWord64Ptr ptr = loop (19 :: Int) v 0 False where - loop 0 v offset _ = do - writeOffPtr ptr offset (word8ToAsciiWord8 $ fromIntegral v) + loop 0 v' offset _ = do + writeOffPtr ptr offset (word8ToAsciiWord8 $ fromIntegral v') pure $ offset + 1 - loop n v offset upper = do - let (p, q) = v `divMod` (10 ^ n) + loop n v' offset upper = do + let (p, q) = v' `divMod` (10 ^ n) if p == 0 && not upper then loop (n - 1) q offset upper else do diff --git a/propagators/jaeger/hs-opentelemetry-propagator-jaeger.cabal b/propagators/jaeger/hs-opentelemetry-propagator-jaeger.cabal index d9329de0..b984a1a8 100644 --- a/propagators/jaeger/hs-opentelemetry-propagator-jaeger.cabal +++ b/propagators/jaeger/hs-opentelemetry-propagator-jaeger.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.7. +-- This file has been generated from package.yaml by hpack version 0.35.2. -- -- see: https://github.com/sol/hpack @@ -23,15 +23,6 @@ source-repository head type: git location: https://github.com/iand675/hs-opentelemetry -library - other-modules: - Paths_hs_opentelemetry_propagator_jaeger - hs-source-dirs: - src - build-depends: - base >=4.7 && <5 - default-language: Haskell2010 - test-suite hs-opentelemetry-propagator-jaeger-test type: exitcode-stdio-1.0 main-is: Spec.hs @@ -39,8 +30,7 @@ test-suite hs-opentelemetry-propagator-jaeger-test Paths_hs_opentelemetry_propagator_jaeger 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-propagator-jaeger default-language: Haskell2010 diff --git a/propagators/jaeger/package.yaml b/propagators/jaeger/package.yaml index 5fbb734f..68d0ef87 100644 --- a/propagators/jaeger/package.yaml +++ b/propagators/jaeger/package.yaml @@ -19,12 +19,11 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -library: - source-dirs: src - tests: hs-opentelemetry-propagator-jaeger-test: main: Spec.hs @@ -33,5 +32,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-propagator-jaeger diff --git a/propagators/w3c/hs-opentelemetry-propagator-w3c.cabal b/propagators/w3c/hs-opentelemetry-propagator-w3c.cabal index 67cba38f..418ce7ea 100644 --- a/propagators/w3c/hs-opentelemetry-propagator-w3c.cabal +++ b/propagators/w3c/hs-opentelemetry-propagator-w3c.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 @@ -33,14 +33,13 @@ library Paths_hs_opentelemetry_propagator_w3c hs-source-dirs: src - ghc-options: -Wall + ghc-options: -Wunused-packages -Wall build-depends: attoparsec , base >=4.7 && <5 , bytestring , hs-opentelemetry-api >=0.0.3 && <0.2 , http-types - , text default-language: Haskell2010 test-suite hs-opentelemetry-propagator-w3c-test @@ -50,13 +49,7 @@ test-suite hs-opentelemetry-propagator-w3c-test Paths_hs_opentelemetry_propagator_w3c hs-source-dirs: test - ghc-options: -threaded -rtsopts -with-rtsopts=-N + ghc-options: -Wunused-packages -threaded -rtsopts -with-rtsopts=-N build-depends: - attoparsec - , base >=4.7 && <5 - , bytestring - , hs-opentelemetry-api >=0.0.3 && <0.2 - , hs-opentelemetry-propagator-w3c - , http-types - , text + base >=4.7 && <5 default-language: Haskell2010 diff --git a/propagators/w3c/package.yaml b/propagators/w3c/package.yaml index 7cf24bed..b79aef00 100644 --- a/propagators/w3c/package.yaml +++ b/propagators/w3c/package.yaml @@ -18,17 +18,19 @@ category: OpenTelemetry, Tracing, Web # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- bytestring -- text -- hs-opentelemetry-api >= 0.0.3 && < 0.2 -- http-types -- attoparsec library: ghc-options: -Wall source-dirs: src + dependencies: + - attoparsec + - bytestring + - hs-opentelemetry-api >= 0.0.3 && < 0.2 + - http-types tests: hs-opentelemetry-propagator-w3c-test: @@ -38,5 +40,3 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - hs-opentelemetry-propagator-w3c diff --git a/sdk/hs-opentelemetry-sdk.cabal b/sdk/hs-opentelemetry-sdk.cabal index d6cf7282..5c2cd515 100644 --- a/sdk/hs-opentelemetry-sdk.cabal +++ b/sdk/hs-opentelemetry-sdk.cabal @@ -1,6 +1,6 @@ cabal-version: 1.22 --- 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 @@ -71,7 +71,7 @@ library , OpenTelemetry.Util hs-source-dirs: src - ghc-options: -Wall + ghc-options: -Wunused-packages -Wall build-depends: async , base >=4.7 && <5 @@ -85,10 +85,8 @@ library , mwc-random , network-bsd , random - , random-bytestring , stm , text - , transformers , unagi-chan , unix , unordered-containers @@ -107,30 +105,12 @@ test-suite hs-opentelemetry-sdk-test Paths_hs_opentelemetry_sdk hs-source-dirs: test - ghc-options: -threaded -rtsopts -with-rtsopts=-N + ghc-options: -Wunused-packages -threaded -rtsopts -with-rtsopts=-N build-depends: - async - , base >=4.7 && <5 - , bytestring + base >=4.7 && <5 , clock - , data-default-class , hs-opentelemetry-api - , hs-opentelemetry-exporter-otlp ==0.0.1.* - , hs-opentelemetry-propagator-b3 ==0.0.1.* - , hs-opentelemetry-propagator-w3c ==0.0.1.* , hs-opentelemetry-sdk , hspec - , http-types - , mwc-random - , network-bsd - , random - , random-bytestring - , stm , text - , transformers - , unagi-chan - , unix - , unordered-containers - , vector - , vector-builder default-language: Haskell2010 diff --git a/sdk/package.yaml b/sdk/package.yaml index 16804d94..1595b418 100644 --- a/sdk/package.yaml +++ b/sdk/package.yaml @@ -19,31 +19,12 @@ category: OpenTelemetry, Telemetry, Monitoring, Observability, Metric # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- bytestring -- text -# These are "distribution" packages - hs-opentelemetry-api >= 0.0.3 && < 0.2 -- hs-opentelemetry-propagator-w3c == 0.0.1.* -- hs-opentelemetry-exporter-otlp == 0.0.1.* -- hs-opentelemetry-propagator-b3 ==0.0.1.* - -- async -- vector -- stm -- unagi-chan -- unordered-containers -- vector-builder -- http-types -- network-bsd -- unix -- transformers -# todo get rid of this when enough of the ecosystem has upgraded -- random -- mwc-random -- random-bytestring -- data-default-class +- text library: ghc-options: -Wall @@ -72,15 +53,30 @@ library: - OpenTelemetry.Resource.Service - OpenTelemetry.Resource.Telemetry - OpenTelemetry.Resource.Webengine - # - OpenTelemetry.Trace - OpenTelemetry.Trace.Id - # - OpenTelemetry.Trace.IdGenerator - OpenTelemetry.Trace.Monad - OpenTelemetry.Trace.Sampler - OpenTelemetry.Trace.TraceState - OpenTelemetry.Util other-modules: - Paths_hs_opentelemetry_sdk + dependencies: + - async + - bytestring + - data-default-class + - hs-opentelemetry-exporter-otlp == 0.0.1.* + - hs-opentelemetry-propagator-b3 ==0.0.1.* + - hs-opentelemetry-propagator-w3c == 0.0.1.* + - http-types + - mwc-random + - network-bsd + - random + - stm + - unagi-chan + - unix + - unordered-containers + - vector + - vector-builder tests: hs-opentelemetry-sdk-test: diff --git a/utils/exceptions/hs-opentelemetry-utils-exceptions.cabal b/utils/exceptions/hs-opentelemetry-utils-exceptions.cabal index 1c895fd2..0c70bffa 100644 --- a/utils/exceptions/hs-opentelemetry-utils-exceptions.cabal +++ b/utils/exceptions/hs-opentelemetry-utils-exceptions.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_utils_exceptions hs-source-dirs: src + ghc-options: -Wunused-packages build-depends: base >=4.7 && <5 , exceptions @@ -45,11 +46,7 @@ test-suite exceptions-test Paths_hs_opentelemetry_utils_exceptions 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 - , exceptions - , hs-opentelemetry-api ==0.1.* - , hs-opentelemetry-sdk ==0.0.3.* - , text default-language: Haskell2010 diff --git a/utils/exceptions/package.yaml b/utils/exceptions/package.yaml index da4001ae..ce7b7445 100644 --- a/utils/exceptions/package.yaml +++ b/utils/exceptions/package.yaml @@ -18,15 +18,18 @@ extra-source-files: # common to point users to the README.md file. description: Please see the README on GitHub at +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 -- hs-opentelemetry-api == 0.1.* -- hs-opentelemetry-sdk == 0.0.3.* -- text -- exceptions library: source-dirs: src + dependencies: + - hs-opentelemetry-api == 0.1.* + - hs-opentelemetry-sdk == 0.0.3.* + - text + - exceptions tests: exceptions-test: diff --git a/vendors/honeycomb/package.yaml b/vendors/honeycomb/package.yaml index 856ab160..ba0165ba 100644 --- a/vendors/honeycomb/package.yaml +++ b/vendors/honeycomb/package.yaml @@ -44,6 +44,8 @@ ghc-options: # Warns on every single data declaration - -Wno-missing-kind-signatures +ghc-options: -Wunused-packages + dependencies: - base >= 4.7 && < 5 - bytestring