Skip to content

Commit

Permalink
chore: upgrade lotus to v1.28.1 (#1309)
Browse files Browse the repository at this point in the history
  • Loading branch information
Terryhung authored Jul 29, 2024
1 parent f9a7da1 commit feba40f
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 73 deletions.
7 changes: 3 additions & 4 deletions commands/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
prom "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/collectors"
"go.opencensus.io/stats/view"
octrace "go.opencensus.io/trace"
"go.opencensus.io/zpages"
"go.opentelemetry.io/otel"

"go.opentelemetry.io/otel/bridge/opencensus"

"github.com/filecoin-project/lily/metrics"
Expand Down Expand Up @@ -175,9 +175,8 @@ func setupTracing(flags LilyTracingOpts) error {
return fmt.Errorf("setup tracing: %w", err)
}
otel.SetTracerProvider(tp)
// upgrades libraries (lotus) that use OpenCensus to OpenTelemetry to facilitate a migration.
tracer := tp.Tracer(LilyTracingFlags.ServiceName)
octrace.DefaultTracer = opencensus.NewTracer(tracer)

opencensus.InstallTraceBridge(opencensus.WithTracerProvider(tp))

return nil
}
49 changes: 26 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ require (
github.com/filecoin-project/go-hamt-ipld/v3 v3.3.1-0.20230511074215-a0b13f309e1b
github.com/filecoin-project/go-jsonrpc v0.3.2
github.com/filecoin-project/go-paramfetch v0.0.4
github.com/filecoin-project/go-state-types v0.14.0-rc5
github.com/filecoin-project/lotus v1.28.0-rc5
github.com/filecoin-project/go-state-types v0.14.0
github.com/filecoin-project/lotus v1.28.1
github.com/filecoin-project/specs-actors v0.9.15
github.com/filecoin-project/specs-actors/v2 v2.3.6
github.com/filecoin-project/specs-actors/v3 v3.1.2
Expand Down Expand Up @@ -46,15 +46,15 @@ require (
github.com/urfave/cli/v2 v2.25.5
github.com/whyrusleeping/cbor-gen v0.1.1
go.opencensus.io v0.24.0
go.opentelemetry.io/otel v1.26.0
go.opentelemetry.io/otel/bridge/opencensus v0.39.0
go.opentelemetry.io/otel v1.28.0
go.opentelemetry.io/otel/bridge/opencensus v1.28.0
go.opentelemetry.io/otel/exporters/jaeger v1.14.0
go.opentelemetry.io/otel/sdk v1.26.0
go.uber.org/fx v1.21.1
go.opentelemetry.io/otel/sdk v1.28.0
go.uber.org/fx v1.22.1
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
golang.org/x/sync v0.7.0
golang.org/x/text v0.15.0
golang.org/x/text v0.16.0
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
gopkg.in/cheggaaa/pb.v1 v1.0.28
)
Expand All @@ -72,9 +72,9 @@ require (
github.com/ipfs/go-ipld-format v0.6.0
github.com/ipld/go-ipld-prime v0.21.0
github.com/jedib0t/go-pretty/v6 v6.2.7
github.com/libp2p/go-libp2p v0.35.0
github.com/libp2p/go-libp2p v0.35.4
github.com/multiformats/go-varint v0.0.7
go.opentelemetry.io/otel/trace v1.26.0
go.opentelemetry.io/otel/trace v1.28.0
go.uber.org/atomic v1.11.0
)

Expand Down Expand Up @@ -122,10 +122,11 @@ require (
github.com/fatih/color v1.15.0 // indirect
github.com/filecoin-project/filecoin-ffi v1.28.0-rc2 // indirect
github.com/filecoin-project/go-cbor-util v0.0.1 // indirect
github.com/filecoin-project/go-clock v0.1.0 // indirect
github.com/filecoin-project/go-commp-utils v0.1.3 // indirect
github.com/filecoin-project/go-commp-utils/nonffi v0.0.0-20220905160352-62059082a837 // indirect
github.com/filecoin-project/go-crypto v0.0.1 // indirect
github.com/filecoin-project/go-f3 v0.0.3-0.20240702063402-d48771055cf4 // indirect
github.com/filecoin-project/go-f3 v0.0.7 // indirect
github.com/filecoin-project/go-fil-commcid v0.1.0 // indirect
github.com/filecoin-project/go-hamt-ipld v0.1.5 // indirect
github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 // indirect
Expand All @@ -144,7 +145,7 @@ require (
github.com/georgysavva/scany/v2 v2.1.3 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/go-pg/zerochecker v0.2.0 // indirect
Expand All @@ -162,7 +163,7 @@ require (
github.com/google/pprof v0.0.0-20240509144519-723abb6459b7 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026 // indirect
github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand Down Expand Up @@ -245,6 +246,7 @@ require (
github.com/multiformats/go-multibase v0.2.0 // indirect
github.com/multiformats/go-multicodec v0.9.0 // indirect
github.com/multiformats/go-multistream v0.5.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nikkolasg/hexjson v0.1.0 // indirect
github.com/nkovacs/streamquote v1.0.0 // indirect
github.com/onsi/ginkgo/v2 v2.17.3 // indirect
Expand All @@ -254,7 +256,7 @@ require (
github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9 // indirect
github.com/pion/datachannel v1.5.6 // indirect
github.com/pion/dtls/v2 v2.2.11 // indirect
github.com/pion/ice/v2 v2.3.24 // indirect
github.com/pion/ice/v2 v2.3.25 // indirect
github.com/pion/interceptor v0.1.29 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/mdns v0.0.12 // indirect
Expand All @@ -272,8 +274,8 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/polydawn/refmt v0.89.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.53.0 // indirect
github.com/prometheus/procfs v0.15.0 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
github.com/puzpuzpuz/xsync/v2 v2.4.0 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
Expand Down Expand Up @@ -311,23 +313,24 @@ require (
github.com/zondax/ledger-filecoin-go v0.11.1 // indirect
github.com/zondax/ledger-go v0.14.3 // indirect
github.com/zyedidia/generic v1.2.1 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
go.uber.org/dig v1.17.1 // indirect
go.uber.org/mock v0.4.0 // indirect
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
Expand Down
Loading

0 comments on commit feba40f

Please sign in to comment.