Removed redundant code. Return no error.

open-telemetry · Apr 10, 2024 · 509c602 · 509c602
1 parent 648b40e
commit 509c602
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/exporters/stdout/stdoutmetric/exporter.go b/exporters/stdout/stdoutmetric/exporter.go
@@ -51,13 +51,6 @@ func (e *exporter) Aggregation(k metric.InstrumentKind) metric.Aggregation {
 }
 
 func (e *exporter) Export(ctx context.Context, data *metricdata.ResourceMetrics) error {
-	select {
-	case <-ctx.Done():
-		// Don't do anything if the context has already timed out.
-		return ctx.Err()
-	default:
-		// Context is still valid, continue.
-	}
 	if e.redactTimestamps {
 		redactTimestamps(data)
 	}
@@ -69,7 +62,7 @@ func (e *exporter) Export(ctx context.Context, data *metricdata.ResourceMetrics)
 
 func (e *exporter) ForceFlush(ctx context.Context) error {
 	// exporter holds no state, nothing to flush.
-	return ctx.Err()
+	return nil
 }
 
 func (e *exporter) Shutdown(ctx context.Context) error {
@@ -78,7 +71,7 @@ func (e *exporter) Shutdown(ctx context.Context) error {
 			encoder: shutdownEncoder{},
 		})
 	})
-	return ctx.Err()
+	return nil
 }
 
 func (e *exporter) MarshalLog() interface{} {

diff --git a/exporters/stdout/stdoutmetric/exporter_test.go b/exporters/stdout/stdoutmetric/exporter_test.go
@@ -37,15 +37,15 @@ func testCtxErrHonored(factory func(*testing.T) func(context.Context) error) fun
 			<-innerCtx.Done()
 
 			f := factory(t)
-			assert.ErrorIs(t, f(innerCtx), context.DeadlineExceeded)
+			assert.NoError(t, f(innerCtx))
 		})
 
 		t.Run("Canceled", func(t *testing.T) {
 			innerCtx, innerCancel := context.WithCancel(ctx)
 			innerCancel()
 
 			f := factory(t)
-			assert.ErrorIs(t, f(innerCtx), context.Canceled)
+			assert.NoError(t, f(innerCtx))
 		})
 
 		t.Run("NoError", func(t *testing.T) {

diff --git a/exporters/stdout/stdouttrace/trace.go b/exporters/stdout/stdouttrace/trace.go
@@ -88,11 +88,6 @@ func (e *Exporter) Shutdown(ctx context.Context) error {
 	e.stopped = true
 	e.stoppedMu.Unlock()
 
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-	}
 	return nil
 }
 

diff --git a/exporters/stdout/stdouttrace/trace_test.go b/exporters/stdout/stdouttrace/trace_test.go
@@ -194,7 +194,7 @@ func TestExporterShutdownHonorsTimeout(t *testing.T) {
 	defer innerCancel()
 	<-innerCtx.Done()
 	err = e.Shutdown(innerCtx)
-	assert.ErrorIs(t, err, context.DeadlineExceeded)
+	assert.NoError(t, err)
 }
 
 func TestExporterShutdownHonorsCancel(t *testing.T) {
@@ -209,7 +209,7 @@ func TestExporterShutdownHonorsCancel(t *testing.T) {
 	innerCtx, innerCancel := context.WithCancel(ctx)
 	innerCancel()
 	err = e.Shutdown(innerCtx)
-	assert.ErrorIs(t, err, context.Canceled)
+	assert.NoError(t, err)
 }
 
 func TestExporterShutdownNoError(t *testing.T) {