Merge branch 'main' into hlib/share/namespace-integration-new

libs/utils/address.go

@@ -29,15 +29,14 @@ func ValidateAddr(addr string) (string, error) {
  return addr, err
  }
 
- if ip := net.ParseIP(addr); ip == nil {
- addrs, err := net.LookupHost(addr)
- if err != nil {
- return addr, fmt.Errorf("could not resolve %v: %w", addr, err)
- }
- if len(addrs) == 0 {
- return addr, fmt.Errorf("no IP addresses found for DNS record: %v", addr)
- }
- addr = addrs[0]
+ ip := net.ParseIP(addr)
+ if ip != nil {
+ return addr, nil
  }
- return addr, nil
+
+ resolved, err := net.ResolveIPAddr("ip4", addr)
+ if err != nil {
+ return addr, err
+ }
+ return resolved.String(), nil
 }

share/getters/shrex.go

@@ -11,9 +11,11 @@ import (
  "go.opentelemetry.io/otel/metric/instrument"
  "go.opentelemetry.io/otel/metric/instrument/syncint64"
  "go.opentelemetry.io/otel/metric/unit"
+ "go.opentelemetry.io/otel/trace"
 
  "github.com/celestiaorg/rsmt2d"
 
+ "github.com/celestiaorg/celestia-node/libs/utils"
  "github.com/celestiaorg/celestia-node/share"
  "github.com/celestiaorg/celestia-node/share/p2p"
  "github.com/celestiaorg/celestia-node/share/p2p/peers"
@@ -126,6 +128,13 @@ func (sg *ShrexGetter) GetEDS(ctx context.Context, root *share.Root) (*rsmt2d.Ex
  attempt int
  err error
  )
+ ctx, span := tracer.Start(ctx, "shrex/get-eds", trace.WithAttributes(
+ attribute.String("root", root.String()),
+ ))
+ defer func() {
+ utils.SetStatusAndEnd(span, err)
+ }()
+
  for {
  if ctx.Err() != nil {
  sg.metrics.recordEDSAttempt(ctx, attempt, false)
@@ -188,6 +197,13 @@ func (sg *ShrexGetter) GetSharesByNamespace(
  attempt int
  err error
  )
+ ctx, span := tracer.Start(ctx, "shrex/get-shares-by-namespace", trace.WithAttributes(
+ attribute.String("root", root.String()),
+ attribute.String("nid", hex.EncodeToString(id)),
+ ))
+ defer func() {
+ utils.SetStatusAndEnd(span, err)
+ }()
 
  // verify that the namespace could exist inside the roots before starting network requests
  roots := filterRootsByNamespace(root, namespace)