Merge pull request #15 from bufferapp/task/do-stop-with-exception

Handle DDTrace\GlobalTracer class missing exception

Author: erickhun

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bufferapp/php-bufflog",
     "description": "PHP log libraries for Buffer services",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "require": {
         "php": "^7.1",
         "monolog/monolog": "^1.20",

src/BuffLog/BuffLog.php

@@ -103,15 +103,21 @@ private static function enrichLog()
             // );
 
             try {
+
+                if (class_exists("\DDTrace\GlobalTracer", false) === false) {
+                    throw new \Exception('DDTrace\GlobalTracer can\'t be found. Have you setup the Datadog Tracer extension? If you run cli worker, have you added the DD_TRACE_CLI_ENABLED env variable?');
+                }
+
                 // Add traces information to be able to correlate logs with APM
                 $ddTraceSpan = \DDTrace\GlobalTracer::get()->getActiveSpan();
                 $record['context']['dd'] = [
                     "trace_id" => $ddTraceSpan->getTraceId(),
                     "span_id"  => $ddTraceSpan->getSpanId()
                 ];
 
-            } catch (Exception $e) {
-                error_log($e->getMessage() . " Can't add trace to logs. Have you setup the Datadog Tracer extension? If you run a worker have your added the DD_TRACE_CLI_ENABLED env variable?");
+            } catch (\Exception $e) {
+                // we probably will want to make an no-op or it will be too verbose
+                error_log($e->getMessage() . " Traces will not be added in the logs");
             }
 
             return $record;