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.

Sign up for GitHub

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

Jump to bottom

[receiver/prometheus] Fix start timestamp when timestamp is present #6794

Merged
merged 5 commits into from
Dec 16, 2021
Merged

[receiver/prometheus] Fix start timestamp when timestamp is present #6794

merged 5 commits into from
Dec 16, 2021

Conversation

PaurushGarg
Copy link
Member

@PaurushGarg PaurushGarg commented Dec 14, 2021 •
edited by jpkrohling
Loading

Description:

  • Changing mg.intervalStartTimeMs to mg.ts for setting start_timestamp in metricfamily (to*TimeSeries), because we have metric_adjuster down the line in Prometheus Receiver that sets (and adjusts) the start_timestamp.
  • Fixing Issue 6405
  • Removing the skipped logic of Issue 6085 (PR 6705).

Link to tracking Issue:
Fixes #6405

@PaurushGarg PaurushGarg requested review from Aneurysm9 and a team as code owners December 14, 2021 01:59
@Aneurysm9 Aneurysm9 added the ready to merge Code review completed; ready to merge by maintainers label Dec 14, 2021
@PaurushGarg PaurushGarg mentioned this pull request Dec 15, 2021
Closed
6 tasks
@jpkrohling jpkrohling changed the title [Prometheus Receiver] Fix for incorrect honor start_timestamp issue 6405 [receiver/prometheus] Fix start timestamp when timestamp is present Dec 16, 2021
@jpkrohling
Copy link
Member

I'm waiting for @bogdandrutu, as he had comments about this PR.

@alolita
Copy link
Member

alolita commented Dec 16, 2021

@bogdandrutu can you please merge this PR since it has two approvals from experts. Thx.

@bogdandrutu bogdandrutu merged commit 4fedae5 into open-telemetry:main Dec 16, 2021
@PaurushGarg PaurushGarg deleted the prom-receiver-honor-timestamp-issue-6405-2 branch December 18, 2021 05:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bogdandrutu bogdandrutu bogdandrutu left review comments

@codeboten codeboten codeboten approved these changes

@Aneurysm9 Aneurysm9 Aneurysm9 approved these changes

Assignees

@jpkrohling jpkrohling

Labels
ready to merge Code review completed; ready to merge by maintainers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Prometheus Receiver] Incorrect Start_Timestamp for counter metric when explicit timestamp is present
6 participants
@PaurushGarg @jpkrohling @alolita @codeboten @Aneurysm9 @bogdandrutu