Move errorkind package and use require package in tests

open-telemetry · Jul 2, 2019 · 33ad4ac · 33ad4ac
1 parent 7fe7624
commit 33ad4ac
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 22 deletions.
diff --git a/cmd/occollector/app/sender/jaeger_proto_grpc_sender.go b/cmd/occollector/app/sender/jaeger_proto_grpc_sender.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/open-telemetry/opentelemetry-service/consumer"
 	"github.com/open-telemetry/opentelemetry-service/data"
-	"github.com/open-telemetry/opentelemetry-service/errorkind"
+	"github.com/open-telemetry/opentelemetry-service/errors/errorkind"
 	jaegertranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/jaeger"
 )
 

diff --git a/cmd/occollector/app/sender/jaeger_thrift_http_sender.go b/cmd/occollector/app/sender/jaeger_thrift_http_sender.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/open-telemetry/opentelemetry-service/consumer"
 	"github.com/open-telemetry/opentelemetry-service/data"
-	"github.com/open-telemetry/opentelemetry-service/errorkind"
+	"github.com/open-telemetry/opentelemetry-service/errors/errorkind"
 	jaegertranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/jaeger"
 )
 

diff --git a/cmd/occollector/app/sender/jaeger_thrift_tchannel_sender.go b/cmd/occollector/app/sender/jaeger_thrift_tchannel_sender.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/open-telemetry/opentelemetry-service/consumer"
 	"github.com/open-telemetry/opentelemetry-service/data"
-	"github.com/open-telemetry/opentelemetry-service/errorkind"
+	"github.com/open-telemetry/opentelemetry-service/errors/errorkind"
 	jaegertranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/jaeger"
 )
 

diff --git a/errorkind/errorkind.go → errors/errorkind/errorkind.go b/errorkind/errorkind.go → errors/errorkind/errorkind.go
diff --git a/errorkind/errorkind_test.go → errors/errorkind/errorkind_test.go b/errorkind/errorkind_test.go → errors/errorkind/errorkind_test.go
diff --git a/exporter/zipkinexporter/zipkin.go b/exporter/zipkinexporter/zipkin.go
@@ -31,7 +31,7 @@ import (
 	commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
 	"github.com/open-telemetry/opentelemetry-service/consumer"
 	"github.com/open-telemetry/opentelemetry-service/data"
-	"github.com/open-telemetry/opentelemetry-service/errorkind"
+	"github.com/open-telemetry/opentelemetry-service/errors/errorkind"
 	"github.com/open-telemetry/opentelemetry-service/observability"
 	"github.com/open-telemetry/opentelemetry-service/translator/trace"
 	spandatatranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/spandata"

diff --git a/internal/collector/processor/queued/queued_processor.go b/internal/collector/processor/queued/queued_processor.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/open-telemetry/opentelemetry-service/consumer"
 	"github.com/open-telemetry/opentelemetry-service/data"
-	"github.com/open-telemetry/opentelemetry-service/errorkind"
+	"github.com/open-telemetry/opentelemetry-service/errors/errorkind"
 	"github.com/open-telemetry/opentelemetry-service/internal/collector/processor"
 	"github.com/open-telemetry/opentelemetry-service/internal/collector/processor/nodebatcher"
 	"github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry"

diff --git a/internal/collector/processor/queued/queued_processor_test.go b/internal/collector/processor/queued/queued_processor_test.go
@@ -23,10 +23,11 @@ import (
 	"time"
 
 	tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
+	"github.com/stretchr/testify/require"
 
 	"github.com/open-telemetry/opentelemetry-service/consumer"
 	"github.com/open-telemetry/opentelemetry-service/data"
-	"github.com/open-telemetry/opentelemetry-service/errorkind"
+	"github.com/open-telemetry/opentelemetry-service/errors/errorkind"
 )
 
 func TestQueuedProcessor_noEnqueueOnPermanentError(t *testing.T) {
@@ -48,31 +49,20 @@ func TestQueuedProcessor_noEnqueueOnPermanentError(t *testing.T) {
 	).(*queuedSpanProcessor)
 
 	c.Add(1)
-	if err := qp.ConsumeTraceData(ctx, td); err != nil {
-		// This is asynchronous so it should just enqueue, no errors expected.
-		t.Fatalf("c.ConsumeTraceData() = %v want nil", err)
-	}
+	require.Nil(t, qp.ConsumeTraceData(ctx, td))
 	c.Wait()
 	<-time.After(50 * time.Millisecond)
 
-	queueSize := qp.queue.Size()
-	if queueSize != 0 {
-		t.Fatalf("queueSize = %d, want 0", queueSize)
-	}
+	require.Zero(t, qp.queue.Size())
 
 	c.consumeTraceDataError = errors.New("transient error")
 	c.Add(1)
-	if err := qp.ConsumeTraceData(ctx, td); err != nil {
-		// This is asynchronous so it should just enqueue, no errors expected.
-		t.Fatalf("c.ConsumeTraceData() got non-permanent error")
-	}
+	// This is asynchronous so it should just enqueue, no errors expected.
+	require.Nil(t, qp.ConsumeTraceData(ctx, td))
 	c.Wait()
 	<-time.After(50 * time.Millisecond)
 
-	queueSize = qp.queue.Size()
-	if queueSize != 1 {
-		t.Fatalf("queueSize = %d, want 1", queueSize)
-	}
+	require.Equal(t, 1, qp.queue.Size())
 }
 
 type waitGroupTraceConsumer struct {