feat: DataDog POC (#250)

* feat: DataDog POC * updates
osmosis-labs · Jul 5, 2024 · 48713b0 · 48713b0
1 parent 8c9313a
commit 48713b0
Show file tree

Hide file tree

Showing 15 changed files with 148 additions and 201 deletions.
diff --git a/app/main.go b/app/main.go
@@ -8,17 +8,17 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
-	"time"
 
-	"github.com/getsentry/sentry-go"
-	sentryotel "github.com/getsentry/sentry-go/otel"
 	"github.com/osmosis-labs/sqs/chaininfo/client"
 	"github.com/osmosis-labs/sqs/domain"
 	sqslog "github.com/osmosis-labs/sqs/log"
 	"github.com/spf13/viper"
 	_ "github.com/swaggo/echo-swagger"
 	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
+	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
+	"go.opentelemetry.io/otel/propagation"
+	"go.uber.org/zap"
+
 	"go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
@@ -74,62 +74,36 @@ func main() {
 		}
 	}()
 
-	if config.OTEL.DSN != "" {
-		otelConfig := config.OTEL
-
-		var (
-			// sentryEndpointWhitelist is a map of endpoints and their respective sampling rates
-			sentryEndpointWhitelist = map[string]float64{
-				"/router/quote":        otelConfig.CustomSampleRate.Quote,
-				"/custom-direct-quote": otelConfig.CustomSampleRate.Other,
-				"/tokens/prices":       otelConfig.CustomSampleRate.Other,
-				"/pools":               otelConfig.CustomSampleRate.Other,
-			}
-
-			// custom sampler that samples only the whitelisted endpoints per their configured rates.
-			traceSampler sentry.TracesSampler = func(ctx sentry.SamplingContext) float64 {
-				if ctx.Span == nil {
-					return 0
-				}
-
-				spanName := ctx.Span.Name
-
-				if samplerRate, ok := sentryEndpointWhitelist[spanName]; ok {
-					return samplerRate
-				}
+	// Use context for graceful shutdown
+	ctx, cancel := context.WithCancel(context.Background())
 
-				return 0
-			}
+	if config.OTEL.Enabled {
+		// resource.WithContainer() adds container.id which the agent will leverage to fetch container tags via the tagger.
+		res, err := resource.New(ctx, resource.WithContainer(),
+			resource.WithAttributes(semconv.ServiceNameKey.String(*hostName)),
+			resource.WithFromEnv(),
 		)
-
-		err = sentry.Init(sentry.ClientOptions{
-			ServerName:         *hostName,
-			Dsn:                otelConfig.DSN,
-			SampleRate:         otelConfig.SampleRate,
-			EnableTracing:      otelConfig.EnableTracing,
-			Debug:              *isDebug,
-			TracesSampler:      traceSampler,
-			ProfilesSampleRate: otelConfig.ProfilesSampleRate,
-			Environment:        otelConfig.Environment,
-		})
 		if err != nil {
-			log.Fatalf("sentry.Init: %s", err)
+			panic(err)
 		}
-		defer sentry.Flush(2 * time.Second)
 
-		sentry.CaptureMessage("SQS started")
+		tp, err := initOTELTracer(ctx, res)
+		if err != nil {
+			panic(err)
+		}
 
-		initOTELTracer(*hostName)
+		defer func() {
+			if err := tp.Shutdown(ctx); err != nil {
+				log.Fatal("Error shutting down tracer provider: ", zap.Error(err))
+			}
+		}()
 	}
 
-	chainClient, err := client.NewClient(config.ChainID, config.ChainGRPCGatewayEndpoint)
+	chainClient, err := client.NewClient(config.ChainID, config.ChainTendermingRPCEndpoint)
 	if err != nil {
 		panic(err)
 	}
 
-	// Use context for graceful shutdown
-	ctx, cancel := context.WithCancel(context.Background())
-
 	// If fails, it means that the node is not reachable
 	if _, err := chainClient.GetLatestHeight(ctx); err != nil {
 		panic(err)
@@ -168,26 +142,18 @@ func main() {
 
 // initOTELTracer initializes the OTEL tracer
 // and wires it up with the Sentry exporter.
-func initOTELTracer(hostName string) {
-	exporter, err := stdouttrace.New(stdouttrace.WithPrettyPrint())
-	if err != nil {
-		log.Fatalf("stdouttrace.New: %v", err)
-	}
-
-	resource, err := resource.New(context.Background(),
-		resource.WithAttributes(
-			semconv.ServiceNameKey.String(hostName),
-		),
-	)
+func initOTELTracer(ctx context.Context, res *resource.Resource) (*sdktrace.TracerProvider, error) {
+	exporter, err := otlptracegrpc.New(ctx, otlptracegrpc.WithInsecure())
 	if err != nil {
-		log.Fatalf("resource.New: %v", err)
+		log.Fatal("can't initialize grpc trace exporter", zap.Error(err))
+		return nil, err
 	}
 
 	tp := sdktrace.NewTracerProvider(
 		sdktrace.WithBatcher(exporter),
-		sdktrace.WithResource(resource),
-		sdktrace.WithSpanProcessor(sentryotel.NewSentrySpanProcessor()),
+		sdktrace.WithResource(res),
 	)
 	otel.SetTracerProvider(tp)
-	otel.SetTextMapPropagator(sentryotel.NewSentryPropagator())
+	otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
+	return tp, nil
 }
diff --git a/app/sqs_config.go b/app/sqs_config.go
@@ -12,7 +12,8 @@ var DefaultConfig = domain.Config{
 	LoggerIsProduction: true,
 	LoggerLevel:        "info",
 
-	ChainGRPCGatewayEndpoint:   "http://localhost:26657",
+	ChainTendermingRPCEndpoint: "http://localhost:26657",
+	ChainGRPCGatewayEndpoint:   "http://localhost:9090",
 	ChainID:                    "osmosis-1",
 	ChainRegistryAssetsFileURL: "https://raw.githubusercontent.com/osmosis-labs/assetlists/main/osmosis-1/generated/frontend/assetlist.json",
 

diff --git a/config-testnet.json b/config-testnet.json
@@ -4,7 +4,8 @@
     "logger-filename": "sqs.log",
     "logger-is-production": true,
     "logger-level": "info",
-    "grpc-gateway-endpoint": "http://localhost:26657",
+    "grpc-tendermint-rpc-endpoint": "http://localhost:26657",
+    "grpc-gateway-endpoint": "http://localhost:9090",
     "chain-id": "osmosis-1",
     "chain-registry-assets-url": "https://raw.githubusercontent.com/osmosis-labs/assetlists/main/osmo-test-5/osmo-test-5.assetlist.json",
     "flight-recording": {
@@ -58,10 +59,7 @@
         "server-connection-timeout-seconds": 10
     },
     "otel": {
-        "dsn": "",
-        "sample-rate": 1,
-        "enable-tracing": true,
-        "profiles-sample-rate": 1,
+        "enabled": true,
         "environment": "production"
     },
     "cors": {

diff --git a/config.json b/config.json
@@ -4,7 +4,8 @@
     "logger-filename": "sqs.log",
     "logger-is-production": true,
     "logger-level": "info",
-    "grpc-gateway-endpoint": "http://localhost:26657",
+    "grpc-tendermint-rpc-endpoint": "http://localhost:26657",
+    "grpc-gateway-endpoint": "http://localhost:9090",
     "chain-id": "osmosis-1",
     "chain-registry-assets-url": "https://raw.githubusercontent.com/osmosis-labs/assetlists/main/osmosis-1/generated/frontend/assetlist.json",
     "router": {
@@ -77,15 +78,8 @@
         "server-connection-timeout-seconds": 10
     },
     "otel": {
-        "dsn": "",
-        "sample-rate": 0,
-        "enable-tracing": false,
-        "profiles-sample-rate": 0,
-        "environment": "sqs-dev",
-        "custom-sample-rate": {
-            "/router/quote": 0,
-            "other": 0
-        }
+        "enabled": true,
+        "environment": "sqs-dev"
     },
     "cors": {
         "allowed-origin": "*",

diff --git a/domain/config.go b/domain/config.go
@@ -12,8 +12,9 @@ type Config struct {
 	LoggerIsProduction bool   `mapstructure:"logger-is-production"`
 	LoggerLevel        string `mapstructure:"logger-level"`
 
-	ChainGRPCGatewayEndpoint string `mapstructure:"grpc-gateway-endpoint"`
-	ChainID                  string `mapstructure:"chain-id"`
+	ChainTendermingRPCEndpoint string `mapstructure:"grpc-tendermint-rpc-endpoint"`
+	ChainGRPCGatewayEndpoint   string `mapstructure:"grpc-gateway-endpoint"`
+	ChainID                    string `mapstructure:"chain-id"`
 
 	// Chain registry assets URL.
 	ChainRegistryAssetsFileURL string `mapstructure:"chain-registry-assets-url"`
@@ -45,19 +46,8 @@ type EndpointOTELConfig struct {
 
 // OTELConfig represents OpenTelemetry configuration.
 type OTELConfig struct {
-	// The DSN to use.
-	DSN string `mapstructure:"dsn"`
-	// The sample rate for event submission in the range [0.0, 1.0].
-	// By default, all events are sent.
-	SampleRate float64 `mapstructure:"sample-rate"`
-	// Enable performance tracing.
-	EnableTracing bool `mapstructure:"enable-tracing"`
-	// The sample rate for profiling traces in the range [0.0, 1.0].
-	// This is relative to TracesSampleRate - it is a ratio of profiled traces out of all sampled traces.
-	ProfilesSampleRate float64 `mapstructure:"profiles-sample-rate"`
-	// The environment to be sent with events.
-	Environment      string             `mapstructure:"environment"`
-	CustomSampleRate EndpointOTELConfig `mapstructure:"custom-sample-rate"`
+	Enabled     bool   `mapstructure:"enabled"`
+	Environment string `mapstructure:"environment"`
 }
 
 // CORSConfig represents HTTP CORS headers configuration.

diff --git a/domain/mocks/pools_usecase_mock.go b/domain/mocks/pools_usecase_mock.go
@@ -27,9 +27,9 @@ func (pm *PoolsUsecaseMock) StorePools(pools []sqsdomain.PoolI) error {
 // GetCosmWasmPoolConfig implements mvc.PoolsUsecase.
 func (pm *PoolsUsecaseMock) GetCosmWasmPoolConfig() domain.CosmWasmPoolRouterConfig {
 	return domain.CosmWasmPoolRouterConfig{
-		TransmuterCodeIDs:      map[uint64]struct{}{},
-		GeneralCosmWasmCodeIDs: map[uint64]struct{}{},
-		NodeURI:                "",
+		TransmuterCodeIDs:        map[uint64]struct{}{},
+		GeneralCosmWasmCodeIDs:   map[uint64]struct{}{},
+		ChainGRPCGatewayEndpoint: "",
 	}
 }
 

diff --git a/domain/pools.go b/domain/pools.go
@@ -18,8 +18,8 @@ type CosmWasmPoolRouterConfig struct {
 	// code IDs for the generalized cosmwasm pool type
 	GeneralCosmWasmCodeIDs map[uint64]struct{}
 
-	// node URI
-	NodeURI string
+	// ChainGRPCGatewayEndpoint is the endpoint for the chain's gRPC gateway
+	ChainGRPCGatewayEndpoint string
 }
 
 // ScalingFactorGetterCb is a callback that is used to get the scaling factor for a given denom.

diff --git a/go.mod b/go.mod
@@ -8,7 +8,6 @@ require (
 	github.com/alecthomas/assert/v2 v2.7.0
 	github.com/cometbft/cometbft v0.37.4
 	github.com/cosmos/cosmos-sdk v0.47.8
-	github.com/getsentry/sentry-go v0.27.0
 	github.com/labstack/echo/v4 v4.11.4
 	github.com/osmosis-labs/osmosis/osmomath v0.0.13
 	github.com/osmosis-labs/osmosis/osmoutils v0.0.13
@@ -20,17 +19,21 @@ require (
 	github.com/stretchr/testify v1.9.0
 	github.com/swaggo/echo-swagger v1.4.1
 	github.com/swaggo/swag v1.16.3
-	go.opentelemetry.io/otel v1.25.0
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.25.0
-	go.opentelemetry.io/otel/sdk v1.25.0
+	go.opentelemetry.io/otel v1.28.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0
+	go.opentelemetry.io/otel/sdk v1.28.0
 	go.uber.org/zap v1.26.0
-	google.golang.org/grpc v1.63.2
+	google.golang.org/grpc v1.64.0
 )
 
 require (
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/bits-and-blooms/bitset v1.8.0 // indirect
+	github.com/getsentry/sentry-go v0.27.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
 	github.com/skip-mev/block-sdk v1.4.2 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 )
 
 require (
@@ -42,11 +45,10 @@ require (
 )
 
 require (
-	cloud.google.com/go v0.112.0 // indirect
-	cloud.google.com/go/compute v1.24.0 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	cloud.google.com/go v0.112.1 // indirect
+	cloud.google.com/go/compute/metadata v0.3.0 // indirect
 	cloud.google.com/go/iam v1.1.6 // indirect
-	cloud.google.com/go/storage v1.37.0 // indirect
+	cloud.google.com/go/storage v1.38.0 // indirect
 	cosmossdk.io/api v0.3.1 // indirect
 	cosmossdk.io/core v0.5.1 // indirect
 	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
@@ -103,12 +105,11 @@ require (
 	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/getsentry/sentry-go/otel v0.27.0
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-kit/kit v0.12.0 // 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-openapi/jsonpointer v0.20.2 // indirect
 	github.com/go-openapi/jsonreference v0.20.4 // indirect
@@ -130,7 +131,7 @@ require (
 	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
-	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.12.2 // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/gorilla/websocket v1.5.1 // indirect
@@ -211,28 +212,26 @@ require (
 	github.com/zondax/ledger-go v0.14.3 // indirect
 	go.etcd.io/bbolt v1.3.8 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
-	go.opentelemetry.io/otel/metric v1.25.0 // indirect
-	go.opentelemetry.io/otel/trace v1.25.0
-	go.uber.org/goleak v1.3.0 // indirect
+	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	go.opentelemetry.io/otel/trace v1.28.0
 	go.uber.org/multierr v1.11.0 // 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
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/oauth2 v0.17.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/oauth2 v0.20.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/term v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
-	google.golang.org/api v0.162.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+	google.golang.org/api v0.169.0 // indirect
 	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect