From f8ac3495b024d046e72d41151fb0e4910360e7a4 Mon Sep 17 00:00:00 2001
From: Bertrand Mermet <bertrand.mermet@datadoghq.com>
Date: Mon, 22 Jan 2018 11:59:43 +0100
Subject: [PATCH] Add close method on Scope

---
 src/Datadog.Trace.Tests/TracerTests.cs     | 14 +++++++++++++-
 src/Datadog.Trace/Implementations/Scope.cs | 10 +++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Datadog.Trace.Tests/TracerTests.cs b/src/Datadog.Trace.Tests/TracerTests.cs
index 9bc894f489e0..8beb076b857c 100644
--- a/src/Datadog.Trace.Tests/TracerTests.cs
+++ b/src/Datadog.Trace.Tests/TracerTests.cs
@@ -66,7 +66,19 @@ public void StartActive_FinishOnClose_SpanIsFinishedWhenScopeIsClosed()
             var scope = _tracer.StartActive("Operation");
             Assert.False(scope.Span.IsFinished);
 
-            scope.Dispose();
+            scope.Close();
+
+            Assert.True(scope.Span.IsFinished);
+            Assert.Null(_tracer.ActiveScope);
+        }
+
+        [Fact]
+        public void StartActive_FinishOnClose_SpanIsFinishedWhenScopeIsDisposed()
+        {
+            Scope scope;
+            using(scope = _tracer.StartActive("Operation")){
+                Assert.False(scope.Span.IsFinished);
+            }
 
             Assert.True(scope.Span.IsFinished);
             Assert.Null(_tracer.ActiveScope);
diff --git a/src/Datadog.Trace/Implementations/Scope.cs b/src/Datadog.Trace/Implementations/Scope.cs
index 11e2ea4f7a09..00d433da3a3c 100644
--- a/src/Datadog.Trace/Implementations/Scope.cs
+++ b/src/Datadog.Trace/Implementations/Scope.cs
@@ -31,7 +31,7 @@ internal Scope(Scope parent, Span span,  AsyncLocalScopeManager scopeManager, bo
         /// <summary>
         /// Closes the current scope and makes its parent scope active
         /// </summary>
-        public void Dispose()
+        public void Close()
         {
             _scopeManager.Close(this);
             if (_finishOnClose)
@@ -39,5 +39,13 @@ public void Dispose()
                 Span.Finish();
             }
         }
+
+        /// <summary>
+        /// Closes the current scope and makes its parent scope active
+        /// </summary>
+        public void Dispose()
+        {
+            Close();
+        }
     }
 }