Fix: Don't pass ns for ms in timeout during metrics collection

[martin-schulze-e2m]

Description

When nearing the collection deadline, the remaining time should be accurately passed is timeout to the callbacks.
Once the deadline is closer than 10s, the remaining time in nanoseconds is passed to timeout_millis, which is expected to be in milliseconds, thus giving a timeout that is 10e6 times too large.

Type of change

Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

CI?

Does This PR Require a Contrib Repo Change?

No. (As far as I can tell.)

Checklist:

• Followed the style guidelines of this project
• Changelogs have been updated
• Unit tests have been added
• Documentation has been updated

[linux-foundation-easycla]

• ❌ The email address for the commit (14e1bd8) is not linked to the GitHub account, preventing the EasyCLA check. Consult this Help Article and GitHub Help to resolve. (To view the commit's email address, add .patch at the end of this PR page's URL.) For further assistance with EasyCLA, please submit a support request ticket.
• ❌ - login: @martin-schulze-e2m . The commit (f22e922) is not authorized under a signed CLA. Please click here to be authorized. For further assistance with EasyCLA, please submit a support request ticket.

[xrmx]

Good catch, care to sign the CLA and add a test? asserting that a mocked CallbackOptions that is called with the right value should be enough.

[martin-schulze-e2m]

Good catch, care to sign the CLA and add a test? asserting that a mocked CallbackOptions that is called with the right value should be enough.

I contacted our legal department regarding the CLA but cannot give an ETA when this will be resolved. After that I will have a look at the tests.

[martin-schulze-e2m]

I updated an existing test that had a wrong test expectation.

We are still working on getting the CLA signed but legal approved already.

I won't be available in the next few weeks so if more changes are required, you might need to be patient.

[xrmx]

@martin-schulze-e2m please use only the account that will have the CLA signed for every commit

[martin-schulze-e2m]

@xrmx I started this PR via the web ui and edited the second commit locally. I don't know how to consolidate that to only the "web account".

I tried to rebase and sign both with my GPG Key. Is that enough for EasyCLA?

[xrmx]

@martin-schulze-e2m We'll sort it out once we have a green tick from the CLA check

[martin-schulze-e2m]

I just wanted to let you know that this will take a while longer. Our designated CLA manager was not able to get the required signature before leaving until September.

[xrmx]

@martin-schulze-e2m would it be a problem for you if we will do a re-implementation since this is open since a few already?

[martin-schulze-e2m]

I just wanted to get this resolved and thought this was the fastest route. It turns out it was not.

Would it be a problem for you if we will do a re-implementation

I cannot speak for my employer, I am fine with that and would have had no problem with contributing this privately...

I hope we will eventually get the CLA sorted out to have a more streamlined experience the next time. :)

[xrmx]

@martin-schulze-e2m if you want to redo the contribution on your own time and personal account please do

[martin-schulze-e2m]

I am severely time constrained right now and meant: if I had known in advance that this would be an issue, I would have contributed under a different account.

Anyways I doubt that I can legally do a "clean room" design that will shield your org. I think a rewrite must come from someone else now.

I am sorry about the hassle.

[xrmx]

@martin-schulze-e2m don't worry

[xrmx]

Superseded by #4074, thanks for spotting the issue and the initial attempt!