More tests

Author: intuibase

docker/mysql/init.sql

@@ -1,8 +1,11 @@
-CREATE DATABASE IF NOT EXISTS otel_db;
-CREATE USER IF NOT EXISTS 'otel_user'@'%' IDENTIFIED BY 'otel_passwd';
-GRANT ALL PRIVILEGES ON otel_db.* TO 'otel_user'@'%';
+-- CREATE DATABASE IF NOT EXISTS otel_db;
+-- DROP USER IF EXISTS 'otel_user'@'%';
+-- CREATE USER 'otel_user'@'%' IDENTIFIED BY 'otel_passwd';
+
+GRANT ALL PRIVILEGES ON *.* TO 'otel_user'@'%';
 FLUSH PRIVILEGES;
 
+
 USE otel_db;
 
 CREATE TABLE users (

src/Instrumentation/MySqli/src/MySqliInstrumentation.php

@@ -353,13 +353,12 @@ private static function constructPreHook(string $spanName, int $paramsOffset, Ca
 
     private static function constructPostHook(int $paramsOffset, CachedInstrumentation $instrumentation, MySqliTracker $tracker, $obj, array $params, mixed $retVal, ?\Throwable $exception)
     {
-
         $mysqliObject = null;
 
         if ($obj && $retVal !== false) { // even if constructor fails, we will get and temporary object which will be assigned (or not) alter in user code
             $mysqliObject = $obj;
         } elseif ($retVal instanceof mysqli) { // procedural mode
-            $mySqliObject = $retVal;
+            $mysqliObject = $retVal;
         } elseif ($paramsOffset == self::MYSQLI_REAL_CONNECT_ARG_OFFSET && $retVal !== false && $params[0] instanceof mysqli) { // real_connect procedural mode
             $mysqliObject = $params[0];
         }
@@ -369,7 +368,6 @@ private static function constructPostHook(int $paramsOffset, CachedInstrumentati
         }
 
         self::endSpan([], $exception, ($retVal === false && !$exception) ? mysqli_connect_error() : null);
-
     }
 
     /** @param non-empty-string $spanName */
@@ -380,11 +378,11 @@ private static function queryPreHook(string $spanName, CachedInstrumentation $in
 
     private static function queryPostHook(CachedInstrumentation $instrumentation, MySqliTracker $tracker, $obj, array $params, mixed $retVal, ?\Throwable $exception)
     {
-
         $mysqli = $obj ? $obj : $params[0];
         $query = $obj ? $params[0] : $params[1];
 
         $attributes = $tracker->getMySqliAttributes($mysqli);
+
         $attributes[TraceAttributes::DB_STATEMENT] = mb_convert_encoding($query, 'UTF-8');
         $attributes[TraceAttributes::DB_OPERATION_NAME] = self::extractQueryCommand($query);