diff --git a/examples/otlp/foo_library/foo_library.cc b/examples/otlp/foo_library/foo_library.cc
index fdbf5b892b..764e6653d4 100644
--- a/examples/otlp/foo_library/foo_library.cc
+++ b/examples/otlp/foo_library/foo_library.cc
@@ -11,29 +11,23 @@ nostd::shared_ptr<trace::Tracer> get_tracer()
   return provider->GetTracer("foo_library");
 }
 
-// TODO: Remove all calls to span->End() once context memory issue is fixed
-// (https://github.com/open-telemetry/opentelemetry-cpp/issues/287)
-
 void f1()
 {
-  auto span = get_tracer()->StartSpan("f1");
-  span->End();
+  auto scoped_span = trace::Scope(get_tracer()->StartSpan("f1"));
 }
 
 void f2()
 {
-  auto span = get_tracer()->StartSpan("f2");
+  auto scoped_span = trace::Scope(get_tracer()->StartSpan("f2"));
 
   f1();
   f1();
-  span->End();
 }
 }  // namespace
 
 void foo_library()
 {
-  auto span = get_tracer()->StartSpan("library");
+  auto scoped_span = trace::Scope(get_tracer()->StartSpan("library"));
 
   f2();
-  span->End();
 }