Commit 8b87c902 authored by Hamdi Allam's avatar Hamdi Allam Committed by GitHub

Merge pull request #8583 from ethereum-optimism/indexer.bridge.metrics.fix

fix(indexer) metrics exception which recording skipped ovm1 events
parents 54f38642 0792380d
DO $$ DO $$
BEGIN BEGIN
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'uint256') THEN IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'uint256') THEN
...@@ -57,13 +56,14 @@ CREATE TABLE IF NOT EXISTS l1_contract_events ( ...@@ -57,13 +56,14 @@ CREATE TABLE IF NOT EXISTS l1_contract_events (
timestamp INTEGER NOT NULL CHECK (timestamp > 0), timestamp INTEGER NOT NULL CHECK (timestamp > 0),
-- Raw Data -- Raw Data
rlp_bytes VARCHAR NOT NULL rlp_bytes VARCHAR NOT NULL,
UNIQUE(block_hash, log_index)
); );
CREATE INDEX IF NOT EXISTS l1_contract_events_timestamp ON l1_contract_events(timestamp); CREATE INDEX IF NOT EXISTS l1_contract_events_timestamp ON l1_contract_events(timestamp);
CREATE INDEX IF NOT EXISTS l1_contract_events_block_hash ON l1_contract_events(block_hash); CREATE INDEX IF NOT EXISTS l1_contract_events_block_hash ON l1_contract_events(block_hash);
CREATE INDEX IF NOT EXISTS l1_contract_events_event_signature ON l1_contract_events(event_signature); CREATE INDEX IF NOT EXISTS l1_contract_events_event_signature ON l1_contract_events(event_signature);
CREATE INDEX IF NOT EXISTS l1_contract_events_contract_address ON l1_contract_events(contract_address); CREATE INDEX IF NOT EXISTS l1_contract_events_contract_address ON l1_contract_events(contract_address);
ALTER TABLE l1_contract_events ADD UNIQUE (block_hash, log_index);
CREATE TABLE IF NOT EXISTS l2_contract_events ( CREATE TABLE IF NOT EXISTS l2_contract_events (
-- Searchable fields -- Searchable fields
...@@ -76,13 +76,14 @@ CREATE TABLE IF NOT EXISTS l2_contract_events ( ...@@ -76,13 +76,14 @@ CREATE TABLE IF NOT EXISTS l2_contract_events (
timestamp INTEGER NOT NULL CHECK (timestamp > 0), timestamp INTEGER NOT NULL CHECK (timestamp > 0),
-- Raw Data -- Raw Data
rlp_bytes VARCHAR NOT NULL rlp_bytes VARCHAR NOT NULL,
UNIQUE(block_hash, log_index)
); );
CREATE INDEX IF NOT EXISTS l2_contract_events_timestamp ON l2_contract_events(timestamp); CREATE INDEX IF NOT EXISTS l2_contract_events_timestamp ON l2_contract_events(timestamp);
CREATE INDEX IF NOT EXISTS l2_contract_events_block_hash ON l2_contract_events(block_hash); CREATE INDEX IF NOT EXISTS l2_contract_events_block_hash ON l2_contract_events(block_hash);
CREATE INDEX IF NOT EXISTS l2_contract_events_event_signature ON l2_contract_events(event_signature); CREATE INDEX IF NOT EXISTS l2_contract_events_event_signature ON l2_contract_events(event_signature);
CREATE INDEX IF NOT EXISTS l2_contract_events_contract_address ON l2_contract_events(contract_address); CREATE INDEX IF NOT EXISTS l2_contract_events_contract_address ON l2_contract_events(contract_address);
ALTER TABLE l2_contract_events ADD UNIQUE (block_hash, log_index);
/** /**
* BRIDGING DATA * BRIDGING DATA
......
...@@ -227,11 +227,11 @@ func (m *bridgeMetrics) RecordL1CrossDomainRelayedMessages(size int) { ...@@ -227,11 +227,11 @@ func (m *bridgeMetrics) RecordL1CrossDomainRelayedMessages(size int) {
} }
func (m *bridgeMetrics) RecordL1SkippedOVM1ProvenWithdrawals(size int) { func (m *bridgeMetrics) RecordL1SkippedOVM1ProvenWithdrawals(size int) {
m.skippedOVM1Withdrawals.WithLabelValues("stage", "proven").Add(float64(size)) m.skippedOVM1Withdrawals.WithLabelValues("proven").Add(float64(size))
} }
func (m *bridgeMetrics) RecordL1SkippedOVM1FinalizedWithdrawals(size int) { func (m *bridgeMetrics) RecordL1SkippedOVM1FinalizedWithdrawals(size int) {
m.skippedOVM1Withdrawals.WithLabelValues("stage", "finalized").Add(float64(size)) m.skippedOVM1Withdrawals.WithLabelValues("finalized").Add(float64(size))
} }
func (m *bridgeMetrics) RecordL1SkippedOVM1CrossDomainRelayedMessages(size int) { func (m *bridgeMetrics) RecordL1SkippedOVM1CrossDomainRelayedMessages(size int) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment