Merge remote-tracking branch 'origin/main' into 293-better-differenti…

…al-flamegraph-explanations

.github/workflows/check.yml

@@ -4,13 +4,17 @@ on:
   push:
     branches: [main]
   pull_request:
+# Spend CI time only on latest ref: https://github.com/jonhoo/rust-ci-conf/pull/5
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 name: check
 jobs:
   fmt:
     runs-on: ubuntu-latest
     name: stable / fmt
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install stable
@@ -30,7 +34,7 @@ jobs:
       matrix:
         toolchain: [stable, beta]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install ${{ matrix.toolchain }}
@@ -46,7 +50,7 @@ jobs:
     runs-on: ubuntu-latest
     name: nightly / doc
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install nightly
@@ -59,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
     name: ubuntu / stable / features
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install stable
@@ -75,10 +79,10 @@ jobs:
     # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
     strategy:
       matrix:
-        msrv: [1.64.0] # clap 4 (via clap_lex)
+        msrv: ["1.71.0"] # env_logger and clap
     name: ubuntu / ${{ matrix.msrv }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install ${{ matrix.msrv }}

.github/workflows/scheduled.yml

@@ -6,14 +6,18 @@ on:
   pull_request:
   schedule:
     - cron:  '7 7 * * *'
+# Spend CI time only on latest ref: https://github.com/jonhoo/rust-ci-conf/pull/5
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 name: rolling
 jobs:
   # https://twitter.com/mycoliza/status/1571295690063753218
   nightly:
     runs-on: ubuntu-latest
     name: ubuntu / nightly
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install nightly
@@ -32,7 +36,7 @@ jobs:
     # Unfortunately, hashFiles only works in if on steps, so we reepeat it.
     # if: hashFiles('Cargo.lock') != ''
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install beta

.github/workflows/test.yml

@@ -4,6 +4,10 @@ on:
   push:
     branches: [main]
   pull_request:
+# Spend CI time only on latest ref: https://github.com/jonhoo/rust-ci-conf/pull/5
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 name: test
 jobs:
   required:
@@ -13,7 +17,7 @@ jobs:
       matrix:
         toolchain: [stable, beta]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install ${{ matrix.toolchain }}
@@ -33,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     name: ubuntu / stable / minimal-versions
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install stable
@@ -54,7 +58,13 @@ jobs:
       matrix:
         os: [macos-latest, windows-latest]
     steps:
-      - uses: actions/checkout@v3
+      # if your project needs OpenSSL, uncommment this to fix Windows builds.
+      # it's commented out by default as tthe install command takes 5-10m.
+      # - run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
+      #   if: runner.os == 'Windows'
+      # - run: vcpkg install openssl:x64-windows-static-md
+      #   if: runner.os == 'Windows'
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install stable
@@ -68,7 +78,7 @@ jobs:
     runs-on: ubuntu-latest
     name: ubuntu / stable / coverage
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install stable

CHANGELOG.md

@@ -11,6 +11,50 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [0.11.21] - 2024-08-03
+### Added
+
+- Support for combined stack + ustack DTrace collapse. [#328](https://github.com/jonhoo/inferno/pull/328)
+
+### Changed
+
+- Trim executable name when getting function color. [#329](https://github.com/jonhoo/inferno/pull/329)
+
+## [0.11.20] - 2024-07-14
+### Changed
+
+- More reliably detect Java and avoid double-annotating. [#319](https://github.com/jonhoo/inferno/pull/319)
+- Take period into account when collapsing stacks. [#319](https://github.com/jonhoo/inferno/pull/319)
+- Updated dashmap to v6
+- MSRV (sadly) bumped to 1.71.0 for env_logger and clap and dashmap
+
+## [0.11.19] - 2023-11-25
+### Changed
+
+- By default, make `cargo install` strip all binaries. [#310](https://github.com/jonhoo/inferno/pull/310)
+
+## [0.11.18] - 2023-11-11
+### Changed
+
+- Updated ahash version in Cargo.lock for binary consumers.
+  See https://github.com/tkaitchuck/aHash/issues/163.
+
+### Removed
+
+## [0.11.17] - 2023-09-16
+### Added
+
+- Added collapse-ghcprof. [#300](https://github.com/jonhoo/inferno/pull/300)
+
+## [0.11.16] - 2023-08-20
+### Added
+
+- Added stackcollapse-recursive. [#291](https://github.com/jonhoo/inferno/pull/291)
+
+### Changed
+
+- Upgraded indexmap and libflate to 2.0.
+
 ## [0.11.15] - 2023-02-11
 ### Changed
 
@@ -271,7 +315,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Moved to `IndexMap` and FNV hashing ([#127](https://github.com/jonhoo/inferno/pull/127))
 - Moved CI to Azure DevOps Pipelines
 
-[Unreleased]: https://github.com/jonhoo/inferno/compare/v0.11.13...HEAD
+[Unreleased]: https://github.com/jonhoo/inferno/compare/v0.11.21...HEAD
+[0.11.21]: https://github.com/jonhoo/inferno/compare/v0.11.20...v0.11.21
+[0.11.20]: https://github.com/jonhoo/inferno/compare/v0.11.19...v0.11.20
+[0.11.19]: https://github.com/jonhoo/inferno/compare/v0.11.18...v0.11.19
+[0.11.18]: https://github.com/jonhoo/inferno/compare/v0.11.17...v0.11.18
+[0.11.17]: https://github.com/jonhoo/inferno/compare/v0.11.16...v0.11.17
+[0.11.16]: https://github.com/jonhoo/inferno/compare/v0.11.15...v0.11.16
+[0.11.15]: https://github.com/jonhoo/inferno/compare/v0.11.14...v0.11.15
+[0.11.14]: https://github.com/jonhoo/inferno/compare/v0.11.13...v0.11.14
 [0.11.13]: https://github.com/jonhoo/inferno/compare/v0.11.12...v0.11.13
 [0.11.12]: https://github.com/jonhoo/inferno/compare/v0.11.11...v0.11.12
 [0.11.11]: https://github.com/jonhoo/inferno/compare/v0.11.10...v0.11.11