From 7f5d2f3952cca4d0036cc7f2b08e87270141b0ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Mar 2025 14:34:49 +0000 Subject: [PATCH 1/7] Bump actions/cache from 3.3.1 to 4.2.3 Bumps [actions/cache](https://github.com/actions/cache) from 3.3.1 to 4.2.3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.3.1...v4.2.3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7264471..4fd0a34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,17 +14,17 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3.3.1 + - uses: actions/cache@v4.2.3 name: Cache ~/.cabal/packages with: path: ~/.cabal/packages key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-packages - - uses: actions/cache@v3.3.1 + - uses: actions/cache@v4.2.3 name: Cache ~/.cabal/store with: path: ~/.cabal/store key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-store - - uses: actions/cache@v3.3.1 + - uses: actions/cache@v4.2.3 name: Cache dist-newstyle with: path: dist-newstyle @@ -52,7 +52,7 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3.3.1 + - uses: actions/cache@v4.2.3 name: Cache ~/.stack with: path: ~/.stack @@ -80,7 +80,7 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3.3.1 + - uses: actions/cache@v4.2.3 name: Cache ~/.stack with: path: ~/.stack @@ -108,17 +108,17 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3.3.1 + - uses: actions/cache@v4.2.3 name: Cache ~/.cabal/packages with: path: ~/.cabal/packages key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-packages - - uses: actions/cache@v3.3.1 + - uses: actions/cache@v4.2.3 name: Cache ~/.cabal/store with: path: ~/.cabal/store key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-store - - uses: actions/cache@v3.3.1 + - uses: actions/cache@v4.2.3 name: Cache dist-newstyle with: path: dist-newstyle From 5e23641d3f794eb693fa71bacaf6cf66b87a61b0 Mon Sep 17 00:00:00 2001 From: David Hewson Date: Thu, 1 May 2025 16:37:02 +0100 Subject: [PATCH 2/7] replace deprecated haskell/actions with suggested haskell-actions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fd0a34..eda474a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: with: path: dist-newstyle key: ${{ runner.os }}-${{ matrix.ghc }}-dist-newstyle - - uses: haskell/actions/setup@v2.4.7 + - uses: haskell-actions/setup@v2.7.11 with: ghc-version: ${{ matrix.ghc }} cabal-version: '3.6' @@ -123,7 +123,7 @@ jobs: with: path: dist-newstyle key: ${{ runner.os }}-${{ matrix.ghc }}-dist-newstyle - - uses: haskell/actions/setup@v2.4.7 + - uses: haskell-actions/setup@v2.7.11 with: ghc-version: ${{ matrix.ghc }} cabal-version: '3.6' From f75c789f939d65978cf40f52e7f4a66c799b0e89 Mon Sep 17 00:00:00 2001 From: David Hewson Date: Thu, 1 May 2025 16:42:03 +0100 Subject: [PATCH 3/7] move to later version of 8.10 stackage --- stack-8.10.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/stack-8.10.yaml b/stack-8.10.yaml index 87505ce..7b83993 100644 --- a/stack-8.10.yaml +++ b/stack-8.10.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2021-04-02 +resolver: lts-18.28 packages: - megaexample @@ -8,7 +8,3 @@ packages: - opentelemetry-wai allow-newer: true - -extra-deps: -- jsonifier-0.1.0.5 -- ptr-poker-0.1.1.3 From f9af225853375c89c1d69fde4aa1dfff96cecce5 Mon Sep 17 00:00:00 2001 From: David Hewson Date: Wed, 30 Apr 2025 15:28:03 +0100 Subject: [PATCH 4/7] test with 9.x ghcs that are recommended for use --- .github/workflows/ci.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eda474a..e91521b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ghc: ['8.6', '8.8', '8.10', '9.0', '9.2'] + ghc: ['9.6', '9.8', '9.10', '9.12'] + include: + - cabal: latest + - ghc: '8.6' + cabal: '3.6' + - ghc: '8.8' + cabal: '3.6' + - ghc: '8.10' + cabal: '3.6' fail-fast: false steps: - uses: actions/checkout@v4 @@ -32,7 +40,7 @@ jobs: - uses: haskell-actions/setup@v2.7.11 with: ghc-version: ${{ matrix.ghc }} - cabal-version: '3.6' + cabal-version: ${{ matrix.cabal }} - name: Update cabal package database run: cabal update - name: Build @@ -104,7 +112,11 @@ jobs: runs-on: windows-latest strategy: matrix: - ghc: ['8.10', '9.0', '9.2'] + include: + - ghc: '9.8' + cabal: latest + - ghc: '8.10' + cabal: '3.8' fail-fast: false steps: - uses: actions/checkout@v4 @@ -126,7 +138,7 @@ jobs: - uses: haskell-actions/setup@v2.7.11 with: ghc-version: ${{ matrix.ghc }} - cabal-version: '3.6' + cabal-version: ${{ matrix.cabal }} - name: Update cabal package database run: cabal update - name: Build From 13e641e90c9ee9e6a90e1d6ad7f9b3e285596765 Mon Sep 17 00:00:00 2001 From: David Hewson Date: Wed, 30 Apr 2025 15:33:06 +0100 Subject: [PATCH 5/7] also test with latest stack lts --- .github/workflows/ci.yml | 10 +++++++--- stack-9.8.yaml | 10 ++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 stack-9.8.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e91521b..c3654ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - stack-yaml: ['stack-8.10.yaml'] + stack-yaml: ['stack-8.10.yaml', 'stack-9.8.yaml'] fail-fast: false steps: - uses: actions/checkout@v4 @@ -81,10 +81,14 @@ jobs: stack bench --stack-yaml ${{ matrix.stack-yaml }} opentelemetry-extra --benchmark-arguments '+RTS -l' macos-stack: - runs-on: macOS-latest + runs-on: ${{ matrix.os }} strategy: matrix: - stack-yaml: ['stack-8.10.yaml'] + include: + - os: macOS-latest + stack-yaml: 'stack-9.8.yaml' + - os: macOS-13 + stack-yaml: 'stack-8.10.yaml' fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/stack-9.8.yaml b/stack-9.8.yaml new file mode 100644 index 0000000..7f3af01 --- /dev/null +++ b/stack-9.8.yaml @@ -0,0 +1,10 @@ +resolver: lts-23.19 + +packages: +- megaexample +- opentelemetry +- opentelemetry-extra +- opentelemetry-lightstep +- opentelemetry-wai + +allow-newer: true From 39bbe500e798924a0eb727f20a6ba2304d0de553 Mon Sep 17 00:00:00 2001 From: David Hewson Date: Wed, 30 Apr 2025 15:45:12 +0100 Subject: [PATCH 6/7] fix 9.10 build arbirary was maxing out at a depth of 4 constraint solver iterations --- opentelemetry-extra/unit-tests/Arbitrary.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-extra/unit-tests/Arbitrary.hs b/opentelemetry-extra/unit-tests/Arbitrary.hs index 217a1a2..d51bedc 100644 --- a/opentelemetry-extra/unit-tests/Arbitrary.hs +++ b/opentelemetry-extra/unit-tests/Arbitrary.hs @@ -2,7 +2,7 @@ {-# LANGUAGE DerivingVia #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -Wno-orphans #-} +{-# OPTIONS_GHC -Wno-orphans -fconstraint-solver-iterations=8 #-} module Arbitrary where From fd96e2a49ef3ef81cfc736ee3f0f7fa033a32a5b Mon Sep 17 00:00:00 2001 From: David Hewson Date: Thu, 1 May 2025 16:33:25 +0100 Subject: [PATCH 7/7] missing spaces in debug message --- .../src/OpenTelemetry/EventlogStreaming_Internal.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry-extra/src/OpenTelemetry/EventlogStreaming_Internal.hs b/opentelemetry-extra/src/OpenTelemetry/EventlogStreaming_Internal.hs index c473fe7..6d8d515 100644 --- a/opentelemetry-extra/src/OpenTelemetry/EventlogStreaming_Internal.hs +++ b/opentelemetry-extra/src/OpenTelemetry/EventlogStreaming_Internal.hs @@ -277,7 +277,7 @@ handleOpenTelemetryEventlogEvent m st (tid, now, m_trace_id) = Nothing -> error $ "set spanid " <> show serial <> " " <> show span_id <> ": span id not found" SetTraceEv (SpanInFlight serial) trace_id -> case HM.lookup serial $ serial2sid st of - Nothing -> error $ "set traceid: span id not found for serial" <> show serial + Nothing -> error $ "set traceid: span id not found for serial " <> show serial Just span_id -> ( (modifySpan span_id (setTraceId trace_id) st) { traceMap = HM.insert tid trace_id $ traceMap st @@ -287,7 +287,7 @@ handleOpenTelemetryEventlogEvent m st (tid, now, m_trace_id) = ) TagEv (SpanInFlight serial) k v -> case HM.lookup serial $ serial2sid st of - Nothing -> error $ "set tag: span id not found for serial" <> show serial + Nothing -> error $ "set tag: span id not found for serial " <> show serial Just span_id -> (modifySpan span_id (setTag k v) st, [], []) EndSpanEv (SpanInFlight serial) -> case HM.lookup serial $ serial2sid st of