Fix(cannon): Fix nil next panic (#222)

* Fix(cannon): Fix nil next panic * refactor: Simplify NewResource function
ethpandaops · Oct 3, 2023 · 5abfb4f · 5abfb4f
1 parent fc5c93c
commit 5abfb4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/pkg/cannon/iterator/checkpoint_iterator.go b/pkg/cannon/iterator/checkpoint_iterator.go
@@ -60,11 +60,11 @@ func (c *CheckpointIterator) Next(ctx context.Context) (next *xatu.CannonLocatio
 	defer func() {
 		if err != nil {
 			span.RecordError(err)
-		}
-
-		epoch, err := c.getEpochFromLocation(next)
-		if err == nil {
-			span.SetAttributes(attribute.Int64("next", int64(epoch)))
+		} else {
+			epoch, err := c.getEpochFromLocation(next)
+			if err == nil {
+				span.SetAttributes(attribute.Int64("next", int64(epoch)))
+			}
 		}
 
 		span.End()

diff --git a/pkg/observability/tracing.go b/pkg/observability/tracing.go
@@ -46,17 +46,7 @@ func SetupOTelSDK(ctx context.Context, tracerProvider *trace.TracerProvider) (sh
 }
 
 func NewResource(serviceName, serviceVersion string) (*resource.Resource, error) {
-	res, err := resource.New(context.Background(),
-		resource.WithFromEnv(),
-		resource.WithProcess(),
-		resource.WithOS(),
-		resource.WithContainer(),
-		resource.WithHost())
-	if err != nil {
-		return nil, fmt.Errorf("creating resource: %w", err)
-	}
-
-	return resource.Merge(res,
+	return resource.Merge(resource.Default(),
 		resource.NewWithAttributes(semconv.SchemaURL,
 			semconv.ServiceName(serviceName),
 			semconv.ServiceVersion(serviceVersion),