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

metrics: f3: Set up otel metrics reporting to prometheus #12285

Merged
merged 1 commit into from
Jul 23, 2024
Merged

metrics: f3: Set up otel metrics reporting to prometheus #12285

merged 1 commit into from
Jul 23, 2024

Conversation

masih
Copy link
Member

@masih masih commented Jul 23, 2024 •
edited
Loading

Related Issues

None.

Proposed Changes

Register otel collector bridging to the default prometheus registry so that F3 metrics (which use the newer otel APIs for metrics) get included in Lotus metrics.

Additional Info

None.

Checklist

Before you mark the PR ready for review, please make sure that:

  • Commits have a clear commit message.
  • PR title is in the form of of <PR type>: <area>: <change being made>
    • example: fix: mempool: Introduce a cache for valid signatures
    • PR type: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, test
    • area, e.g. api, chain, state, mempool, multisig, networking, paych, proving, sealing, wallet, deps
  • Update CHANGELOG.md or signal that this change does not need it.
    • If the PR affects users (e.g., new feature, bug fix, system requirements change), update the CHANGELOG.md and add details to the UNRELEASED section.
    • If the change does not require a CHANGELOG.md entry, do one of the following:
      • Add [skip changelog] to the PR title
      • Add the label skip/changelog to the PR
  • New features have usage guidelines and / or documentation updates in
  • Tests exist for new functionality or change in behavior
  • CI is green

@masih masih marked this pull request as ready for review July 23, 2024 21:53
@masih
Set up otel metrics reporting to prometheus
a592800 
Register otel collector bridging to the default prometheus registry so
that F3 metrics (which use the newer otel APIs for metrics) get included
in Lotus metrics.
@masih masih force-pushed the masih/set-up-otel-prom-bridge branch from e77921a to a592800 Compare July 23, 2024 21:54
@rjan90 rjan90 mentioned this pull request Jul 23, 2024
Merged
8 tasks
@masih masih merged commit 99a53d6 into master Jul 23, 2024
81 checks passed
@masih masih deleted the masih/set-up-otel-prom-bridge branch July 23, 2024 22:02
rjan90 added a commit that referenced this pull request Jul 23, 2024
@rjan90
Update changelog with #12285 backport
93b484f 
Update changelog with #12285 backport
rjan90 added a commit that referenced this pull request Jul 24, 2024
@rjan90 @Kubuxu
@masih @aarshkshah1992 @rvagg @ribasushi @arajasek @BigLep @jennijuju @Stebalien
build: release: v1.28.0 (#12271)
28a578f 
* Update changelog

Update changelog

* chore: lotus-shed: Add support for nv23 in `migrate-state` cmd (#12172)

* Add support for nv23 in `lotus-shed migrate-state` cmd

Add support for nv23 in `lotus-shed migrate-state` cmd

* Add actors v14 to `check-invariants` cmd

Add actors v14 to `check-invariants` cmd

* feat: F3: Update go-f3, change the style of participation call (#12196)

* Upgrade go mod F3 dependency to v0.0.3 tagged release

Use concrete/latest version of F3: v0.0.3

* update changelog

* chore!: markets: remove deal constants

* Upgrade to OpenTelemetry v1.28.0

Upgrade to new version of OpenTelemetry to also play nice with F3.

* Reduce log level in F3 message sending to Debug (#12224)

Reduce the log level for `miner with id...` to DEBUG, since in normal
operation of F3 at least 5 messages are sent per epoch. In an event of
rebroadcast the number of messages broadcasted could surpass 10. Hence,
the `DEBUG` log level.

* chore: deps: upgrade to go-state-types@v0.14.0-rc6

* Upgrade to latest go-f3 `v0.0.4` (#12237)

Upgrade to the latest go F3, with fix to default cert exchange config in
local devnet.

* chore: config: yet more lp2p removal from miner

* fix(store): correctly break weight ties based on smaller ticket (#12253)

@rjan90 and @jennijuju reported seeing this log a lot, which prompted an investigation of the logic. This code does not implement [FIP-0023](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0023.md) correctly. Specifically, if we have the following mintickets:

```
ts1: 1, 2
ts2: 0,3
```

This code will incorrectly return ts1 as the "smaller" tipset, even though the tie should have been broken in favour of ts2 based on `1 > 0`.

* Fix lint error: correct typo in F3Participation function comment

Fix lint error: correct typo in F3Participation function comment

* Fix typo in F3Participate documentation

Corrected "successfull" to "successful" in comments and documentation to fix a lint error.

* chore: libp2p: update to v0.35.4 (#12265)

* go mod tidy

go mod tidy

* Update CHANGELOG.md

Co-authored-by: Steve Loeppky <biglep@protocol.ai>

* fix a bug

* Set Mainnet upgrade epoch NV23

Set Mainnet upgrade epoch NV23

* Update changelog.md

Update changelog.md

* chore: deps: Update GST, Filecoin-FFI and Actors to final versions NV23 (#12276)

* Update to final GST for nv23

Update to final GST for nv23

* Bump filecoin-ffi to v1.28.0

Bump filecoin-ffi to v1.28.0

* Update CHANGELOG.md

Update CHANGELOG.md

* Update Builtin-actors to v14.0.0

Update Builtin-actors to v14.0.0

* Update Changelog, version-string, make gen and make docsgen

Update Changelog, version-string, make gen and make docsgen

* Re-run ./pack.sh v14 v14.0.0

Re-run ./pack.sh v14 v14.0.0

* Set up otel metrics reporting to prometheus

Register otel collector bridging to the default prometheus registry so
that F3 metrics (which use the newer otel APIs for metrics) get included
in Lotus metrics.

* Update changelog with #12285 backport

Update changelog with #12285 backport

* Revert "chore!: markets: remove deal constants"

This reverts commit d045ccb.

* Revert "chore: config: yet more lp2p removal from miner"

This reverts commit 70400c9.

* fix eth trace panic

* backport: f3: Upgrade to go-f3 `v0.0.5` (#12279) (#12288)

* chore: f3: Upgrade to go-f3 `v0.0.5` (#12279)

* Upgrade to go-f3 `v0.0.5`

Upgrade to the latest version of go-f3 with initial power table storage with far enough lookback, and dynamic manifest persistence.

---------

Co-authored-by: Jakub Sztandera <oss@kubuxu.com>
Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
Co-authored-by: Steven Allen <steven@stebalien.com>

* remove unwanted changelog

* fix import

* Revert "chore!: markets: remove deal constants"

This reverts commit d045ccb.

* Revert "chore: config: yet more lp2p removal from miner"

This reverts commit 70400c9.

* fix eth trace panic

* Update CHANGELOG.md

Co-authored-by: Jakub Sztandera <oss@kubuxu.com>

* Update CHANGELOG.md

---------

Co-authored-by: Masih H. Derkani <m@derkani.org>
Co-authored-by: Jakub Sztandera <oss@kubuxu.com>
Co-authored-by: Steven Allen <steven@stebalien.com>
Co-authored-by: Phi <orjan.roren@gmail.com>
Co-authored-by: aarshkshah1992 <aarshkshah1992@gmail.com>

---------

Co-authored-by: Jakub Sztandera <oss@kubuxu.com>
Co-authored-by: Masih H. Derkani <m@derkani.org>
Co-authored-by: aarshkshah1992 <aarshkshah1992@gmail.com>
Co-authored-by: Rod Vagg <rod@vagg.org>
Co-authored-by: Peter Rabbitson <ribasushi@leporine.io>
Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com>
Co-authored-by: Steve Loeppky <biglep@protocol.ai>
Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
Co-authored-by: Steven Allen <steven@stebalien.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kubuxu Kubuxu Kubuxu approved these changes

@rjan90 rjan90 rjan90 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@masih @Kubuxu @rjan90