diff --git a/gno.land/cmd/gnoland/start.go b/gno.land/cmd/gnoland/start.go index 763a81667a0..4eaf9618648 100644 --- a/gno.land/cmd/gnoland/start.go +++ b/gno.land/cmd/gnoland/start.go @@ -13,7 +13,6 @@ import ( "github.com/gnolang/gno/gno.land/pkg/gnoland" "github.com/gnolang/gno/gno.land/pkg/log" "github.com/gnolang/gno/gnovm/pkg/gnoenv" - "github.com/gnolang/gno/telemetry" abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" "github.com/gnolang/gno/tm2/pkg/bft/config" "github.com/gnolang/gno/tm2/pkg/bft/node" @@ -26,6 +25,7 @@ import ( "github.com/gnolang/gno/tm2/pkg/crypto" osm "github.com/gnolang/gno/tm2/pkg/os" "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/telemetry" "go.uber.org/zap/zapcore" ) diff --git a/tm2/pkg/bft/consensus/state.go b/tm2/pkg/bft/consensus/state.go index a16a9d2f53d..233a2de65d9 100644 --- a/tm2/pkg/bft/consensus/state.go +++ b/tm2/pkg/bft/consensus/state.go @@ -11,8 +11,6 @@ import ( "sync" "time" - "github.com/gnolang/gno/telemetry" - "github.com/gnolang/gno/telemetry/metrics" "github.com/gnolang/gno/tm2/pkg/amino" cnscfg "github.com/gnolang/gno/tm2/pkg/bft/consensus/config" cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" @@ -27,6 +25,8 @@ import ( osm "github.com/gnolang/gno/tm2/pkg/os" "github.com/gnolang/gno/tm2/pkg/p2p" "github.com/gnolang/gno/tm2/pkg/service" + "github.com/gnolang/gno/tm2/pkg/telemetry" + "github.com/gnolang/gno/tm2/pkg/telemetry/metrics" ) // ----------------------------------------------------------------------------- diff --git a/tm2/pkg/p2p/switch.go b/tm2/pkg/p2p/switch.go index d24240f731e..ac24a2a45b7 100644 --- a/tm2/pkg/p2p/switch.go +++ b/tm2/pkg/p2p/switch.go @@ -7,14 +7,14 @@ import ( "sync" "time" - "github.com/gnolang/gno/telemetry" - "github.com/gnolang/gno/telemetry/metrics" "github.com/gnolang/gno/tm2/pkg/cmap" "github.com/gnolang/gno/tm2/pkg/errors" "github.com/gnolang/gno/tm2/pkg/p2p/config" "github.com/gnolang/gno/tm2/pkg/p2p/conn" "github.com/gnolang/gno/tm2/pkg/random" "github.com/gnolang/gno/tm2/pkg/service" + "github.com/gnolang/gno/tm2/pkg/telemetry" + "github.com/gnolang/gno/tm2/pkg/telemetry/metrics" ) const ( diff --git a/telemetry/README.md b/tm2/pkg/telemetry/README.md similarity index 100% rename from telemetry/README.md rename to tm2/pkg/telemetry/README.md diff --git a/telemetry/exporter/error.go b/tm2/pkg/telemetry/exporter/error.go similarity index 100% rename from telemetry/exporter/error.go rename to tm2/pkg/telemetry/exporter/error.go diff --git a/telemetry/init.go b/tm2/pkg/telemetry/init.go similarity index 89% rename from telemetry/init.go rename to tm2/pkg/telemetry/init.go index 30ea3ede66f..b50a7ab5659 100644 --- a/telemetry/init.go +++ b/tm2/pkg/telemetry/init.go @@ -4,8 +4,8 @@ package telemetry // https://github.com/open-telemetry/opentelemetry-go/blob/main/example/prometheus/main.go import ( - "github.com/gnolang/gno/telemetry/metrics" - "github.com/gnolang/gno/telemetry/options" + "github.com/gnolang/gno/tm2/pkg/telemetry/metrics" + "github.com/gnolang/gno/tm2/pkg/telemetry/options" ) const ( diff --git a/telemetry/metrics/init.go b/tm2/pkg/telemetry/metrics/init.go similarity index 93% rename from telemetry/metrics/init.go rename to tm2/pkg/telemetry/metrics/init.go index 41903f88d77..d97805894a0 100644 --- a/telemetry/metrics/init.go +++ b/tm2/pkg/telemetry/metrics/init.go @@ -3,8 +3,8 @@ package metrics import ( "context" - "github.com/gnolang/gno/telemetry/exporter" - "github.com/gnolang/gno/telemetry/options" + "github.com/gnolang/gno/tm2/pkg/telemetry/exporter" + "github.com/gnolang/gno/tm2/pkg/telemetry/options" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" "go.opentelemetry.io/otel/metric" diff --git a/telemetry/options.go b/tm2/pkg/telemetry/options.go similarity index 91% rename from telemetry/options.go rename to tm2/pkg/telemetry/options.go index 1d299261caf..2e3d629812e 100644 --- a/telemetry/options.go +++ b/tm2/pkg/telemetry/options.go @@ -1,6 +1,6 @@ package telemetry -import "github.com/gnolang/gno/telemetry/options" +import "github.com/gnolang/gno/tm2/pkg/telemetry/options" type Option func(*options.Config) diff --git a/telemetry/options/config.go b/tm2/pkg/telemetry/options/config.go similarity index 100% rename from telemetry/options/config.go rename to tm2/pkg/telemetry/options/config.go