Change NewTraceID() method signature to be consistent with ID Generator interface

Author: wilguo

propagators/aws/xray/xrayidgenerator/aws_xray_idgenerator.go

@@ -18,7 +18,6 @@ import (
 	crand "crypto/rand"
 	"encoding/binary"
 	"encoding/hex"
-	"errors"
 	"math/rand"
 	"strconv"
 	"sync"
@@ -52,26 +51,23 @@ func (gen *IDGenerator) NewSpanID() trace.SpanID {
 
 // NewTraceID returns a non-zero trace ID based on AWS X-Ray TraceID format.
 // (https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-traceids)
-func (gen *IDGenerator) NewTraceID() (trace.TraceID, error) {
+func (gen *IDGenerator) NewTraceID() trace.TraceID {
 	gen.Lock()
 	defer gen.Unlock()
 
 	tid := trace.TraceID{}
-	currentTime, err := getCurrentTimeHex()
-	if err != nil {
-		return trace.TraceID{}, err
-	}
+	currentTime := getCurrentTimeHex()
 	copy(tid[:4], currentTime)
 	gen.randSource.Read(tid[4:])
 
-	return tid, nil
+	return tid
 }
 
-func getCurrentTimeHex() ([]uint8, error) {
+func getCurrentTimeHex() []uint8 {
 	currentTime := time.Now().Unix()
-	currentTimeHex, err := hex.DecodeString(strconv.FormatInt(currentTime, 16))
-	if err != nil {
-		return nil, errors.New("cannot convert current timestamp to hex")
-	}
-	return currentTimeHex, nil
+	// Ignore error since no expected error should result from this operation
+	// Odd-length strings and non-hex digits are the only 2 error conditions for hex.DecodeString()
+	// strconv.FromatInt() do not produce odd-length strings or non-hex digits
+	currentTimeHex, _ := hex.DecodeString(strconv.FormatInt(currentTime, 16))
+	return currentTimeHex
 }

propagators/aws/xray/xrayidgenerator/aws_xray_idgenerator_test.go

@@ -27,16 +27,16 @@ import (
 
 func TestAwsXRayTraceIdIsValidLength(t *testing.T) {
 	idg := NewIDGenerator()
-	traceID, _ := idg.NewTraceID()
+	traceID := idg.NewTraceID()
 
 	expectedTraceIDLength := 32
 	assert.Equal(t, len(traceID.String()), expectedTraceIDLength, "TraceID has incorrect length.")
 }
 
 func TestAwsXRayTraceIdIsUnique(t *testing.T) {
 	idg := NewIDGenerator()
-	traceID1, _ := idg.NewTraceID()
-	traceID2, _ := idg.NewTraceID()
+	traceID1 := idg.NewTraceID()
+	traceID2 := idg.NewTraceID()
 
 	assert.NotEqual(t, traceID1.String(), traceID2.String(), "TraceID should be unique")
 }
@@ -47,10 +47,7 @@ func TestAwsXRayTraceIdTimeStampInBounds(t *testing.T) {
 
 	previousTime := time.Now().Unix()
 
-	traceID, err := idg.NewTraceID()
-	if err != nil {
-		t.Error(err)
-	}
+	traceID := idg.NewTraceID()
 
 	currentTime, err := strconv.ParseInt(traceID.String()[0:8], 16, 64)
 	if err != nil {
@@ -66,10 +63,7 @@ func TestAwsXRayTraceIdTimeStampInBounds(t *testing.T) {
 func TestAwsXRayTraceIdIsNotNil(t *testing.T) {
 	var nilTraceID trace.TraceID
 	idg := NewIDGenerator()
-	traceID, err := idg.NewTraceID()
-	if err != nil {
-		t.Error(err)
-	}
+	traceID := idg.NewTraceID()
 
 	assert.False(t, bytes.Equal(traceID[:], nilTraceID[:]), "TraceID cannot be Nil.")
 }