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

[chore] bump prometheus/go-hdb packages #29314

Merged
merged 6 commits into from
Nov 17, 2023
Merged

[chore] bump prometheus/go-hdb packages #29314

merged 6 commits into from
Nov 17, 2023

Conversation

codeboten
Copy link
Contributor

Fixes #24881

Alex Boten added 2 commits November 16, 2023 14:46
[chore] bump prometheus dep
5602542 
Signed-off-by: Alex Boten <[email protected]>
[chore] bump hdb-go dep
71c5f97 
Signed-off-by: Alex Boten <[email protected]>
@codeboten codeboten mentioned this pull request Nov 16, 2023
Merged
make genotelcontribcol
583914b 
Signed-off-by: Alex Boten <[email protected]>
songy23
songy23 reviewed Nov 16, 2023
View reviewed changes
Copy link
Member

@songy23 songy23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this broke the prometheus test: https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/6897605038/job/18766528283?pr=29314#step:9:378

@codeboten
Copy link
Contributor Author

codeboten commented Nov 17, 2023 •
edited
Loading

Looks like this broke the prometheus test: https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/6897605038/job/18766528283?pr=29314#step:9:378

Yeah I'm looking into it 😠 (this is me looking into the problem, not a reaction to your comment to be clear :D, appreciate you looking at this PR )

Alex Boten added 2 commits November 17, 2023 09:10
fix nil pointer panic
2aaa6b9 
Signed-off-by: Alex Boten <[email protected]>
ignore context canceled error
463e66f 
Signed-off-by: Alex Boten <[email protected]>
@codeboten
Copy link
Contributor Author

I updated the prometheus receiver to ignore a context cancelled error if it's returned by the discovery manager's Run func. This change prometheus/prometheus#10569 was causing the component to record a fatal error on shutdown

use errors.Is
834b4b8 
Signed-off-by: Alex Boten <[email protected]>
@dmitryax
Copy link
Member

Thank you, @codeboten !

@codeboten codeboten merged commit e790fd5 into open-telemetry:main Nov 17, 2023
83 checks passed
@codeboten codeboten deleted the codeboten/bump-prometheus branch November 17, 2023 20:40
@github-actions github-actions bot added this to the next release milestone Nov 17, 2023
RoryCrispin pushed a commit to ClickHouse/opentelemetry-collector-contrib that referenced this pull request Nov 24, 2023
@RoryCrispin
[chore] bump prometheus/go-hdb packages (open-telemetry#29314)
1fa98c9 
Fixes
open-telemetry#24881

---------

Signed-off-by: Alex Boten <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@songy23 songy23 songy23 left review comments

@dmitryax dmitryax dmitryax approved these changes

@fatsheep9146 fatsheep9146 Awaiting requested review from fatsheep9146 fatsheep9146 is a code owner

@jpkrohling jpkrohling Awaiting requested review from jpkrohling jpkrohling is a code owner

@Aneurysm9 Aneurysm9 Awaiting requested review from Aneurysm9

@dashpole dashpole Awaiting requested review from dashpole dashpole is a code owner

@mx-psi mx-psi Awaiting requested review from mx-psi

Assignees

@andrzej-stencel andrzej-stencel

Labels
cmd/configschema configschema command cmd/otelcontribcol otelcontribcol command cmd/oteltestbedcol exporter/loki Loki Exporter exporter/prometheus exporter/prometheusremotewrite pkg/translator/loki pkg/translator/prometheus receiver/loki receiver/prometheus Prometheus receiver receiver/purefa receiver/purefb receiver/saphana receiver/simpleprometheus receiver/sqlquery SQL query receiver testbed
Projects
None yet
Milestone
v0.90.0
Development

Successfully merging this pull request may close these issues.

Failing to upgrade github.com/SAP/go-hdb to 1.3.13
4 participants
@codeboten @dmitryax @songy23 @andrzej-stencel