feat: db sql

Author: overtrue

src/Watchers/AuthenticateWatcher.php

@@ -6,20 +6,18 @@
 
 use Illuminate\Auth\Events\Login;
 use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Support\Facades\Event;
 use OpenTelemetry\API\Trace\Span;
-use OpenTelemetry\SemConv\TraceAttributes;
 use Overtrue\LaravelOpenTelemetry\Facades\Measure;
 
 class AuthenticateWatcher implements Watcher
 {
     public function register(Application $app): void
     {
-        Event::listen(Login::class, function (Login $event) {
+        $app['events']->listen(Login::class, function (Login $event) {
             $span = Measure::activeSpan();
 
             if ($span instanceof Span) {
-                $span->setAttribute(TraceAttributes::DB_USER, $event->user->getKey());
+                $span->setAttribute('user.id', $event->user->getKey());
             }
         });
     }

src/Watchers/DatabaseQueryWatcher.php

@@ -29,19 +29,45 @@ public function recordQuery(QueryExecuted $query): void
             $operationName = null;
         }
 
-        $span = Measure::span(sprintf('[DB] %s', $operationName))
+        $table = $this->getTableName($query->sql);
+        $rawSql = $query->connection->getQueryGrammar()?->substituteBindingsIntoRawSql($query->sql, $query->bindings);
+
+        $spanName = sprintf('[DB][%s][%s] %s', $operationName, $table, Str::limit($rawSql, 50));
+
+        $span = Measure::span($spanName)
             ->setSpanKind(SpanKind::KIND_CLIENT)
             ->setStartTimestamp($this->getEventStartTimestampNs($query->time))
             ->start();
 
         $span->setAttributes([
+            'db.sql.raw' => $rawSql,
             TraceAttributes::DB_SYSTEM => $query->connection->getDriverName(),
             TraceAttributes::DB_NAME => $query->connection->getDatabaseName(),
             TraceAttributes::DB_OPERATION => $operationName,
             TraceAttributes::DB_USER => $query->connection->getConfig('username'),
             TraceAttributes::DB_STATEMENT => $query->sql,
+            TraceAttributes::DB_SQL_TABLE => $table,
         ]);
 
         $span->end();
     }
+
+    protected function getTableName(string $sql): string
+    {
+        // update
+        if (preg_match('/update\s+`?(\w+)`?/i', $sql, $matches)) {
+            return $matches[1];
+        }
+
+        // insert
+        if (preg_match('/insert\s+into\s+`?(\w+)`?/i', $sql, $matches)) {
+            return $matches[1];
+        }
+
+        if (preg_match('/from\s+`?(\w+)`?/i', $sql, $matches)) {
+            return $matches[1];
+        }
+
+        return 'unknown';
+    }
 }