Update cadence/flow-go/flow-go-sdk/flow-emulator dependencies
#738
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| # BUILD BIN | ||
|
|
||
| FROM golang:1.23 as app-builder | ||
|
|
||
| # Build the app binary in /app | ||
| WORKDIR /app | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ import ( | |
| "github.com/onflow/flow-go/fvm/evm" | ||
| flowGo "github.com/onflow/flow-go/model/flow" | ||
| "github.com/onflow/flow-go/module/component" | ||
| "github.com/onflow/flow-go/module/irrecoverable" | ||
| flowMetrics "github.com/onflow/flow-go/module/metrics" | ||
| "github.com/onflow/flow-go/module/util" | ||
| gethTypes "github.com/onflow/go-ethereum/core/types" | ||
|
|
@@ -368,10 +369,29 @@ func (b *Bootstrap) StartMetricsServer(ctx context.Context) error { | |
| b.logger.Info().Msg("bootstrap starting metrics server") | ||
|
|
||
| b.metrics = flowMetrics.NewServer(b.logger, uint(b.config.MetricsPort)) | ||
|
Contributor
There was a problem hiding this comment. looks like metrics server is a component. why remove these?
Collaborator
Author
There was a problem hiding this comment. That's a good question! So the metrics server became a component in this commit: onflow/flow-go@4c8ac17. Which means that with: err := util.WaitClosed(ctx, b.metrics.Ready())The entire test suite would fail, due to indefinite blocking. The same goes for the shutdown of the metrics server: <-b.metrics.Done()I had to remove the above line. The flow-go commit I linked above, was intended to be used from this PR: #682. I am unsure as to how to proceed here..
Contributor
There was a problem hiding this comment. I'll take a look today.
Collaborator
Author
There was a problem hiding this comment.
@janezpodhostnik That piece of code works like a charm 💯 Could you prepare that PR and merge on this one? |
||
|
|
||
| // this logic is needed since the metric server is a component. | ||
| // we need to start and stop it manually here. | ||
|
|
||
| ictx, errCh := irrecoverable.WithSignaler(ctx) | ||
| b.metrics.Start(ictx) | ||
| if err := util.WaitClosed(ctx, b.metrics.Ready()); err != nil { | ||
m-Peter marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return fmt.Errorf("failed to start metrics server: %w", err) | ||
| } | ||
| select { | ||
| case err := <-errCh: | ||
| // there might be an error already if the startup failed | ||
| return err | ||
| default: | ||
| } | ||
|
|
||
| go func() { | ||
| err := <-errCh | ||
| if err != nil { | ||
| b.logger.Err(err).Msg("error in metrics server") | ||
| panic(err) | ||
| } | ||
| }() | ||
|
|
||
m-Peter marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return nil | ||
| } | ||
|
|
@@ -380,8 +400,8 @@ func (b *Bootstrap) StopMetricsServer() { | |
| if b.metrics == nil { | ||
| return | ||
| } | ||
| <-b.metrics.Done() | ||
| b.logger.Warn().Msg("shutting down metrics server") | ||
| } | ||
|
|
||
| func (b *Bootstrap) StartProfilerServer(_ context.Context) error { | ||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.