Merge 1a2eb58 into 4bf4b69

open-telemetry · Jan 29, 2021 · 9bd4f6b · 9bd4f6b
2 parents 4bf4b69 + 1a2eb58
commit 9bd4f6b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 59 deletions.
diff --git a/sdk/trace/trace_go11.go b/sdk/trace/trace_go11.go
diff --git a/sdk/trace/trace_nongo11.go b/sdk/trace/trace_nongo11.go
diff --git a/sdk/trace/tracer.go b/sdk/trace/tracer.go
@@ -16,6 +16,7 @@ package trace // import "go.opentelemetry.io/otel/sdk/trace"
 
 import (
 	"context"
+	rt "runtime/trace"
 
 	"go.opentelemetry.io/otel/internal/trace/parent"
 	"go.opentelemetry.io/otel/trace"
@@ -65,7 +66,15 @@ func (tr *tracer) Start(ctx context.Context, name string, options ...trace.SpanO
 		}
 	}
 
-	ctx, end := startExecutionTracerTask(ctx, name)
-	span.executionTracerTaskEnd = end
+	ctx, span.executionTracerTaskEnd = func(ctx context.Context) (context.Context, func()) {
+		if !rt.IsEnabled() {
+			// Avoid additional overhead if
+			// runtime/trace is not enabled.
+			return ctx, func() {}
+		}
+		nctx, task := rt.NewTask(ctx, name)
+		return nctx, task.End
+	}(ctx)
+
 	return trace.ContextWithSpan(ctx, span), span
 }