Merge 377a7fa into 741fc06

synapsecns · Sep 16, 2024 · 2e20047 · 2e20047
2 parents 741fc06 + 377a7fa
commit 2e20047
Show file tree

Hide file tree

Showing 137 changed files with 3,992 additions and 624 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -102,6 +102,8 @@ linters:
     - perfsprint
     # malfunctions on embedded structs
     - typecheck
+    # magic numbers
+    - mnd
   fast: false
 
 issues:

diff --git a/agents/contracts/bondingmanager/bondingmanager.metadata.go b/agents/contracts/bondingmanager/bondingmanager.metadata.go
diff --git a/agents/contracts/destination/destination.metadata.go b/agents/contracts/destination/destination.metadata.go
diff --git a/agents/contracts/gasoracle/gasoracle.metadata.go b/agents/contracts/gasoracle/gasoracle.metadata.go
diff --git a/agents/contracts/inbox/inbox.metadata.go b/agents/contracts/inbox/inbox.metadata.go
diff --git a/agents/contracts/lightinbox/lightinbox.metadata.go b/agents/contracts/lightinbox/lightinbox.metadata.go
diff --git a/agents/contracts/lightmanager/lightmanager.metadata.go b/agents/contracts/lightmanager/lightmanager.metadata.go
diff --git a/agents/contracts/origin/origin.metadata.go b/agents/contracts/origin/origin.metadata.go
diff --git a/agents/contracts/summit/summit.metadata.go b/agents/contracts/summit/summit.metadata.go
diff --git a/agents/contracts/test/attestationharness/attestationharness.metadata.go b/agents/contracts/test/attestationharness/attestationharness.metadata.go
diff --git a/agents/contracts/test/basemessageharness/basemessageharness.metadata.go b/agents/contracts/test/basemessageharness/basemessageharness.metadata.go
diff --git a/agents/contracts/test/bondingmanagerharness/bondingmanagerharness.metadata.go b/agents/contracts/test/bondingmanagerharness/bondingmanagerharness.metadata.go
diff --git a/agents/contracts/test/destinationharness/destinationharness.metadata.go b/agents/contracts/test/destinationharness/destinationharness.metadata.go
diff --git a/agents/contracts/test/gasdata/gasdataharness.metadata.go b/agents/contracts/test/gasdata/gasdataharness.metadata.go
diff --git a/agents/contracts/test/headerharness/headerharness.metadata.go b/agents/contracts/test/headerharness/headerharness.metadata.go
diff --git a/agents/contracts/test/lightmanagerharness/lightmanagerharness.metadata.go b/agents/contracts/test/lightmanagerharness/lightmanagerharness.metadata.go
diff --git a/agents/contracts/test/messageharness/messageharness.metadata.go b/agents/contracts/test/messageharness/messageharness.metadata.go
diff --git a/agents/contracts/test/originharness/originharness.metadata.go b/agents/contracts/test/originharness/originharness.metadata.go
diff --git a/agents/contracts/test/pingpongclient/pingpongclient.metadata.go b/agents/contracts/test/pingpongclient/pingpongclient.metadata.go
diff --git a/agents/contracts/test/receiptharness/receiptharness.metadata.go b/agents/contracts/test/receiptharness/receiptharness.metadata.go
diff --git a/agents/contracts/test/requestharness/requestharness.metadata.go b/agents/contracts/test/requestharness/requestharness.metadata.go
diff --git a/agents/contracts/test/snapshotharness/snapshotharness.metadata.go b/agents/contracts/test/snapshotharness/snapshotharness.metadata.go
diff --git a/agents/contracts/test/stateharness/stateharness.metadata.go b/agents/contracts/test/stateharness/stateharness.metadata.go
diff --git a/agents/contracts/test/summitharness/summitharness.metadata.go b/agents/contracts/test/summitharness/summitharness.metadata.go
diff --git a/agents/contracts/test/testclient/testclient.metadata.go b/agents/contracts/test/testclient/testclient.metadata.go
diff --git a/agents/contracts/test/tipsharness/tipsharness.metadata.go b/agents/contracts/test/tipsharness/tipsharness.metadata.go
diff --git a/agents/testutil/agentstestcontract/agentstestcontract.metadata.go b/agents/testutil/agentstestcontract/agentstestcontract.metadata.go
diff --git a/contrib/opbot/botmd/botmd.go b/contrib/opbot/botmd/botmd.go
@@ -11,11 +11,13 @@ import (
 	"github.com/synapsecns/sanguine/core/dbcommon"
 	"github.com/synapsecns/sanguine/core/metrics"
 	"github.com/synapsecns/sanguine/core/metrics/instrumentation/slackertrace"
+	experimentalLogger "github.com/synapsecns/sanguine/core/metrics/logger"
 	signerConfig "github.com/synapsecns/sanguine/ethergo/signer/config"
 	"github.com/synapsecns/sanguine/ethergo/signer/signer"
 	"github.com/synapsecns/sanguine/ethergo/submitter"
 	cctpSql "github.com/synapsecns/sanguine/services/cctp-relayer/db/sql"
 	omnirpcClient "github.com/synapsecns/sanguine/services/omnirpc/client"
+	"github.com/uptrace/opentelemetry-go-extra/otelzap"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -30,15 +32,20 @@ type Bot struct {
 	signer        signer.Signer
 	submitter     submitter.TransactionSubmitter
 	screener      screenerClient.ScreenerClient
+	logger        experimentalLogger.ExperimentalLogger
 }
 
 // NewBot creates a new bot server.
 func NewBot(handler metrics.Handler, cfg config.Config) *Bot {
 	server := slacker.NewClient(cfg.SlackBotToken, cfg.SlackAppToken)
+
+	sugaredLogger := otelzap.New(experimentalLogger.MakeZapLogger()).Sugar()
+
 	bot := Bot{
 		handler: handler,
 		cfg:     cfg,
 		server:  server,
+		logger:  experimentalLogger.MakeWrappedSugaredLogger(sugaredLogger),
 	}
 
 	// you should be able to run opbot even without signoz.

diff --git a/contrib/opbot/botmd/commands.go b/contrib/opbot/botmd/commands.go
@@ -82,6 +82,7 @@ func (b *Bot) traceCommand() *slacker.CommandDefinition {
 			// search for the transaction
 			res, err := b.signozClient.SearchTraces(ctx.Context(), signoz.Last3Hr, searchMap)
 			if err != nil {
+				b.logger.Errorf(ctx.Context(), "error searching for the transaction: %v", err)
 				_, err := ctx.Response().Reply("error searching for the transaction")
 				if err != nil {
 					log.Println(err)
@@ -290,6 +291,7 @@ func (b *Bot) rfqRefund() *slacker.CommandDefinition {
 				}
 			}
 			if err != nil {
+				b.logger.Errorf(ctx.Context(), "error fetching quote request: %v", err)
 				_, err := ctx.Response().Reply("error fetching quote request")
 				if err != nil {
 					log.Println(err)
@@ -338,19 +340,23 @@ func (b *Bot) rfqRefund() *slacker.CommandDefinition {
 			err = retry.WithBackoff(
 				ctx.Context(),
 				func(ctx context.Context) error {
-					txHash, err = relClient.GetTxHashByNonce(ctx, &relapi.GetTxByNonceRequest{
-						ChainID: rawRequest.OriginChainID,
-						Nonce:   nonce,
-					})
+					txHash, err = relClient.GetTxHashByNonce(
+						ctx,
+						&relapi.GetTxByNonceRequest{
+							ChainID: rawRequest.OriginChainID,
+							Nonce:   nonce,
+						})
 					if err != nil {
+						b.logger.Errorf(ctx, "error fetching quote request: %v", err)
 						return fmt.Errorf("error fetching quote request: %w", err)
 					}
 					return nil
 				},
-				retry.WithMaxAttempts(3),
-				retry.WithMaxAttemptTime(15*time.Second),
+				retry.WithMaxAttempts(5),
+				retry.WithMaxAttemptTime(30*time.Second),
 			)
 			if err != nil {
+				b.logger.Errorf(ctx.Context(), "error fetching quote request: %v", err)
 				_, err := ctx.Response().Reply(fmt.Sprintf("error fetching explorer link to refund, but nonce is %d", nonce))
 				log.Printf("error fetching quote request: %v\n", err)
 				return

diff --git a/contrib/opbot/go.mod b/contrib/opbot/go.mod
@@ -28,6 +28,7 @@ require (
 	github.com/synapsecns/sanguine/services/cctp-relayer v0.0.0-00010101000000-000000000000
 	github.com/synapsecns/sanguine/services/omnirpc v0.0.0-00010101000000-000000000000
 	github.com/synapsecns/sanguine/services/rfq v0.0.0-00010101000000-000000000000
+	github.com/uptrace/opentelemetry-go-extra/otelzap v0.3.1
 	github.com/urfave/cli/v2 v2.27.2
 	golang.org/x/sync v0.8.0
 	gopkg.in/yaml.v2 v2.4.0
@@ -240,7 +241,6 @@ require (
 	github.com/uptrace/opentelemetry-go-extra/otelgorm v0.3.1 // indirect
 	github.com/uptrace/opentelemetry-go-extra/otelsql v0.3.1 // indirect
 	github.com/uptrace/opentelemetry-go-extra/otelutil v0.3.1 // indirect
-	github.com/uptrace/opentelemetry-go-extra/otelzap v0.3.1 // indirect
 	github.com/valyala/fastjson v1.6.4 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect

diff --git a/core/go.mod b/core/go.mod
@@ -63,6 +63,7 @@ require (
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/sync v0.8.0
+	google.golang.org/grpc v1.64.0
 	gorm.io/driver/sqlite v1.5.6
 	gorm.io/gorm v1.25.10
 	k8s.io/apimachinery v0.29.3
@@ -189,7 +190,6 @@ require (
 	golang.org/x/tools v0.24.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/grpc v1.64.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect

diff --git a/core/metrics/README.md b/core/metrics/README.md
@@ -12,7 +12,27 @@ There's also a `NAME_PREFIX` environment variable that will prefix all the metri
 
 ## OTLP
 
-We do our best to support enviornment variables specified in the [Otel Spec](https://opentelemetry.io/docs/specs/otel/configuration/sdk-environment-variables/) and have added a few of our own. Key ones to note are:
+We do our best to support enviornment variables specified in the [Otel Spec](https://opentelemetry.io/docs/specs/otel/configuration/sdk-environment-variables/) and the [OTLP Spec](https://opentelemetry.io/docs/languages/sdk-configuration/otlp-exporter/) and have added a few of our own. This was to allow for multiple exporter backends for traces, as otel clients only allow for one URL. The relevant multi exporter code is in `multiexporter.go`, and simply wraps multiple otel clients.
+
+The additional environment variables to note are:
+| Enviornment Variable                     | Description                               | Default |
+|------------------------------------------|-------------------------------------------|---------|
+| `OTEL_EXPORTER_OTLP_ENDPOINT`            | The endpoint for the primary OTLP exporter | None    |
+| `OTEL_EXPORTER_OTLP_ENDPOINT_1`          | The endpoint for the first additional OTLP exporter | None    |
+| `OTEL_EXPORTER_OTLP_ENDPOINT_2`          | The endpoint for the second additional OTLP exporter | None    |
+| `OTEL_EXPORTER_OTLP_ENDPOINT_3`          | The endpoint for the third additional OTLP exporter | None    |
+| ...                                      | Additional endpoints can be added by incrementing the number | None    |
+| `OTEL_EXPORTER_OTLP_TRANSPORT`           | The transport protocol for the primary OTLP exporter | `http` |
+| `OTEL_EXPORTER_OTLP_TRANSPORT_1`         | The transport protocol for the first additional OTLP exporter | `http` |
+| `OTEL_EXPORTER_OTLP_TRANSPORT_2`         | The transport protocol for the second additional OTLP exporter | `http` |
+| `OTEL_EXPORTER_OTLP_TRANSPORT_3`         | The transport protocol for the third additional OTLP exporter | `http` |
+| ...                                      | Additional transports can be specified by incrementing the number | `http` |
+
+You can do the same thing for `OTEL_EXPORTER_OTLP_SECURE_MODE` and `OTEL_EXPORTER_OTLP_HEADERS`
+
+<!-- TODO: fully document these optins-->
+
+Note: The OTLP exporter endpoints and transports can be specified for multiple exporters by using incrementing numbers (1, 2, 3, etc.) in the environment variable names. This allows for configuration of multiple OTLP exporters. The primary exporter uses the base names without numbers.
 
 
 ## Jaeger

diff --git a/core/metrics/export_test.go b/core/metrics/export_test.go
@@ -0,0 +1,6 @@
+package metrics
+
+// HeadersToMap converts a string of headers to a map.
+func HeadersToMap(val string) map[string]string {
+	return headersToMap(val)
+}