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

New tracing #3450

Merged
merged 17 commits into from
Jan 12, 2022
Merged

New tracing #3450

merged 17 commits into from
Jan 12, 2022

Conversation

deepfire
Copy link
Contributor

@deepfire deepfire commented Dec 17, 2021

This integrates the new tracing system in cardano-node:

  1. The accumulated changes in trace-dispatcher
  2. The integration in cardano-node
  3. The differential trace-analyzer
  4. Small update in tx-generator
  5. Improvement in queue switching in trace-forward
  6. Small update in trace-resources
  7. Very basic workbench integration

Note: I've only just opened the PR -- all the heavy work was done by @jutaro and @denisshevchenko, who get all the credit!

Note: this branch has a very squashed history, for many months of development -- for the historic branch, please see https://github.com/input-output-hk/cardano-node/tree/tracing-master-history

How to try out?

Just run ./scripts/lite/mainnet-new-tracing.sh -- which uses this configuration: https://github.com/input-output-hk/cardano-node/tree/new-tracing/configuration/cardano/mainnet-config-new-tracing.yaml#L41-L82

Copy link
Contributor

@Jimbo4350 Jimbo4350 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some initial thoughts, I made a quick pass to see if any changes would have resulted in the Plutus test failure. It doesn't seem so. I'll make another pass when the PR is actually ready for review.

cardano-node/cardano-node.cabal Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Node/Configuration/Logging.hs Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Node/Configuration/Logging.hs Outdated Show resolved Hide resolved
@deepfire deepfire force-pushed the new-tracing branch 2 times, most recently from e694703 to 184ecbe Compare December 21, 2021 17:16
@deepfire deepfire force-pushed the new-tracing branch 7 times, most recently from 3cb7c9e to 844b9e2 Compare January 6, 2022 15:04
Copy link
Contributor

@Jimbo4350 Jimbo4350 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few comments. I thought the consensus was to not use Condense instances provided by ouroboros-network and to implement our own ToJSON instances?

bench/trace-analyzer/LICENSE Outdated Show resolved Hide resolved
bench/trace-analyzer/NOTICE Outdated Show resolved Hide resolved
bench/trace-analyzer/README.md Show resolved Hide resolved
bench/trace-analyzer/trace-analyzer.cabal Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Node/Types.hs Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Tracing/Config.hs Show resolved Hide resolved
cardano-node/src/Cardano/Tracing/OrphanInstances/Common.hs Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Tracing/Shutdown.hs Show resolved Hide resolved
cardano-node/src/Cardano/Tracing/Shutdown.hs Show resolved Hide resolved
@@ -0,0 +1,148 @@
# New Tracing Quickstart
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be at the top level.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Jimbo4350, done

Copy link
Contributor Author

@deepfire deepfire Jan 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea was to temporarily increase visibility of the Quickstart for the new tracing system -- as we would like people to start playing with it.

But I guess it could live in doc/ as well.

@deepfire deepfire force-pushed the new-tracing branch 2 times, most recently from b470c24 to 80f9527 Compare January 12, 2022 16:18
Copy link
Contributor

@Jimbo4350 Jimbo4350 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mainly style fixes. Happy to green light after.

cardano-node/src/Cardano/Node/Configuration/NodeAddress.hs Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Node/Configuration/NodeAddress.hs Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Node/Configuration/POM.hs Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Node/Protocol/Byron.hs Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Node/Protocol/Byron.hs Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs Outdated Show resolved Hide resolved

namesStartupInfo :: StartupTrace blk -> [Text]
namesStartupInfo = \case
StartupInfo {} -> ["StartupInfo"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alignment

, npcByronGenesisFileHash :: !(Maybe GenesisHash)
, npcByronReqNetworkMagic :: !RequiresNetworkMagic
, npcByronPbftSignatureThresh :: !(Maybe Double)
npcByronGenesisFile :: !GenesisFile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A perfect example of my we enforce not aligning code. It introduces unnecessary diff.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see what you mean

cardano-node/src/Cardano/Tracing/Startup.hs Show resolved Hide resolved
@Jimbo4350 Jimbo4350 self-requested a review January 12, 2022 21:15
@jutaro
Copy link
Contributor

jutaro commented Jan 12, 2022

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 12, 2022

Build succeeded:

@iohk-bors iohk-bors bot merged commit e5d32b3 into master Jan 12, 2022
@iohk-bors iohk-bors bot deleted the new-tracing branch January 12, 2022 22:40
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.

6 participants