Skip to content

Conversation

@nilebox
Copy link
Member

@nilebox nilebox commented Jul 9, 2020

Description:
Update prometheus to v2.19.2

Link to tracking Issue: Fixes #1124

Testing: Existing tests should cover potential regression

Documentation: -

@nilebox nilebox changed the title Update Prometheus to v2.19.2 [WIP] Update Prometheus to v2.19.2 Jul 9, 2020
# Exclude some staticcheck messages
- linters:
- staticcheck
# See https://github.com/golang/protobuf/issues/1077

This comment was marked as resolved.

Copy link
Member Author

Choose a reason for hiding this comment

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

Extracted to #1308 since it's not related to Prometheus itself.

// OcaStore is an interface combines io.Closer and prometheus' scrape.Appendable
type OcaStore interface {
scrape.Appendable
storage.Appendable
Copy link
Member Author

@nilebox nilebox Jul 9, 2020

Choose a reason for hiding this comment

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

This interface change required manual implementation changes below.


// returning an error from this method can cause the whole appending transaction to be aborted and fail
func (tr *transaction) AddFast(ls labels.Labels, _ uint64, t int64, v float64) error {
// always returns 0 to disable label caching
Copy link
Member Author

Choose a reason for hiding this comment

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

@jrcamp
Copy link
Contributor

jrcamp commented Jul 21, 2020

@nilebox is this still WIP or ready for review?

@nilebox
Copy link
Member Author

nilebox commented Jul 21, 2020

@jrcamp I will finish this PR once #1308 is merged (it's a blocker).

@bogdandrutu
Copy link
Member

@nilebox can you work on this?

@nilebox
Copy link
Member Author

nilebox commented Jul 23, 2020

@bogdandrutu yep, I will update this PR and see if there are any other problems blocking it.

@codecov
Copy link

codecov bot commented Jul 24, 2020

Codecov Report

Merging #1301 into master will not change coverage.
The diff coverage is 75.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1301   +/-   ##
=======================================
  Coverage   90.28%   90.28%           
=======================================
  Files         232      232           
  Lines       16396    16396           
=======================================
  Hits        14803    14803           
- Misses       1136     1137    +1     
+ Partials      457      456    -1     
Impacted Files Coverage Δ
...eceiver/prometheusreceiver/internal/transaction.go 95.09% <71.42%> (-1.97%) ⬇️
receiver/prometheusreceiver/internal/ocastore.go 93.54% <80.00%> (-6.46%) ⬇️
translator/internaldata/resource_to_oc.go 83.72% <0.00%> (+2.32%) ⬆️
receiver/otlpreceiver/otlp.go 93.65% <0.00%> (+3.17%) ⬆️

Continue to review full report at Codecov.

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

@nilebox nilebox changed the title [WIP] Update Prometheus to v2.19.2 Update Prometheus to v2.19.2 Jul 24, 2020
@bogdandrutu bogdandrutu merged commit 34f0d24 into open-telemetry:master Jul 24, 2020
MovieStoreGuy pushed a commit to atlassian-forks/opentelemetry-collector that referenced this pull request Nov 11, 2021
…etry#1301)

Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.32.0 to 1.32.1.
- [Release notes](https://github.com/golangci/golangci-lint/releases)
- [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md)
- [Commits](golangci/golangci-lint@v1.32.0...v1.32.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Troels51 pushed a commit to Troels51/opentelemetry-collector that referenced this pull request Jul 5, 2024
swiatekm pushed a commit to swiatekm/opentelemetry-collector that referenced this pull request Oct 9, 2024
…rkaround null issue (open-telemetry#1301)

* Allow alternate blank config

* Fix template for older helm versions

* remove debug template

* Update values.yaml

Co-authored-by: Dmitrii Anoshin <[email protected]>

* bump version

---------

Co-authored-by: Dmitrii Anoshin <[email protected]>
Co-authored-by: Jared Tan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update Prometheus to v2.19.0

4 participants