From db97a4d65f61aa9375d66491dcef0f20c932dc36 Mon Sep 17 00:00:00 2001
From: YAMANE Nana <yamane@bitnauts.co.jp>
Date: Mon, 20 Dec 2021 18:45:03 +0900
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=82=B3=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ResourceTrace.php        |  2 --
 src/Span.php                 | 14 --------------
 src/SpanInterface.php        |  2 --
 src/Transaction.php          |  5 -----
 src/TransactionInterface.php |  2 --
 tests/ResourceTraceTest.php  |  2 --
 6 files changed, 27 deletions(-)

diff --git a/src/ResourceTrace.php b/src/ResourceTrace.php
index 7d0bdf9..6ffcf88 100644
--- a/src/ResourceTrace.php
+++ b/src/ResourceTrace.php
@@ -43,7 +43,6 @@ public function setCurrentSpan(ResourceObject $result): void
 
         /** @psalm-suppress StaticAccess */
         $tracingSpan->setStatus(SpanStatus::createFromHttpStatusCode($result->code));
-        $this->span->setCurrentSpan($tracingSpan);
     }
 
     public function setTransaction(ResourceObject $result): void
@@ -55,7 +54,6 @@ public function setTransaction(ResourceObject $result): void
         $tracingTran = $this->transaction->getTransaction();
         /** @psalm-suppress StaticAccess */
         $tracingTran->setStatus(SpanStatus::createFromHttpStatusCode($result->code));
-        $this->transaction->setTransaction($tracingTran);
     }
 
     public function isFirstSpan(): bool
diff --git a/src/Span.php b/src/Span.php
index db6f3ef..fcd83ea 100644
--- a/src/Span.php
+++ b/src/Span.php
@@ -64,20 +64,6 @@ public function getCurrentSpan()
         return null;
     }
 
-    public function setCurrentSpan(?TracingSpan $span): void
-    {
-        if (count($this->spans) === 0) {
-            return;
-        }
-
-        $span = array_pop($this->spans);
-        if (! $span) {
-            return;
-        }
-
-        $this->spans[] = $span;
-    }
-
     public function isFirst(): bool
     {
         // First Span (Transaction's child)
diff --git a/src/SpanInterface.php b/src/SpanInterface.php
index b73f2f4..7912fc8 100644
--- a/src/SpanInterface.php
+++ b/src/SpanInterface.php
@@ -18,7 +18,5 @@ public function finish(): void;
      */
     public function getCurrentSpan();
 
-    public function setCurrentSpan(?TracingSpan $span): void;
-
     public function isFirst(): bool;
 }
diff --git a/src/Transaction.php b/src/Transaction.php
index d559d00..f7d7878 100644
--- a/src/Transaction.php
+++ b/src/Transaction.php
@@ -63,9 +63,4 @@ public function getTransaction(): SentryTransaction
     {
         return $this->transaction;
     }
-
-    public function setTransaction(SentryTransaction $transaction): void
-    {
-        $this->transaction = $transaction;
-    }
 }
diff --git a/src/TransactionInterface.php b/src/TransactionInterface.php
index a3ec72f..0c6e99a 100644
--- a/src/TransactionInterface.php
+++ b/src/TransactionInterface.php
@@ -9,6 +9,4 @@
 interface TransactionInterface extends StartChildInterface
 {
     public function getTransaction(): SentryTransaction;
-
-    public function setTransaction(SentryTransaction $transaction): void;
 }
diff --git a/tests/ResourceTraceTest.php b/tests/ResourceTraceTest.php
index fadc7b9..ddb2b99 100644
--- a/tests/ResourceTraceTest.php
+++ b/tests/ResourceTraceTest.php
@@ -33,7 +33,6 @@ public function testSetCurrentSpanUpdateSpan(): void
 
         $mockSpan = $this->createMock(SpanInterface::class);
         $mockSpan->expects($this->once())->method('getCurrentSpan')->willReturn($sentrySpan);
-        $mockSpan->expects($this->once())->method('setCurrentSpan');
 
         $factory = new SpanContextFactory(new ResourceSpanFactory());
 
@@ -49,7 +48,6 @@ public function testSetTransactionUpdateTransaction(): void
 
         $mockTransaction = $this->createMock(TransactionInterface::class);
         $mockTransaction->expects($this->once())->method('getTransaction')->willReturn($sentryTransaction);
-        $mockTransaction->expects($this->once())->method('setTransaction');
 
         $span = new Span(new Transaction(['dsn' => null], 'test-dummy'));