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.

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

JSON Log Events #265

Merged
merged 13 commits into from
Feb 13, 2015
Merged

JSON Log Events #265

merged 13 commits into from
Feb 13, 2015

Conversation

tgerring
Copy link
Contributor

New functionality to satisfy Log Events specification.

  • New LogSystem to output from the logger without log.LstdFlags
  • New LogFormat flag to control which log system is used
  • New JsonLogger type for logging maps as JSON

Invoke JSON-only logging with ethereum -loglevel=1000 -logformat=raw

@tgerring
Copy link
Contributor Author

This needs more logging, but the structure should be in place. Implementation can be along-side existing logging by initializing the new logger: var jsonlogger = ethlogger.NewJsonLogger() then logging:

    evd := map[string]interface{}{
        "version_string": s.ClientIdentity().String(),
        "guid":           ethutil.Bytes2Hex(s.ClientIdentity().Pubkey()),
        "level":          "debug",
        "coinbase":       ethutil.Bytes2Hex(s.KeyManager().Address()),
        "eth_version":    ProtocolVersion,
    }
    jsonlogger.LogJson("starting", evd)

@tgerring tgerring changed the title JSON Log Events [WIP] JSON Log Events Feb 4, 2015
@obscuren obscuren changed the title [WIP] JSON Log Events JSON Log Events Feb 5, 2015
@tgerring
Copy link
Contributor Author

tgerring commented Feb 6, 2015

This PR needs more implementation discussion due to required context building, however it is intended to satisfy #222

@sveneh
Copy link

sveneh commented Feb 9, 2015

What is the status of this PR? What needs to be decided to merge this? I know it does not support the full spec, but as @tgerring said, enough to get us started including it into system-testing. So if this could be merged, we can already use is and see how usable it is already.

@tgerring
Copy link
Contributor Author

tgerring commented Feb 9, 2015

It's on the agenda to discuss this week while the whole Go team is together

@sveneh
Copy link

sveneh commented Feb 10, 2015

cool, please keep me and @heikoheiko updated.

@obscuren
Copy link
Contributor

@sveneh Do we need that "debugging" field? There doesn't seem to be a lot of reason to have this

@obscuren
Copy link
Contributor

@sveneh Please update your Time zone formatting according to RFC3339Nano

RFC3339Nano = "2006-01-02T15:04:05.999999999Z07:00"
              "YYYY-MM-DDTHH:MM:SS.SSSSSSZ"

Please correct me if I'm wrong but I don't think what you specified for TZ formatting is according to any RFC.

@heikoheiko
Copy link
Member

Timestamps for Kibana must be formatted according to ISO8601.
e.g. 2015-02-02T14:55:10.029235Z

Actually you don't need to provide a timestamp as it can be added by the external log forwarder.

@tgerring
Copy link
Contributor Author

Last commit updates the package so structured objects are available for each of the log types. For example:

jsonlogger.LogJson("starting", &ethlogger.LogStarting{
    ClientString:    s.ClientIdentity().String(),
    Guid:            ethutil.Bytes2Hex(s.ClientIdentity().Pubkey()),
    Coinbase:        ethutil.Bytes2Hex(s.KeyManager().Address()),
    ProtocolVersion: ProtocolVersion,
})

Additionally, the timestamp field will be auto-generated on output of all log types in the requested ISO 8601 format.

@tgerring
Copy link
Contributor Author

Events have been made aware of their own name, so the signature is updated to only require a valid LogEvent defined in logger/types.go, instead of also having to supply the JSON name inline. This should make it easy to integrate into packages currently under active development once the new types have been merged into develop.

For example:

var jsonlogger = logger.NewJsonLogger()
jsonlogger.LogJson(&logger.LogStarting{field: value, ...})

@obscuren obscuren merged commit a5ea21c into develop Feb 13, 2015
@tgerring tgerring deleted the logjson branch February 21, 2015 09:52
Zergity added a commit to Zergity/go-ethereum that referenced this pull request Apr 28, 2020
Stateless header chain verification
AusIV pushed a commit to NoteGio/go-ethereum that referenced this pull request Feb 22, 2021
maoueh pushed a commit to streamingfast/go-ethereum that referenced this pull request Aug 13, 2021
tony-ricciardi pushed a commit to tony-ricciardi/go-ethereum that referenced this pull request Jan 20, 2022
tanishqjasoria pushed a commit to tanishqjasoria/go-ethereum that referenced this pull request Oct 31, 2023
* add l1 config in genesis config (ethereum#249)

* add l1 config in genesis config

* fix lint

* Update params/config.go

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>

---------

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>

* extend node configuration (ethereum#251)

* extend node configuration

* use block number instead of hash

* accept safe, finalized and numbers for L1Confirmations

* fix typos

---------

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>

* Fix/improve node config parsing (ethereum#260)

* raise error on failed parsing

* default value

* add l1-message-type, transaction methods (ethereum#252)

* add l1-message-type, transaction methods

* goimports

* Update core/types/transaction.go

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>

* txpool l1 check, pointer change, marhsal test

* draft: start implementing l1message gas behavior

* draft: start implementing l1message gas behavior

* change to gas usage

* error comment typo

Co-authored-by: Haichen Shen <shenhaichen@gmail.com>

* goimports

* update nonce, add hash test (fails), marshal test

* goimports

* target addr cant be nil

* change call msg

* comment out test

* lint

---------

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>

* Add L1 message database (ethereum#255)

* add l1-message-type, transaction methods

* goimports

* Update core/types/transaction.go

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>

* add L1 message store to rawdb

* remove comments

* rename to l1_message

* rename variables and add comments

* write l1 msgs in a batch

* add more comments

* update tests

* allow batched and non-batched writes

* rename to accessors_l1_message

* handle error

* add range check

* fix tests

* update comments

* nit

* support blocks with 0 l1 messages

---------

Co-authored-by: Max Wolff <maxcwolff@gmail.com>
Co-authored-by: Max Wolff <max@scroll.io>

* Fix L1Message Deep Copy, Complete Bridge Tx Hash test (ethereum#269)

* deep copy value field, add tx hash test

comment

* typo

* Rename nonce to queueindex, increment sender nonce on L1 message execution (ethereum#271)

* change nonce to queueindex, increment nonce on L1 message

* fix db acccessors

* Update core/types/transaction_marshalling.go

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>

---------

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>

* Fix db inspect command (ethereum#276)

fix db inspect command

* Add l1 sync service (ethereum#256)

* extend node configuration

* add l1-message-type, transaction methods

* goimports

* Update core/types/transaction.go

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>

* use block number instead of hash

* accept safe, finalized and numbers for L1Confirmations

* add L1 message store to rawdb

* remove comments

* fix typos

* add L1 message sync service

* use l1 contract address and chain ID

* use L1DeploymentBlock

* add confirmation config

* move bridge client to separate file

* use uint64 block number

* fix bigint comparison

* rename constants

* add more logs

* rename to l1_message

* rename variables and add comments

* write l1 msgs in a batch

* add more comments

* update tests

* allow batched and non-batched writes

* rename to accessors_l1_message

* handle error

* check if config is provided

* improve sync service DB batched writes

* add range check

* fix tests

* update comments

* nit

* fix flush range and improve comments

* solve circular dependency

* update stress tests

* initialize l1 client for geth

* start sync service

* add more comments

* check nil correctly

* address comments

* fix merge

* fix genesis l1config deserialization

* add sync progress logs

* initial sync

* handle leveldb not found error

* use errors.Is

* address comments

* update DefaultPollInterval

---------

Co-authored-by: Nazarii Denha <dengaaa2002@gmail.com>
Co-authored-by: Max Wolff <maxcwolff@gmail.com>
Co-authored-by: Max Wolff <max@scroll.io>

* Add L1 message validation (ethereum#272)

* add L1 message validation

* add comments and better error handling

* handle leveldb not found error

* update incorrect condition for genesis block

* typo

* change inclusion index logic

* disable L1 message check for legacy tests

* set NumL1MessagesPerBlock to 0 in tests

* update default genesis config

* Add L1 msg validation tests (ethereum#303)

add L1 msg validation tests

* Update miner include l1 messages (ethereum#265)

* add l1-message-type, transaction methods

* goimports

* Update core/types/transaction.go

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>

* add L1 message store to rawdb

* add L1 message sync service

* remove comments

* use l1 contract address and chain ID

* extend node configuration

* use block number instead of hash

* accept safe, finalized and numbers for L1Confirmations

* fix typos

* use L1DeploymentBlock

* add confirmation config

* move bridge client to separate file

* use uint64 block number

* fix bigint comparison

* rename constants

* add more logs

* Fix/improve node config parsing (ethereum#260)

* raise error on failed parsing

* default value

* rename to l1_message

* rename variables and add comments

* write l1 msgs in a batch

* add more comments

* update tests

* allow batched and non-batched writes

* rename to accessors_l1_message

* handle error

* check if config is provided

* improve sync service DB batched writes

* include l1 messages in blocks: part 1

* add l1-message-type, transaction methods (ethereum#252)

* add l1-message-type, transaction methods

* goimports

* Update core/types/transaction.go

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>

* txpool l1 check, pointer change, marhsal test

* draft: start implementing l1message gas behavior

* draft: start implementing l1message gas behavior

* change to gas usage

* error comment typo

Co-authored-by: Haichen Shen <shenhaichen@gmail.com>

* goimports

* update nonce, add hash test (fails), marshal test

* goimports

* target addr cant be nil

* change call msg

* comment out test

* lint

---------

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>

* Add L1 message database (ethereum#255)

* add l1-message-type, transaction methods

* goimports

* Update core/types/transaction.go

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>

* add L1 message store to rawdb

* remove comments

* rename to l1_message

* rename variables and add comments

* write l1 msgs in a batch

* add more comments

* update tests

* allow batched and non-batched writes

* rename to accessors_l1_message

* handle error

* add range check

* fix tests

* update comments

* nit

* support blocks with 0 l1 messages

---------

Co-authored-by: Max Wolff <maxcwolff@gmail.com>
Co-authored-by: Max Wolff <max@scroll.io>

* build(docker): auto docker push when pushing git tags (ethereum#258)

* build(docker): update docker trigger tag prefix (ethereum#259)

* Fix L1Message Deep Copy, Complete Bridge Tx Hash test (ethereum#269)

* deep copy value field, add tx hash test

comment

* typo

* commitl1messages

* lint

* Revert "add L1 message sync service"

This reverts commit 5305e8a.

* Revert "move bridge client to separate file"

This reverts commit 0b220be.

* update branch

* use commitMessages for l1Txs

* little fix

* fix config

* fix test

* comment fixes

* fix

* fix config check

---------

Co-authored-by: Max Wolff <maxcwolff@gmail.com>
Co-authored-by: Max Wolff <max@scroll.io>
Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>

* Add ErrUnknownAncestor tests (ethereum#305)

add ErrUnknownAncestor tests

* worker test include l1 msgs (ethereum#306)

* worker test include l1 msgs

* move L1 message index update next to block insertion

---------

Co-authored-by: Péter Garamvölgyi <peter@scroll.io>

* exclude l1 messages from transaction count limit in block (ethereum#307)

* exclude l1 messages from transaction count limit in block

* fix comments

* trigger ci

* nit

---------

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>

* Expose queueIndex on Transaction (ethereum#316)

expose queueIndex on Transaction

* test that l1msg doesn't count in maxTxPerBlock limit (ethereum#312)

* test that l1msg doesn't count in maxTxPerBlock limit

* fix, comment

* retrigger ci

* change order inside test

---------

Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>

* reuse trace nonce field for queueIndex

* expose scroll APIs on the geth console

* add L1 message query APIs

* Trigger new block on new l1 messages (ethereum#343)

* trigger new block on new l1 messages

* typo

* initialize l1MsgCh

* fix worker l1msg tests (ethereum#345)

---------

Co-authored-by: Nazarii Denha <dengaaa2002@gmail.com>

* test(worker): ensure that l1 messages are included in the correct order (ethereum#346)

test that l1msgs added in correct order

* rename enqueueIndex --> queueIndex

* move QueueIndex into transaction

* improve l1 db interface

* formatting

* bump version

* print l1config

* add API to query latest included message queue index

* clean up tx limit logic

* add clarifying comments and todos to ValidateL1Messages

* improve db comments and logs

* clean up L1MessageTx type handling

* format

* format

* improve L1 message block check

* fix missing L1 event handling

* fix TestL1MessageValidationFailure

* simplify sync height resume logic

* make l1Config.l1MessageQueueAddress non-pointer

* improve command line flags

* remove todo

* use abigen tools for log filtering

* cache block L1 message count

* nit: fix variable name case

* improve logs

* flush pending writes to DB before shutdown

---------

Co-authored-by: Nazarii Denha <dengaaa2002@gmail.com>
Co-authored-by: Max Wolff <max@scroll.io>
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
Co-authored-by: Max Wolff <maxcwolff@gmail.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
weiihann pushed a commit to weiihann/go-ethereum that referenced this pull request Nov 30, 2023
activate proof generation on fork  + remove code dups

use go-verkle's post-state API to verify proofs (ethereum#262)

use prague as the verkle activation fork (ethereum#263)

upgrade to latest go-ipa

activate verkle transition in "miner" (ethereum#265)

fix: do not force cancunTime upon verkle activation

workaround: do not use root translation in replay

workaround: deactivate overlay transition for now

fixes from trying to get the devnet to work (ethereum#267)

this line was left out from the previous commit

upgrade to go-verkle with fixed newvalue serialization

fix: ensure point cache isn't nil in copy (ethereum#268)

fix: dependency cycle in tests (ethereum#269)

upgrade to latest go-verkle

fix: write trie preimage data to db (ethereum#274)

fix: zero-root in produced block + sync (ethereum#275)

upgrade go-ipa

fix build

fix typo

include review feedback

add switch to add proofs to blocks (ethereum#278)

add fee recipient to witness (ethereum#279)

touch all fields in withdrawal account header (ethereum#277)
maoueh pushed a commit to streamingfast/go-ethereum that referenced this pull request Apr 29, 2024
luanxu-mxc pushed a commit to MXCzkEVM/mxc-geth that referenced this pull request Sep 2, 2024
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.

4 participants