add domain, err handling, default config

smartcontractkit · Dec 19, 2024 · 6bcf225 · 6bcf225
1 parent 88af258
commit 6bcf225
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/core/chains/evm/txm/metrics.go b/core/chains/evm/txm/metrics.go
@@ -111,9 +111,9 @@ func (m *txmMetrics) EmitTxMessage(ctx context.Context, tx common.Hash, fromAddr
 	err = beholder.GetEmitter().Emit(
 		ctx,
 		messageBytes,
-		"beholder_domain", "beholder_test",
+		"beholder_domain", "svr",
 		"beholder_entity", "TxMessage",
-		"beholder_data_schema", "transaction_schema",
+		"beholder_data_schema", "/beholder-tx-message/versions/1",
 	)
 
 	return err

diff --git a/core/chains/evm/txm/txm.go b/core/chains/evm/txm/txm.go
@@ -358,7 +358,11 @@ func (t *Txm) sendTransactionWithError(ctx context.Context, tx *types.Transactio
 	}
 
 	t.metrics.IncrementNumBroadcastedTxs(ctx)
-	t.metrics.EmitTxMessage(ctx, attempt.Hash, address, tx.ToAddress, *tx.Nonce)
+	err = t.metrics.EmitTxMessage(ctx, attempt.Hash, address, tx.ToAddress, *tx.Nonce)
+	if err != nil {
+		t.lggr.Errorw("Beholder error emitting tx message", "err", err)
+	}
+
 	return t.txStore.UpdateTransactionBroadcast(ctx, attempt.TxID, *tx.Nonce, attempt.Hash, address)
 }
 

diff --git a/core/cmd/shell.go b/core/cmd/shell.go
@@ -101,9 +101,7 @@ func initGlobals(cfgProm config.Prometheus, cfgTracing config.Tracing, cfgTeleme
 				attributes = append(attributes, attribute.String(k, v))
 			}
 
-			clientCfg := beholder.TestDefaultConfig()
-
-			/*clientCfg := beholder.Config{
+			clientCfg := beholder.Config{
 				InsecureConnection:       cfgTelemetry.InsecureConnection(),
 				CACertFile:               cfgTelemetry.CACertFile(),
 				OtelExporterGRPCEndpoint: cfgTelemetry.OtelExporterGRPCEndpoint(),
@@ -113,7 +111,7 @@ func initGlobals(cfgProm config.Prometheus, cfgTracing config.Tracing, cfgTeleme
 				EmitterExportTimeout:     cfgTelemetry.EmitterExportTimeout(),
 				AuthPublicKeyHex:         csaPubKeyHex,
 				AuthHeaders:              beholderAuthHeaders,
-			}*/
+			}
 
 			// note: due to the OTEL specification, all histogram buckets
 			// must be defined when the beholder client is created