Merge pull request #146 from fleetbase/dev-v1.6.7

v1.6.7 ~ telemetry tweak patch

Author: roncodes

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.6.6",
+    "version": "1.6.7",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",

src/Http/Controllers/Controller.php

@@ -21,10 +21,10 @@ public function hello(Request $request)
     {
         return response()->json(
             [
-                'message' => 'Fleetbase API',
-                'version' => config('fleetbase.api.version'),
+                'message'   => 'Fleetbase API',
+                'version'   => config('fleetbase.api.version'),
                 'fleetbase' => config('fleetbase.version'),
-                'ms'      => microtime(true) - $request->attributes->get('request_start_time'),
+                'ms'        => microtime(true) - $request->attributes->get('request_start_time'),
             ]
         );
     }

src/Support/Auth.php

@@ -184,7 +184,7 @@ public static function getCompany(string|array $select = '*'): ?Company
         }
 
         if (!$company) {
-            $companyId = request()->or(['company', 'company_uuid']);
+            $companyId = request()->input('company') ?? request()->input('company_uuid');
             if ($companyId) {
                 $company = Company::select($select)->where(function ($query) use ($companyId) {
                     $query->where('uuid', $companyId);

src/Support/Telemetry.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\Support;
 
+use Fleetbase\Models\Company;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
@@ -44,38 +45,39 @@ public static function send(array $payload = []): bool
 
         try {
             $ipinfo = self::getIpInfo();
+            $tags = [
+                'fleetbase.instance_id:' . self::getInstanceId(),
+                'fleetbase.company:' . self::getCompanyName(),
+                'fleetbase.version:' . self::getVersion(),
+                'fleetbase.domain:' . request()->getHost(),
+                'fleetbase.api:' . config('app.url'),
+                'fleetbase.console:' . config('fleetbase.console.host'),
+                'fleetbase.app_name:' . config('app.name'),
+                'fleetbase.version:' . config('fleetbase.version'),
+                'php.version:' . PHP_VERSION,
+                'laravel.version:' . app()->version(),
+                'env:' . app()->environment(),
+                'timezone:' . data_get($ipinfo, 'time_zone.name', 'unknown'),
+                'region:' . data_get($ipinfo, 'region', 'unknown'),
+                'country:' . data_get($ipinfo, 'country_name', 'unknown'),
+                'country_code:' . data_get($ipinfo, 'country_code', 'unknown'),
+                'installation_type:' . self::getInstallationType(),
+                'users.count:' . self::countUsers(),
+                'companies.count:' . self::countCompanies(),
+                'orders.count:' . self::countOrders(),
+                'source.modified:' . (self::isSourceModified() ? 'true' : 'false'),
+                'source.commit_hash:' . self::getCurrentCommitHash(),
+                'source.main_hash:' . self::getOfficialRepoCommitHash(),
+            ];
 
             $defaultPayload = [
                 'title' => 'Fleetbase Instance Telemetry',
                 'text'  => 'Periodic instance telemetry from Fleetbase',
-                'tags'  => [
-                    'fleetbase.instance_id:' . self::getInstanceId(),
-                    'fleetbase.company:' . self::getCompanyName(),
-                    'fleetbase.version:' . self::getVersion(),
-                    'fleetbase.domain:' . request()->getHost(),
-                    'fleetbase.api:' . config('app.url'),
-                    'fleetbase.console:' . config('fleetbase.console.host'),
-                    'fleetbase.app_name:' . config('app.name'),
-                    'fleetbase.version:' . config('fleetbase.version'),
-                    'php.version:' . PHP_VERSION,
-                    'laravel.version:' . app()->version(),
-                    'env:' . app()->environment(),
-                    'timezone:' . data_get($ipinfo, 'time_zone.name', 'unknown'),
-                    'region:' . data_get($ipinfo, 'region', 'unknown'),
-                    'country:' . data_get($ipinfo, 'country_name', 'unknown'),
-                    'country_code:' . data_get($ipinfo, 'country_code', 'unknown'),
-                    'installation_type:' . self::getInstallationType(),
-                    'users.count:' . self::countUsers(),
-                    'companies.count:' . self::countCompanies(),
-                    'source.modified:' . (self::isSourceModified() ? 'true' : 'false'),
-                    'source.commit_hash:' . self::getCurrentCommitHash(),
-                    'source.main_hash:' . self::getOfficialRepoCommitHash(),
-                ],
+                'tags'  => $tags,
                 'alert_type' => 'info',
             ];
 
             $response = Http::timeout(5)->post(self::$endpoint, array_merge($defaultPayload, $payload));
-
             if ($response->successful()) {
                 return true;
             }
@@ -100,14 +102,19 @@ public static function send(array $payload = []): bool
      */
     public static function ping(): void
     {
-        if (app()->environment('production')) {
-            $lastPing = Cache::get('telemetry:last_ping');
-
-            if (!$lastPing || now()->diffInHours($lastPing) >= 24) {
-                static::send();
-                Cache::put('telemetry:last_ping', now(), now()->addHours(25));
+        Cache::remember(
+            'telemetry:last_ping',
+            now()->addHours(24),
+            function () {
+                try {
+                    static::send();
+                } catch (\Throwable $e) {
+                    Log::warning('[Telemetry] Send failed: ' . $e->getMessage());
+                }
+
+                return now()->toDateTimeString();
             }
-        }
+        );
     }
 
     /**
@@ -124,6 +131,10 @@ protected static function getInstanceId(): string
     protected static function getCompanyName(): string
     {
         $company = Auth::getCompany();
+        if (!$company) {
+            // default to first company
+            $company = Company::first();
+        }
 
         return $company ? $company->name : 'unknown';
     }
@@ -184,6 +195,14 @@ public static function countCompanies(): int
         return DB::table('companies')->count();
     }
 
+    /**
+     * Count the number of orders in the system.
+     */
+    public static function countOrders(): int
+    {
+        return DB::table('orders')->count();
+    }
+
     /**
      * Check if the source code has been modified from the expected Git commit hash.
      */