From 2a8a47a6e956a027fab0b8a9610a8bcb3a014214 Mon Sep 17 00:00:00 2001
From: Michael Hoffmann <michael.hoffmann@sentry.io>
Date: Fri, 23 Sep 2022 10:55:43 +0200
Subject: [PATCH] fix: Update span ops

---
 phpstan.neon                                         |  2 ++
 .../Doctrine/DBAL/AbstractTracingStatement.php       |  2 +-
 .../Doctrine/DBAL/TracingDriverConnection.php        | 12 ++++++------
 tests/End2End/App/Kernel.php                         |  4 ++++
 tests/End2End/App/config.yml                         |  1 +
 tests/End2End/App/deprecations_for_6.yml             |  2 ++
 6 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 tests/End2End/App/deprecations_for_6.yml

diff --git a/phpstan.neon b/phpstan.neon
index df2e90c3..ce46ce35 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -10,6 +10,8 @@ parameters:
         - src/aliases.php
     excludePaths:
         - src/aliases.php
+        - src/Tracing/Cache/TraceableCacheAdapterForV2.php
+        - src/Tracing/Cache/TraceableTagAwareCacheAdapterForV2.php
         - src/Tracing/Doctrine/DBAL/TracingStatementForV2.php
         - src/Tracing/Doctrine/DBAL/TracingDriverForV2.php
         - tests/End2End/App
diff --git a/src/Tracing/Doctrine/DBAL/AbstractTracingStatement.php b/src/Tracing/Doctrine/DBAL/AbstractTracingStatement.php
index ba489196..44ab46e5 100644
--- a/src/Tracing/Doctrine/DBAL/AbstractTracingStatement.php
+++ b/src/Tracing/Doctrine/DBAL/AbstractTracingStatement.php
@@ -14,7 +14,7 @@ abstract class AbstractTracingStatement
     /**
      * @internal
      */
-    public const SPAN_OP_STMT_EXECUTE = 'sql.stmt.execute';
+    public const SPAN_OP_STMT_EXECUTE = 'db.sql.execute';
 
     /**
      * @var HubInterface The current hub
diff --git a/src/Tracing/Doctrine/DBAL/TracingDriverConnection.php b/src/Tracing/Doctrine/DBAL/TracingDriverConnection.php
index 349961b9..c71b1d9b 100644
--- a/src/Tracing/Doctrine/DBAL/TracingDriverConnection.php
+++ b/src/Tracing/Doctrine/DBAL/TracingDriverConnection.php
@@ -23,32 +23,32 @@ final class TracingDriverConnection implements TracingDriverConnectionInterface
     /**
      * @internal
      */
-    public const SPAN_OP_CONN_PREPARE = 'sql.conn.prepare';
+    public const SPAN_OP_CONN_PREPARE = 'db.sql.prepare';
 
     /**
      * @internal
      */
-    public const SPAN_OP_CONN_QUERY = 'sql.conn.query';
+    public const SPAN_OP_CONN_QUERY = 'db.sql.query';
 
     /**
      * @internal
      */
-    public const SPAN_OP_CONN_EXEC = 'sql.conn.exec';
+    public const SPAN_OP_CONN_EXEC = 'db.sql.exec';
 
     /**
      * @internal
      */
-    public const SPAN_OP_CONN_BEGIN_TRANSACTION = 'sql.conn.begin_transaction';
+    public const SPAN_OP_CONN_BEGIN_TRANSACTION = 'db.sql.transaction.begin';
 
     /**
      * @internal
      */
-    public const SPAN_OP_TRANSACTION_COMMIT = 'sql.transaction.commit';
+    public const SPAN_OP_TRANSACTION_COMMIT = 'db.sql.transaction.commit';
 
     /**
      * @internal
      */
-    public const SPAN_OP_TRANSACTION_ROLLBACK = 'sql.transaction.rollback';
+    public const SPAN_OP_TRANSACTION_ROLLBACK = 'db.sql.transaction.rollback';
 
     /**
      * @var HubInterface The current hub
diff --git a/tests/End2End/App/Kernel.php b/tests/End2End/App/Kernel.php
index 7d7047fb..47ab8beb 100644
--- a/tests/End2End/App/Kernel.php
+++ b/tests/End2End/App/Kernel.php
@@ -44,6 +44,10 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
             $loader->load(__DIR__ . '/deprecations_for_5.yml');
         }
 
+        if (self::VERSION_ID >= 60000) {
+            $loader->load(__DIR__ . '/deprecations_for_6.yml');
+        }
+
         if (interface_exists(MessageBusInterface::class) && self::VERSION_ID >= 40300) {
             $loader->load(__DIR__ . '/messenger.yml');
         }
diff --git a/tests/End2End/App/config.yml b/tests/End2End/App/config.yml
index ef7425f1..43751e8d 100644
--- a/tests/End2End/App/config.yml
+++ b/tests/End2End/App/config.yml
@@ -1,4 +1,5 @@
 sentry:
+  dsn: http://public@example.com/sentry/1
   tracing:
     enabled: true
   options:
diff --git a/tests/End2End/App/deprecations_for_6.yml b/tests/End2End/App/deprecations_for_6.yml
new file mode 100644
index 00000000..8d2f8629
--- /dev/null
+++ b/tests/End2End/App/deprecations_for_6.yml
@@ -0,0 +1,2 @@
+framework:
+  http_method_override: false