chore: use imported telemetry types, clean bandwith metrics #5674
+961
−462
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jenkins BuildsClick to see older builds (40)
|
vpavlin
commented
Aug 8, 2024
go.mod
Outdated
| @@ -292,3 +293,5 @@ require ( | |||
| modernc.org/sqlite v1.14.2-0.20211125151325-d4ed92c0a70f // indirect | |||
| zombiezen.com/go/sqlite v0.8.0 // indirect | |||
| ) | |||
|
|
|||
| replace github.com/status-im/dev-telemetry => github.com/vpavlin/telemetry v0.0.0-20240807100636-642385d153a3 | |||
There was a problem hiding this comment.
This needs to be fixed before merging! Depends on status-im/telemetry#37
vpavlin
force-pushed
the
chore/telemetry-types
branch
6 times, most recently
from
fa53483
to
9a6a644
Compare
vpavlin
force-pushed
the
chore/telemetry-types
branch
2 times, most recently
from
90026cd
to
0217643
Compare
vpavlin
force-pushed
the
chore/telemetry-types
branch
from
0217643
to
54ed67f
Compare
|
Rebased, tests seem to be running/happy, dropping |
Comment on lines
+14
to
+26
| type ProtocolStatsMap map[protocol.ID]metrics.Stats | ||
|
|
||
| type SentEnvelope struct { | ||
| Envelope *wakuv2protocol.Envelope | ||
| PublishMethod common.PublishMethod | ||
| } | ||
|
|
||
| type ErrorSendingEnvelope struct { | ||
| Error error | ||
| SentEnvelope SentEnvelope | ||
| } | ||
|
|
||
| type ITelemetryClient interface { |
There was a problem hiding this comment.
Should these types live in status-im/telemetry?
There was a problem hiding this comment.
Good question, they probably could be. I kept them in status-go because they are used in processAndPushTelemetry (https://github.com/status-im/status-go/pull/5674/files#diff-6a98f0c7655c1846990bd03c6d7c1feab2b2d96ae9cf14b3bcd3d5c3677af6ffR199) along types like v2protocol.Envelope and some other defined in the client.
I'd say we could keep it this way as the next step still is to move the whole client to telemetry repo and that will require some more thoughts on the API and/or how to abstract it.
But also happy move it now if that is the preference
There was a problem hiding this comment.
nah was just curious! PR looks good already!
richard-ramos
approved these changes
Aug 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR switches from using
maps for telemetry data to using types exported bytelemetrythe project. It also removes extra/separate telemetry client for Waku bandwith metricsImportant changes:
waku/telemetry.goin favour of usingtelemetry/client.gogithub.com/status-im/telemetryfortelemetry/pkg/typesmapwith explicit types/structs