freckle-otel 0.0.0.2 → 0.0.0.3
raw patch · 7 files changed
+32/−22 lines, 7 filesdep ~freckle-envdep ~hspecdep ~hspec-corePVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: freckle-env, hspec, hspec-core
API changes (from Hackage documentation)
- Freckle.App.OpenTelemetry.Context: instance GHC.Internal.Base.Monoid Freckle.App.OpenTelemetry.Context.CustomTraceContext
- Freckle.App.OpenTelemetry.Context: instance GHC.Internal.Base.Semigroup Freckle.App.OpenTelemetry.Context.CustomTraceContext
- Freckle.App.OpenTelemetry.Context: instance GHC.Internal.Generics.Generic Freckle.App.OpenTelemetry.Context.CustomTraceContext
+ Freckle.App.OpenTelemetry.Context: instance GHC.Base.Monoid Freckle.App.OpenTelemetry.Context.CustomTraceContext
+ Freckle.App.OpenTelemetry.Context: instance GHC.Base.Semigroup Freckle.App.OpenTelemetry.Context.CustomTraceContext
+ Freckle.App.OpenTelemetry.Context: instance GHC.Generics.Generic Freckle.App.OpenTelemetry.Context.CustomTraceContext
- Freckle.App.OpenTelemetry.Context: extractContext :: (MonadIO m, MonadTracer m, HasHeaders a) => a -> m ()
+ Freckle.App.OpenTelemetry.Context: extractContext :: (HasHeaders a, MonadIO m, MonadTracer m) => a -> m ()
- Freckle.App.OpenTelemetry.Context: injectContext :: (MonadIO m, MonadTracer m, HasHeaders a) => a -> m a
+ Freckle.App.OpenTelemetry.Context: injectContext :: (HasHeaders a, MonadIO m, MonadTracer m) => a -> m a
- Freckle.App.OpenTelemetry.Context: processWithContext :: (MonadUnliftIO m, MonadMask m, MonadTracer m, HasHeaders a, HasCallStack) => Text -> SpanArguments -> a -> (a -> m b) -> m b
+ Freckle.App.OpenTelemetry.Context: processWithContext :: (HasCallStack, HasHeaders a, MonadMask m, MonadTracer m, MonadUnliftIO m) => Text -> SpanArguments -> a -> (a -> m b) -> m b
Files
- CHANGELOG.md +5/−1
- README.md +6/−0
- freckle-otel.cabal +8/−8
- library/Freckle/App/OpenTelemetry/Context.hs +6/−6
- package.yaml +3/−3
- tests/AppExample.hs +2/−2
- tests/Freckle/App/OpenTelemetry/ContextSpec.hs +2/−2
CHANGELOG.md view
@@ -1,4 +1,8 @@-## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-otel-v0.0.0.2...main)+## [_Unreleased_](https://github.com/freckle/freckle-otel/compare/v0.0.0.3...main)++## [v0.0.0.3](https://github.com/freckle/freckle-otel/compare/v0.0.0.2...v0.0.0.3)++Metadata change only; moved source repository. ## [v0.0.0.2](https://github.com/freckle/freckle-app/compare/freckle-otel-v0.0.0.1...freckle-otel-v0.0.0.2)
README.md view
@@ -1,1 +1,7 @@ # freckle-otel++Some extension to the [hs-opentelemetry-sdk](https://hackage.haskell.org/package/hs-opentelemetry-sdk) library.++---++[CHANGELOG](./CHANGELOG.md) | [LICENSE](./LICENSE)
freckle-otel.cabal view
@@ -1,12 +1,12 @@ cabal-version: 1.18 name: freckle-otel-version: 0.0.0.2+version: 0.0.0.3 license: MIT license-file: LICENSE maintainer: Freckle Education-homepage: https://github.com/freckle/freckle-app#readme-bug-reports: https://github.com/freckle/freckle-app/issues-synopsis: ...+homepage: https://github.com/freckle/freckle-otel#readme+bug-reports: https://github.com/freckle/freckle-otel/issues+synopsis: Some extensions to the hs-opentelemetry-sdk library description: Please see README.md category: OpenTelemetry, Telemetry, Monitoring, Observability, Metrics@@ -19,7 +19,7 @@ source-repository head type: git- location: https://github.com/freckle/freckle-app+ location: https://github.com/freckle/freckle-otel library exposed-modules:@@ -94,12 +94,12 @@ Blammo >=2.1.0.0, base >=4.16.4.0 && <5, exceptions >=0.10.4,- freckle-env >=0.0.1.1,+ freckle-env >=0.0.1.2, freckle-otel, hs-opentelemetry-api >=0.1.0.0, hs-opentelemetry-sdk >=0.0.3.6,- hspec >=2.10.10,- hspec-core >=2.10.10,+ hspec >=2.9.7,+ hspec-core >=2.9.7, hspec-expectations-lifted >=0.10.0, http-types >=0.12.3, lens >=5.1.1,
library/Freckle/App/OpenTelemetry/Context.hs view
@@ -71,7 +71,7 @@ { traceHeaders :: [(Text, Text)] } deriving stock (Generic)- deriving newtype (Semigroup, Monoid)+ deriving newtype (Monoid, Semigroup) deriving anyclass (FromJSON, ToJSON) instance HasHeaders CustomTraceContext where@@ -85,7 +85,7 @@ -- | Update our trace context from that extracted from the given item's headers extractContext- :: (MonadIO m, MonadTracer m, HasHeaders a) => a -> m ()+ :: (HasHeaders a, MonadIO m, MonadTracer m) => a -> m () extractContext a = do context <- getContext propagator <- getPropagator@@ -94,7 +94,7 @@ -- | Inject our trace context into the given item's headers injectContext- :: (MonadIO m, MonadTracer m, HasHeaders a) => a -> m a+ :: (HasHeaders a, MonadIO m, MonadTracer m) => a -> m a injectContext a = do context <- getContext propagator <- getPropagator@@ -107,11 +107,11 @@ -- | Process an item (a request, a Job, etc) in a top-level span and context processWithContext- :: ( MonadUnliftIO m+ :: ( HasCallStack+ , HasHeaders a , MonadMask m , MonadTracer m- , HasHeaders a- , HasCallStack+ , MonadUnliftIO m ) => Text -- ^ Span name
package.yaml view
@@ -1,9 +1,9 @@ name: freckle-otel-version: 0.0.0.2+version: 0.0.0.3 maintainer: Freckle Education category: OpenTelemetry, Telemetry, Monitoring, Observability, Metrics-github: freckle/freckle-app-synopsis: ...+github: freckle/freckle-otel+synopsis: Some extensions to the hs-opentelemetry-sdk library description: Please see README.md extra-doc-files:
tests/AppExample.hs view
@@ -29,11 +29,11 @@ , Functor , Monad , MonadCatch+ , MonadFail , MonadIO- , MonadUnliftIO , MonadReader app , MonadThrow- , MonadFail+ , MonadUnliftIO ) instance MonadMask (AppExample app) where
tests/Freckle/App/OpenTelemetry/ContextSpec.hs view
@@ -153,7 +153,7 @@ fmap snd headerTraceParent `shouldBe` Just (spanIdToHex $ Trace.spanId spanContext) -assertCurrentSpanContext :: (MonadIO m, HasCallStack) => m Trace.SpanContext+assertCurrentSpanContext :: (HasCallStack, MonadIO m) => m Trace.SpanContext assertCurrentSpanContext = getCurrentSpanContext >>= \case Nothing -> expectationFailure "Expect there to be a SpanContext"@@ -169,5 +169,5 @@ [traceId, spanId] <- Just $ T.splitOn "-" c pure (traceId, spanId) -expectationFailure :: (MonadIO m, HasCallStack) => String -> m a+expectationFailure :: (HasCallStack, MonadIO m) => String -> m a expectationFailure msg = Hspec.expectationFailure msg >> error "unreachable"