remove telemetry module (#3922)

Author: dasanchez

CHANGELOG.md

@@ -3,7 +3,7 @@
 ## UNRELEASED
 
 ### FEATURES
-- Add OpenTelemetry metrics ([\#3805](https://github.com/cosmos/gaia/pull/3805))
+
 
 ### DEPENDENCIES
 - Bump [go.opentelemetry.io/otel/sdk/metric](https://github.com/open-telemetry/opentelemetry-go) from 1.36.0 to 1.37.0 ([#3820](https://github.com/cosmos/gaia/pull/3820))

Makefile

@@ -469,18 +469,6 @@ proto-update-deps:
 
 .PHONY: proto-all proto-gen proto-swagger-gen proto-format proto-lint proto-check-breaking proto-update-deps
 
-###############################################################################
-###                                Open Telemetry                           ###
-###############################################################################
-
-start-telemetry-server:
-	cd contrib/telemetry && docker compose up -d
-
-stop-telemetry-server:
-	cd contrib/telemetry && docker compose down --remove-orphans
-
-.PHONY: start-telemetry-server stop-telemetry-server
-
 ###############################################################################
 ###                                Localnet                                 ###
 ###############################################################################

app/app.go

@@ -11,13 +11,9 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/rakyll/statik/fs"
 	feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
-	"github.com/spf13/cast"
-	"github.com/spf13/viper"
 
 	abci "github.com/cometbft/cometbft/abci/types"
-	tmcfg "github.com/cometbft/cometbft/config"
 	tmjson "github.com/cometbft/cometbft/libs/json"
-	"github.com/cometbft/cometbft/privval"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 
 	dbm "github.com/cosmos/cosmos-db"
@@ -41,7 +37,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
 	nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node"
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -66,7 +61,6 @@ import (
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
@@ -78,8 +72,6 @@ import (
 	"github.com/cosmos/gaia/v26/app/keepers"
 	"github.com/cosmos/gaia/v26/app/upgrades"
 	v260 "github.com/cosmos/gaia/v26/app/upgrades/v26_0_0"
-	gaiatelemetry "github.com/cosmos/gaia/v26/telemetry"
-	"github.com/cosmos/gaia/v26/x/telemetry"
 )
 
 var (
@@ -114,8 +106,6 @@ type GaiaApp struct { //nolint: revive
 	// simulation manager
 	sm           *module.SimulationManager
 	configurator module.Configurator
-
-	otelClient *gaiatelemetry.OtelClient
 }
 
 func init() {
@@ -180,16 +170,6 @@ func NewGaiaApp(
 		interfaceRegistry: interfaceRegistry,
 	}
 
-	vi, err := getValidatorInfo(homePath, appOpts)
-	if err != nil {
-		logger.Debug("failed to get validator info: unable to determine if this node is a validator", "err", err)
-	} else {
-		logger.Debug("successfully determined if this node is a validator", "moniker", vi.Moniker)
-	}
-
-	otelConfig := getOtelConfig(appOpts)
-	app.otelClient = gaiatelemetry.NewOtelClient(otelConfig, vi)
-
 	moduleAccountAddresses := app.ModuleAccountAddrs()
 
 	// Setup keepers
@@ -241,7 +221,6 @@ func NewGaiaApp(
 	app.mm.SetOrderPreBlockers(
 		upgradetypes.ModuleName,
 		authtypes.ModuleName,
-		telemetry.ModuleName,
 	)
 	// During begin block slashing happens after distr.BeginBlocker so that
 	// there is nothing left over in the validator fee pool, so as to keep the
@@ -379,15 +358,6 @@ func NewGaiaApp(
 		}
 	}
 
-	if otelConfig.CollectorEndpoint != "" && !otelConfig.Disable {
-		logger.Debug("creating gaia app with open telemetry")
-		if err := app.otelClient.StartExporter(logger); err != nil {
-			panic(err)
-		}
-	} else {
-		logger.Debug("creating gaia app without open telemetry")
-	}
-
 	return app
 }
 
@@ -455,25 +425,6 @@ func (app *GaiaApp) BlockedModuleAccountAddrs(modAccAddrs map[string]bool) map[s
 	return modAccAddrs
 }
 
-func getOtelConfig(appOpts servertypes.AppOptions) gaiatelemetry.OtelConfig {
-	// if appOpts.Get yields nil, this value was not set.
-	// since the user isn't making any intent to disable here, we will use the DefaultOtelConfig.
-	disableRaw := appOpts.Get("opentelemetry.disable")
-	if disableRaw == nil {
-		return gaiatelemetry.DefaultOtelConfig
-	}
-	// if disableRaw wasn't nil, the user is making the intent to use their config. so we will use their values.
-	otelConfig := gaiatelemetry.OtelConfig{
-		Disable:                 cast.ToBool(appOpts.Get("opentelemetry.disable")),
-		CollectorEndpoint:       cast.ToString(appOpts.Get("opentelemetry.collector-endpoint")),
-		CollectorMetricsURLPath: cast.ToString(appOpts.Get("opentelemetry.collector-metrics-url-path")),
-		User:                    cast.ToString(appOpts.Get("opentelemetry.user")),
-		Token:                   cast.ToString(appOpts.Get("opentelemetry.token")),
-		PushInterval:            cast.ToDuration(appOpts.Get("opentelemetry.push-interval")),
-	}
-	return otelConfig
-}
-
 // LegacyAmino returns GaiaApp's amino codec.
 //
 // NOTE: This is solely to be used for testing purposes as it may be desirable
@@ -616,48 +567,6 @@ func (app *GaiaApp) AutoCliOpts() autocli.AppOptions {
 	}
 }
 
-func getValidatorInfo(homePath string, appOpts servertypes.AppOptions) (gaiatelemetry.ValidatorInfo, error) {
-	cfg := &tmcfg.Config{
-		BaseConfig:      tmcfg.BaseConfig{},
-		RPC:             &tmcfg.RPCConfig{},
-		P2P:             &tmcfg.P2PConfig{},
-		Mempool:         &tmcfg.MempoolConfig{},
-		StateSync:       &tmcfg.StateSyncConfig{},
-		BlockSync:       &tmcfg.BlockSyncConfig{},
-		Consensus:       &tmcfg.ConsensusConfig{},
-		Storage:         &tmcfg.StorageConfig{},
-		TxIndex:         &tmcfg.TxIndexConfig{},
-		Instrumentation: &tmcfg.InstrumentationConfig{},
-	}
-	cfg.SetRoot(homePath)
-
-	configPath := filepath.Join(homePath, "config", "config.toml")
-	if _, err := os.Stat(configPath); err == nil {
-		viper := viper.New()
-		viper.SetConfigType("toml")
-		viper.SetConfigFile(configPath)
-		if err := viper.ReadInConfig(); err == nil {
-			if err := viper.Unmarshal(cfg); err != nil {
-				return gaiatelemetry.ValidatorInfo{}, fmt.Errorf("failed to unmarshal config file: %w", err)
-			}
-		}
-	} else {
-		return gaiatelemetry.ValidatorInfo{}, fmt.Errorf("unable to stat config file at %s", configPath)
-	}
-
-	chainID := cast.ToString(appOpts.Get(flags.FlagChainID))
-	if chainID == "" {
-		genDocFile := filepath.Join(homePath, "config", "genesis.json")
-		appGenesis, err := genutiltypes.AppGenesisFromFile(genDocFile)
-		if err == nil {
-			chainID = appGenesis.ChainID
-		}
-	}
-
-	vi, err := validatorInfoFromCometConfig(cfg, chainID)
-	return vi, err
-}
-
 // TestingApp functions
 
 // GetBaseApp implements the TestingApp interface.
@@ -724,41 +633,3 @@ func minTxFeesChecker(ctx sdk.Context, tx sdk.Tx, feemarketKp feemarketkeeper.Ke
 
 	return feeTx.GetFee(), 0, nil
 }
-
-var ErrNotValidator = fmt.Errorf("not validator")
-
-func validatorInfoFromCometConfig(cfg *tmcfg.Config, chainID string) (gaiatelemetry.ValidatorInfo, error) {
-	vi := gaiatelemetry.ValidatorInfo{
-		ChainID: chainID,
-	}
-	if cfg.PrivValidatorListenAddr != "" {
-		listenAddr := cfg.PrivValidatorListenAddr
-		pve, err := privval.NewSignerListener(listenAddr, nil)
-		if err != nil {
-			return vi, fmt.Errorf("failed to start private validator: %w", err)
-		}
-
-		pvsc, err := privval.NewSignerClient(pve, chainID)
-		if err != nil {
-			return vi, fmt.Errorf("failed to start private validator: %w", err)
-		}
-
-		pk, err := pvsc.GetPubKey()
-		if err != nil {
-			return vi, fmt.Errorf("cannot get pubkey from remote signer: %w", err)
-		}
-		vi.Moniker = cfg.Moniker
-		vi.Address = pk.Address()
-		return vi, nil
-	} else if cfg.PrivValidatorKey != "" {
-		vi.Moniker = cfg.Moniker
-		_, err := os.Stat(cfg.PrivValidatorKeyFile())
-		if err != nil {
-			return vi, ErrNotValidator
-		}
-		pv := privval.LoadFilePV(cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile())
-		vi.Address = pv.GetAddress()
-		return vi, nil
-	}
-	return vi, ErrNotValidator
-}

app/config.go

@@ -4,14 +4,10 @@ import (
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-
-	"github.com/cosmos/gaia/v26/telemetry"
 )
 
 type AppConfig struct {
 	serverconfig.Config
 
 	Wasm wasmtypes.NodeConfig `mapstructure:"wasm"`
-
-	OpenTelemetry telemetry.OtelConfig `mapstructure:"opentelemetry"`
 }

app/modules.go

@@ -54,7 +54,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
-	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
 	"github.com/CosmWasm/wasmd/x/wasm"
@@ -64,7 +63,6 @@ import (
 	liquidtypes "github.com/cosmos/gaia/v26/x/liquid/types"
 	"github.com/cosmos/gaia/v26/x/metaprotocols"
 	metaprotocolstypes "github.com/cosmos/gaia/v26/x/metaprotocols/types"
-	"github.com/cosmos/gaia/v26/x/telemetry"
 )
 
 var maccPerms = map[string][]string{
@@ -122,7 +120,6 @@ func appModules(
 		feemarket.NewAppModule(appCodec, *app.FeeMarketKeeper),
 		tendermint.NewAppModule(tmLightClientModule),
 		liquid.NewAppModule(appCodec, app.LiquidKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
-		telemetry.NewAppModule(&stakingkeeper.Querier{Keeper: app.StakingKeeper}, app.otelClient),
 	}
 }
 

cmd/gaiad/cmd/root.go

@@ -57,7 +57,6 @@ import (
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
 	gaia "github.com/cosmos/gaia/v26/app"
-	"github.com/cosmos/gaia/v26/telemetry"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the
@@ -138,23 +137,7 @@ func NewRootCmd() *cobra.Command {
 			customAppTemplate, customAppConfig := initAppConfig()
 			customCometConfig := initCometConfig()
 
-			err = server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, customCometConfig)
-			if err != nil {
-				return err
-			}
-
-			// if open telemetry is not disabled, we force the SDK telemetry to be enabled.
-			serverCtx := server.GetServerContextFromCmd(cmd)
-			if !serverCtx.Viper.GetBool("opentelemetry.disable") {
-				serverCtx.Config.Instrumentation.Prometheus = true
-				serverCtx.Viper.Set("telemetry.enabled", true)
-				serverCtx.Viper.Set("telemetry.prometheus-retention-time", 60)
-				if err := server.SetCmdServerContext(cmd, serverCtx); err != nil {
-					return fmt.Errorf("could not set cmd server context: %w", err)
-				}
-			}
-
-			return nil
+			return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, customCometConfig)
 		},
 	}
 
@@ -197,18 +180,13 @@ func initAppConfig() (string, interface{}) {
 	srvCfg := serverconfig.DefaultConfig()
 	srvCfg.StateSync.SnapshotInterval = 1000
 	srvCfg.StateSync.SnapshotKeepRecent = 10
-	srvCfg.Telemetry.Enabled = true
-	if srvCfg.Telemetry.PrometheusRetentionTime <= 0 {
-		srvCfg.Telemetry.PrometheusRetentionTime = 60
-	}
 
 	customAppConfig := gaia.AppConfig{
-		Config:        *srvCfg,
-		Wasm:          wasmtypes.DefaultNodeConfig(),
-		OpenTelemetry: telemetry.DefaultOtelConfig,
+		Config: *srvCfg,
+		Wasm:   wasmtypes.DefaultNodeConfig(),
 	}
 
-	defaultAppTemplate := serverconfig.DefaultConfigTemplate + wasmtypes.DefaultConfigTemplate() + telemetry.OpenTelemetryTemplate()
+	defaultAppTemplate := serverconfig.DefaultConfigTemplate + wasmtypes.DefaultConfigTemplate()
 
 	return defaultAppTemplate, customAppConfig
 }

cmd/gaiad/cmd/testnet.go

@@ -47,7 +47,6 @@ import (
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
 	gaia "github.com/cosmos/gaia/v26/app"
-	"github.com/cosmos/gaia/v26/telemetry"
 )
 
 var (
@@ -247,15 +246,10 @@ func initTestnetFiles(
 	serverCfg.Telemetry.PrometheusRetentionTime = 60
 	serverCfg.Telemetry.EnableHostnameLabel = false
 	serverCfg.Telemetry.GlobalLabels = [][]string{{"chain_id", args.chainID}}
-	otelConfig := telemetry.LocalOtelConfig
-	if args.useDocker {
-		// if useDocker, we need to use the docker networking. localhost is troublesome in the setup.
-		otelConfig.CollectorEndpoint = "host.docker.internal:4318"
-	}
+
 	gaiaCfg := gaia.AppConfig{
-		Config:        *serverCfg,
-		Wasm:          wasmtypes.NodeConfig{},
-		OpenTelemetry: otelConfig,
+		Config: *serverCfg,
+		Wasm:   wasmtypes.NodeConfig{},
 	}
 
 	var (