hs-opentelemetry-propagator-datadog 0.0.0.0 → 0.0.1.0
raw patch · 8 files changed
+27/−39 lines, 8 filesdep −hs-opentelemetry-sdkdep ~bytestringdep ~hs-opentelemetry-apidep ~http-typesnew-uploaderPVP ok
version bump matches the API change (PVP)
Dependencies removed: hs-opentelemetry-sdk
Dependency ranges changed: bytestring, hs-opentelemetry-api, http-types, primitive, text
API changes (from Hackage documentation)
Files
- CHANGELOG.md +0/−7
- LICENSE +1/−1
- benchmark/header-codec/main.hs +3/−3
- hs-opentelemetry-propagator-datadog.cabal +6/−12
- old-src/Raw.hs +11/−10
- old-src/String.hs +1/−1
- src/OpenTelemetry/Propagator/Datadog.hs +1/−1
- src/OpenTelemetry/Propagator/Datadog/Internal.hs +4/−4
− CHANGELOG.md
@@ -1,7 +0,0 @@-# Change Log--## 0.0.0.0--2023.10.03--- Initial release
LICENSE view
@@ -13,7 +13,7 @@ disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Author name here nor the names of other+ * Neither the name of Ian Duncan nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission.
benchmark/header-codec/main.hs view
@@ -19,9 +19,9 @@ ] , C.bgroup "newHeaderFromTraceId" $ let value = SB.pack [0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 10, 11, 12, 13, 14, 15]- in [ C.bench "new" $ C.nf newHeaderFromTraceId value- , C.bench "old" $ C.nf String.newHeaderFromTraceId value- ]+ in [ C.bench "new" $ C.nf newHeaderFromTraceId value+ , C.bench "old" $ C.nf String.newHeaderFromTraceId value+ ] ]
hs-opentelemetry-propagator-datadog.cabal view
@@ -1,10 +1,9 @@ cabal-version: 2.4 name: hs-opentelemetry-propagator-datadog-version: 0.0.0.0+version: 0.0.1.0 author: Kazuki Okamoto (岡本和樹) maintainer: kazuki.okamoto@herp.co.jp-copyright: Kazuki Okamoto (岡本和樹), HERP, Inc. license: BSD-3-Clause license-file: LICENSE category: Telemetry@@ -13,10 +12,6 @@ synopsis: Datadog Propagator for OpenTelemetry description: This package provides a Datadog style propagator for hs-opentelemetry suite. -extra-doc-files:- CHANGELOG.md- LICENSE- common common build-depends: base >= 4 && < 5 ghc-options: -Wall@@ -29,12 +24,11 @@ hs-source-dirs: src exposed-modules: OpenTelemetry.Propagator.Datadog OpenTelemetry.Propagator.Datadog.Internal- build-depends: bytestring < 0.11,- hs-opentelemetry-api >= 0.1 && < 0.2,- hs-opentelemetry-sdk >= 0.0 && < 0.1,- http-types < 0.13,- primitive < 0.9,- text < 1.3,+ build-depends: bytestring,+ hs-opentelemetry-api ^>= 0.2,+ http-types,+ primitive,+ text ghc-options: -Wcompat -Wno-name-shadowing if impl(ghc >= 6.4)
old-src/Raw.hs view
@@ -49,7 +49,7 @@ writeByteArray mba 0 (0 :: Word64) -- fill zeros to one upper Word64-size area writeByteArrayNbo mba 1 w64 -- offset one Word64-size freezeByteArray mba 0 len- in SBI.SBS ba+ in SBI.SBS ba newSpanIdFromHeader@@ -64,7 +64,7 @@ let w64 = readWord64BS bs writeByteArrayNbo mba 0 w64 freezeByteArray mba 0 len- in SBI.SBS ba+ in SBI.SBS ba {- | Write a primitive value to the byte array with network-byte-order (big-endian).@@ -78,10 +78,11 @@ loop _ 0 = pure () loop 8 _ = pure () loop n v = do- let -- equivelent:- -- (p, q) = v `divMod` (2 ^ (8 :: Int))- p = shift v (-8)- q = v .&. complement (shift p 8)+ let+ -- equivelent:+ -- (p, q) = v `divMod` (2 ^ (8 :: Int))+ p = shift v (-8)+ q = v .&. complement (shift p 8) writeByteArray mba (8 * (offset + 1) - n - 1) (fromIntegral q :: Word8) loop (n + 1) p @@ -109,13 +110,13 @@ newHeaderFromTraceId :: ShortByteString -> ByteString newHeaderFromTraceId (SBI.SBS ba) = let w64 = indexByteArrayNbo (ByteArray ba) 1- in showWord64BS w64+ in showWord64BS w64 newHeaderFromSpanId :: ShortByteString -> ByteString newHeaderFromSpanId (SBI.SBS ba) = let w64 = indexByteArrayNbo (ByteArray ba) 0- in showWord64BS w64+ in showWord64BS w64 indexByteArrayNbo :: ByteArray -> Int -> Word64@@ -127,12 +128,12 @@ showWord64BS :: Word64 -> ByteString-showWord64BS v =+showWord64BS value = unsafeDupablePerformIO $ BI.createUptoN 20 writeWord64Ptr -- 20 = length (show (maxBound :: Word64)) where writeWord64Ptr ptr =- loop (19 :: Int) v 0 False+ loop (19 :: Int) value 0 False where loop 0 v offset _ = do writeOffPtr ptr offset (word8ToAsciiWord8 $ fromIntegral v)
old-src/String.hs view
@@ -30,7 +30,7 @@ toWord8s acc 0 = acc toWord8s acc n = let (p, q) = n `divMod` (2 ^ (8 :: Int))- in toWord8s (fromIntegral q : acc) p+ in toWord8s (fromIntegral q : acc) p fillLeadingZeros :: Word -> ByteString -> ByteString
src/OpenTelemetry/Propagator/Datadog.hs view
@@ -36,8 +36,8 @@ newSpanIdFromHeader, newTraceIdFromHeader, )-import OpenTelemetry.Trace (SpanContext (SpanContext, isRemote, spanId, traceFlags, traceId, traceState)) import OpenTelemetry.Trace.Core (+ SpanContext (SpanContext, isRemote, spanId, traceFlags, traceId, traceState), getSpanContext, wrapSpanContext, )
src/OpenTelemetry/Propagator/Datadog/Internal.hs view
@@ -46,7 +46,7 @@ newTraceIdFromHeader bs = let w64 = readWord64BS bs builder = BB.word64BE 0 <> BB.word64BE w64- in SB.toShort $ BL.toStrict $ BB.toLazyByteString builder+ in SB.toShort $ BL.toStrict $ BB.toLazyByteString builder newSpanIdFromHeader@@ -57,7 +57,7 @@ newSpanIdFromHeader bs = let w64 = readWord64BS bs builder = BB.word64BE w64- in SB.toShort $ BL.toStrict $ BB.toLazyByteString builder+ in SB.toShort $ BL.toStrict $ BB.toLazyByteString builder readWord64BS :: ByteString -> Word64@@ -88,7 +88,7 @@ -- ^ ASCII text of 64-bit integer newHeaderFromTraceId (SBI.SBS ba) = let w64 = indexByteArrayNbo (ByteArray ba) 1- in showWord64BS w64+ in showWord64BS w64 newHeaderFromSpanId@@ -98,7 +98,7 @@ -- ^ ASCII text of 64-bit integer newHeaderFromSpanId (SBI.SBS ba) = let w64 = indexByteArrayNbo (ByteArray ba) 0- in showWord64BS w64+ in showWord64BS w64 -- | Read 'ByteArray' to 'Word64' with network-byte-order.