Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(prof): combine thread timeout errors properly #3081

Merged
merged 1 commit into from
Feb 11, 2025

Conversation

morrisonlevi
Copy link
Collaborator

Description

I used the wrong combinator before, need to use Result::and. From Result::and documentation:

let x: Result<u32, &str> = Ok(2);
let y: Result<&str, &str> = Err("late error");
assert_eq!(x.and(y), Err("late error"));

let x: Result<u32, &str> = Err("early error");
let y: Result<&str, &str> = Ok("foo");
assert_eq!(x.and(y), Err("early error"));

let x: Result<u32, &str> = Err("not a 2");
let y: Result<&str, &str> = Err("late error");
assert_eq!(x.and(y), Err("not a 2"));

let x: Result<u32, &str> = Ok(2);
let y: Result<&str, &str> = Ok("different result type");
assert_eq!(x.and(y), Ok("different result type"));

This is a follow-up to #3075.

Reviewer checklist

  • Test coverage seems ok.
  • Appropriate labels assigned.

@morrisonlevi morrisonlevi added cat:app-crash profiling Relates to the Continuous Profiler labels Feb 11, 2025
@morrisonlevi morrisonlevi requested a review from a team as a code owner February 11, 2025 16:48
@codecov-commenter
Copy link

codecov-commenter commented Feb 11, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.74%. Comparing base (b8e8454) to head (879ec01).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #3081      +/-   ##
============================================
+ Coverage     74.48%   74.74%   +0.25%     
  Complexity     2790     2790              
============================================
  Files           112      112              
  Lines         11042    11042              
============================================
+ Hits           8225     8253      +28     
+ Misses         2817     2789      -28     
Flag Coverage Δ
tracer-php 74.74% <ø> (+0.25%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 7 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b8e8454...879ec01. Read the comment docs.

@pr-commenter
Copy link

pr-commenter bot commented Feb 11, 2025

Benchmarks [ profiler ]

Benchmark execution time: 2025-02-11 16:57:15

Comparing candidate commit 879ec01 in PR branch levi/fix-dlclose with baseline commit b8e8454 in branch master.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 28 metrics, 8 unstable metrics.

@morrisonlevi morrisonlevi merged commit 4378c26 into master Feb 11, 2025
481 of 512 checks passed
@morrisonlevi morrisonlevi deleted the levi/fix-dlclose branch February 11, 2025 17:25
@github-actions github-actions bot added this to the 1.7.0 milestone Feb 11, 2025
@realFlowControl realFlowControl modified the milestones: 1.7.0, 1.6.4 Feb 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cat:app-crash profiling Relates to the Continuous Profiler tracing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants