diff --git a/waku/persistence/store.go b/waku/persistence/store.go index cabc2cbf..339cdbee 100644 --- a/waku/persistence/store.go +++ b/waku/persistence/store.go @@ -290,7 +290,7 @@ func (d *DBStore) Put(env *protocol.Envelope) error { return err } ellapsed := time.Since(start) - stats.Record(metrics.ArchiveInsertDurationSeconds.M(int64(ellapsed.Seconds()))) + stats.Record(context.Background(), metrics.ArchiveInsertDurationSeconds.M(int64(ellapsed.Seconds()))) err = stmt.Close() if err != nil { @@ -411,7 +411,7 @@ func (d *DBStore) Query(query *pb.HistoryQuery) (*pb.Index, []StoredMessage, err return nil, nil, err } ellapsed := time.Since(measurementStart) - stats.Record(metrics.ArchiveQueryDurationSeconds.M(int64(ellapsed.Seconds()))) + stats.Record(context.Background(), metrics.ArchiveQueryDurationSeconds.M(int64(ellapsed.Seconds()))) var result []StoredMessage for rows.Next() { diff --git a/waku/v2/metrics/metrics.go b/waku/v2/metrics/metrics.go index 13d98295..73134663 100644 --- a/waku/v2/metrics/metrics.go +++ b/waku/v2/metrics/metrics.go @@ -35,10 +35,10 @@ var ( StoreErrors = stats.Int64("errors", "Number of errors in store protocol", stats.UnitDimensionless) StoreQueries = stats.Int64("store_queries", "Number of store queries", stats.UnitDimensionless) - ArchiveMessages = stats.Int64("gowaku_archive_messages", "Number of historical messages", stats.UnitDimensionless) - ArchiveErrors = stats.Int64("gowaku_archive_errors", "Number of errors in archive protocol", stats.UnitDimensionless) - ArchiveInsertDurationSeconds = stats.Int64("gowaku_archive_insert_duration_seconds", "Message insertion duration", stats.UnitSeconds) - ArchiveQueryDurationSeconds = stats.Int64("gowaku_archive_query_duration_seconds", "History query duration", stats.UnitSeconds) + ArchiveMessages = stats.Int64("waku_archive_messages", "Number of historical messages", stats.UnitDimensionless) + ArchiveErrors = stats.Int64("waku_archive_errors", "Number of errors in archive protocol", stats.UnitDimensionless) + ArchiveInsertDurationSeconds = stats.Int64("waku_archive_insert_duration_seconds", "Message insertion duration", stats.UnitSeconds) + ArchiveQueryDurationSeconds = stats.Int64("waku_archive_query_duration_seconds", "History query duration", stats.UnitSeconds) LightpushMessages = stats.Int64("lightpush_messages", "Number of messages sent via lightpush protocol", stats.UnitDimensionless) LightpushErrors = stats.Int64("errors", "Number of errors in lightpush protocol", stats.UnitDimensionless) @@ -59,38 +59,38 @@ var ( var ( PeersView = &view.View{ - Name: "gowaku_connected_peers", + Name: "waku_connected_peers", Measure: Peers, Description: "Number of connected peers", Aggregation: view.Sum(), } DialsView = &view.View{ - Name: "gowaku_peers_dials", + Name: "waku_peers_dials", Measure: Dials, Description: "Number of peer dials", Aggregation: view.Count(), } MessageView = &view.View{ - Name: "gowaku_node_messages", + Name: "waku_node_messages", Measure: Messages, Description: "The number of the messages received", Aggregation: view.Count(), } MessageSizeView = &view.View{ - Name: "gowaku_histogram_message_size", + Name: "waku_histogram_message_size", Measure: MessageSize, Description: "message size histogram in kB", Aggregation: view.Distribution(0.0, 5.0, 15.0, 50.0, 100.0, 300.0, 700.0, 1000.0), } StoreQueriesView = &view.View{ - Name: "gowaku_store_queries", + Name: "waku_store_queries", Measure: StoreQueries, Description: "The number of the store queries received", Aggregation: view.Count(), } StoreErrorTypesView = &view.View{ - Name: "gowaku_store_errors", + Name: "waku_store_errors", Measure: StoreErrors, Description: "The distribution of the store protocol errors", Aggregation: view.Count(), @@ -98,54 +98,53 @@ var ( } ArchiveMessagesView = &view.View{ - Name: "gowaku_archive_messages", + Name: "waku_archive_messages", Measure: ArchiveMessages, Description: "The distribution of the archive protocol messages", Aggregation: view.LastValue(), TagKeys: []tag.Key{KeyType}, } ArchiveErrorTypesView = &view.View{ - Name: "gowaku_archive_errors", + Name: "waku_archive_errors", Measure: StoreErrors, Description: "Number of errors in archive protocol", Aggregation: view.Count(), TagKeys: []tag.Key{ErrorType}, } - ArchiveInsertDurationView = &view.View{ - Name: "gowaku_archive_insert_duration_seconds", + Name: "waku_archive_insert_duration_seconds", Measure: ArchiveInsertDurationSeconds, Description: "Message insertion duration", Aggregation: view.Count(), } ArchiveQueryDurationView = &view.View{ - Name: "gowaku_archive_query_duration_seconds", + Name: "waku_archive_query_duration_seconds", Measure: ArchiveQueryDurationSeconds, Description: "History query duration", Aggregation: view.Count(), } LegacyFilterSubscriptionsView = &view.View{ - Name: "gowaku_legacy_filter_subscriptions", + Name: "waku_legacy_filter_subscriptions", Measure: LegacyFilterSubscriptions, Description: "The number of legacy filter subscriptions", Aggregation: view.Count(), } LegacyFilterSubscribersView = &view.View{ - Name: "gowaku_legacy_filter_subscribers", + Name: "waku_legacy_filter_subscribers", Measure: LegacyFilterSubscribers, Description: "The number of legacy filter subscribers", Aggregation: view.LastValue(), } LegacyFilterMessagesView = &view.View{ - Name: "gowaku_legacy_filter_messages", + Name: "waku_legacy_filter_messages", Measure: LegacyFilterMessages, Description: "The distribution of the legacy filter protocol messages received", Aggregation: view.Count(), TagKeys: []tag.Key{KeyType}, } LegacyFilterErrorTypesView = &view.View{ - Name: "gowaku_legacy_filter_errors", + Name: "waku_legacy_filter_errors", Measure: LegacyFilterErrors, Description: "The distribution of the legacy filter protocol errors", Aggregation: view.Count(), @@ -153,26 +152,26 @@ var ( } FilterSubscriptionsView = &view.View{ - Name: "gowaku_filter_subscriptions", + Name: "waku_filter_subscriptions", Measure: FilterSubscriptions, Description: "The number of filter subscriptions", Aggregation: view.Count(), } FilterRequestsView = &view.View{ - Name: "gowaku_filter_requests", + Name: "waku_filter_requests", Measure: FilterRequests, Description: "The number of filter requests", Aggregation: view.Count(), } FilterMessagesView = &view.View{ - Name: "gowaku_filter_messages", + Name: "waku_filter_messages", Measure: FilterMessages, Description: "The distribution of the filter protocol messages received", Aggregation: view.Count(), TagKeys: []tag.Key{KeyType}, } FilterErrorTypesView = &view.View{ - Name: "gowaku_filter_errors", + Name: "waku_filter_errors", Measure: FilterErrors, Description: "The distribution of the filter protocol errors", Aggregation: view.Count(), @@ -180,54 +179,54 @@ var ( } FilterRequestDurationView = &view.View{ - Name: "gowaku_filter_request_duration_seconds", + Name: "waku_filter_request_duration_seconds", Measure: FilterRequestDurationSeconds, Description: "Duration of Filter Subscribe Requests", Aggregation: view.Count(), } FilterHandleMessageDurationView = &view.View{ - Name: "gowaku_filter_handle_msessageduration_seconds", + Name: "waku_filter_handle_msessageduration_seconds", Measure: FilterHandleMessageDurationSeconds, Description: "Duration to Push Message to Filter Subscribers", Aggregation: view.Count(), } LightpushMessagesView = &view.View{ - Name: "gowaku_lightpush_messages", + Name: "waku_lightpush_messages", Measure: LightpushMessages, Description: "The distribution of the lightpush protocol messages", Aggregation: view.LastValue(), TagKeys: []tag.Key{KeyType}, } LightpushErrorTypesView = &view.View{ - Name: "gowaku_lightpush_errors", + Name: "waku_lightpush_errors", Measure: LightpushErrors, Description: "The distribution of the lightpush protocol errors", Aggregation: view.Count(), TagKeys: []tag.Key{ErrorType}, } VersionView = &view.View{ - Name: "gowaku_version", + Name: "waku_version", Measure: WakuVersion, Description: "The gowaku version", Aggregation: view.LastValue(), TagKeys: []tag.Key{GitVersion}, } DnsDiscoveryNodesView = &view.View{ - Name: "gowaku_dnsdisc_discovered", + Name: "waku_dnsdisc_discovered", Measure: DnsDiscoveryNodes, Description: "The number of nodes discovered via DNS discovery", Aggregation: view.Count(), } DnsDiscoveryErrorTypesView = &view.View{ - Name: "gowaku_dnsdisc_errors", + Name: "waku_dnsdisc_errors", Measure: DnsDiscoveryErrors, Description: "The distribution of the dns discovery protocol errors", Aggregation: view.Count(), TagKeys: []tag.Key{ErrorType}, } DiscV5ErrorTypesView = &view.View{ - Name: "gowaku_discv5_errors", + Name: "waku_discv5_errors", Measure: DiscV5Errors, Description: "The distribution of the discv5 protocol errors", Aggregation: view.Count(),