Change namespace to Elastic\Apm

composer.json

@@ -27,13 +27,13 @@
     },
     "autoload": {
         "psr-4": {
-            "ElasticApm\\": "./src/ElasticApm/"
+            "Elastic\\Apm\\": "./src/ElasticApm/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "ElasticApmTests\\": "./tests/ElasticApmTests/",
-            "ElasticApmExamples\\": "./examples/ElasticApmExamples/"
+            "Elastic\\Apm\\Tests\\": "./tests/ElasticApmTests/",
+            "Elastic\\Apm\\Examples\\": "./examples/ElasticApmExamples/"
         }
     },
     "config": {

examples/ElasticApmExamples/UsingPublicApi/ExampleUsingPublicApi.php

@@ -4,12 +4,12 @@
 
 declare(strict_types=1);
 
-namespace ElasticApmExamples\UsingPublicApi;
+namespace Elastic\Apm\Examples\UsingPublicApi;
 
-use ElasticApm\Impl\TracerBuilder;
-use ElasticApm\TransactionInterface;
-use ElasticApmTests\Util\MockReporter;
-use ElasticApmTests\Util\TestCaseBase;
+use Elastic\Apm\Impl\TracerBuilder;
+use Elastic\Apm\TransactionInterface;
+use Elastic\Apm\Tests\Util\MockReporter;
+use Elastic\Apm\Tests\Util\TestCaseBase;
 
 class ExampleUsingPublicApi extends TestCaseBase
 {

examples/ElasticApmExamples/UsingPublicApi/main.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ElasticApmExamples\UsingPublicApi;
+namespace Elastic\Apm\Examples\UsingPublicApi;
 
 require __DIR__ . '/../../../vendor/autoload.php';
 

src/ElasticApm/ElasticApm.php

@@ -4,11 +4,11 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm;
+namespace Elastic\Apm;
 
 use Closure;
-use ElasticApm\Impl\GlobalTracerHolder;
-use ElasticApm\Impl\Util\StaticClassTrait;
+use Elastic\Apm\Impl\GlobalTracerHolder;
+use Elastic\Apm\Impl\Util\StaticClassTrait;
 
 /**
  * Class ElasticApm is a facade (as in Facade design pattern) to the rest of Elastic APM public API.

src/ElasticApm/ExecutionSegmentInterface.php

@@ -4,7 +4,7 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm;
+namespace Elastic\Apm;
 
 use Closure;
 

src/ElasticApm/Impl/Clock.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
-use ElasticApm\Impl\Util\CachedSingletonInstanceTrait;
-use ElasticApm\Impl\Util\TimeUtil;
+use Elastic\Apm\Impl\Util\LazySingletonInstanceTrait;
+use Elastic\Apm\Impl\Util\TimeUtil;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.
@@ -14,7 +14,7 @@
  */
 final class Clock implements ClockInterface
 {
-    use CachedSingletonInstanceTrait;
+    use LazySingletonInstanceTrait;
 
     /** @inheritDoc */
     public function getSystemClockCurrentTime(): float

src/ElasticApm/Impl/ClockInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/ExecutionSegment.php

@@ -4,12 +4,12 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
 use Closure;
-use ElasticApm\ExecutionSegmentInterface;
-use ElasticApm\Impl\Util\IdGenerator;
-use ElasticApm\Impl\Util\TimeUtil;
+use Elastic\Apm\ExecutionSegmentInterface;
+use Elastic\Apm\Impl\Util\IdGenerator;
+use Elastic\Apm\Impl\Util\TimeUtil;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/GlobalTracerHolder.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
-use ElasticApm\Impl\Util\StaticClassTrait;
-use ElasticApm\TracerInterface;
+use Elastic\Apm\Impl\Util\StaticClassTrait;
+use Elastic\Apm\TracerInterface;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/NoopExecutionSegment.php

@@ -4,11 +4,11 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
 use Closure;
-use ElasticApm\ExecutionSegmentInterface;
-use ElasticApm\SpanInterface;
+use Elastic\Apm\ExecutionSegmentInterface;
+use Elastic\Apm\SpanInterface;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/NoopReporter.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
-use ElasticApm\Impl\Util\NoopObjectTrait;
-use ElasticApm\SpanInterface;
-use ElasticApm\TransactionInterface;
+use Elastic\Apm\Impl\Util\NoopObjectTrait;
+use Elastic\Apm\SpanInterface;
+use Elastic\Apm\TransactionInterface;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/NoopSpan.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
-use ElasticApm\Impl\Util\NoopObjectTrait;
-use ElasticApm\SpanInterface;
+use Elastic\Apm\Impl\Util\NoopObjectTrait;
+use Elastic\Apm\SpanInterface;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/NoopTracer.php

@@ -4,12 +4,12 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
 use Closure;
-use ElasticApm\Impl\Util\NoopObjectTrait;
-use ElasticApm\TracerInterface;
-use ElasticApm\TransactionInterface;
+use Elastic\Apm\Impl\Util\NoopObjectTrait;
+use Elastic\Apm\TracerInterface;
+use Elastic\Apm\TransactionInterface;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/NoopTransaction.php

@@ -4,12 +4,12 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
 use Closure;
-use ElasticApm\Impl\Util\NoopObjectTrait;
-use ElasticApm\SpanInterface;
-use ElasticApm\TransactionInterface;
+use Elastic\Apm\Impl\Util\NoopObjectTrait;
+use Elastic\Apm\SpanInterface;
+use Elastic\Apm\TransactionInterface;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/ReporterInterface.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
-use ElasticApm\SpanInterface;
-use ElasticApm\TransactionInterface;
+use Elastic\Apm\SpanInterface;
+use Elastic\Apm\TransactionInterface;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/Span.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
-use ElasticApm\Impl\Util\TimeUtil;
-use ElasticApm\SpanInterface;
+use Elastic\Apm\Impl\Util\TimeUtil;
+use Elastic\Apm\SpanInterface;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/Tracer.php

@@ -4,11 +4,11 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
 use Closure;
-use ElasticApm\TracerInterface;
-use ElasticApm\TransactionInterface;
+use Elastic\Apm\TracerInterface;
+use Elastic\Apm\TransactionInterface;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/TracerBuilder.php

@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
-use ElasticApm\TracerInterface;
+use Elastic\Apm\Impl\Util\HiddenConstructorTrait;
+use Elastic\Apm\TracerInterface;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.
@@ -13,6 +14,11 @@
  */
 final class TracerBuilder
 {
+    /**
+     * Constructor is hidden because startNew() should be used instead
+     */
+    use HiddenConstructorTrait;
+
     /** @var bool */
     private $isEnabled = true;
 
@@ -22,13 +28,6 @@ final class TracerBuilder
     /** @var ReporterInterface|null */
     private $reporter;
 
-    /**
-     * Constructor is hidden because startNew() should be used instead.
-     */
-    private function __construct()
-    {
-    }
-
     public static function startNew(): self
     {
         return new self();

src/ElasticApm/Impl/Transaction.php

@@ -4,12 +4,12 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl;
+namespace Elastic\Apm\Impl;
 
 use Closure;
-use ElasticApm\Impl\Util\IdGenerator;
-use ElasticApm\SpanInterface;
-use ElasticApm\TransactionInterface;
+use Elastic\Apm\Impl\Util\IdGenerator;
+use Elastic\Apm\SpanInterface;
+use Elastic\Apm\TransactionInterface;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.

src/ElasticApm/Impl/Util/HiddenConstructorTrait.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Elastic\Apm\Impl\Util;
+
+/**
+ * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.
+ *
+ * @internal
+ */
+trait HiddenConstructorTrait
+{
+    /**
+     * Constructor is hidden
+     */
+    /** @noinspection PhpUnused */
+    private function __construct()
+    {
+    }
+}

src/ElasticApm/Impl/Util/IdGenerator.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ElasticApm\Impl\Util;
+namespace Elastic\Apm\Impl\Util;
 
 /**
  * Code in this file is part of implementation internals and thus it is not covered by the backward compatibility.