Evaluate $server in the constructor.

googleapis · May 2, 2017 · a87363f · a87363f
1 parent 0286fbd
commit a87363f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/Core/Report/GAEFlexMetadataProvider.php b/src/Core/Report/GAEFlexMetadataProvider.php
@@ -40,6 +40,10 @@ public function __construct(array $server)
         $versionId = isset($server['GAE_VERSION'])
             ? $server['GAE_VERSION']
             : 'unknown-version';
+        $labels = isset($server['HTTP_X_CLOUD_TRACE_CONTEXT'])
+            ? ['appengine.googleapis.com/trace_id' =>
+               substr($server['HTTP_X_CLOUD_TRACE_CONTEXT'], 0, 32)]
+            : [];
         $this->data =
             [
                 'resource' => [
@@ -52,7 +56,8 @@ public function __construct(array $server)
                 ],
                 'projectId' => $projectId,
                 'serviceId' => $serviceId,
-                'versionId' => $versionId
+                'versionId' => $versionId,
+                'labels' => $labels
             ];
     }
 
@@ -100,11 +105,6 @@ public function versionId()
      */
     public function labels()
     {
-        if (isset($_SERVER['HTTP_X_CLOUD_TRACE_CONTEXT'])) {
-            return ['appengine.googleapis.com/trace_id' =>
-                    substr($_SERVER['HTTP_X_CLOUD_TRACE_CONTEXT'], 0, 32)];
-        } else {
-            return [];
-        }
+        return $this->data['labels'];
     }
 }
diff --git a/tests/unit/Core/Report/GAEFlexMetadataProviderTest.php b/tests/unit/Core/Report/GAEFlexMetadataProviderTest.php
@@ -28,11 +28,11 @@ class GAEFlexMetadataProviderTest extends \PHPUnit_Framework_TestCase
         'GAE_SERVICE' => 'my-service',
         'GAE_VERSION' => 'my-version',
         'GCLOUD_PROJECT' => 'my-project',
+        'HTTP_X_CLOUD_TRACE_CONTEXT' => 'my-traceId'
     ];
 
     public function testWithEnvs()
     {
-        $_SERVER['HTTP_X_CLOUD_TRACE_CONTEXT'] = 'my-traceId';
         $metadataProvider = new GAEFlexMetadataProvider($this->envs);
         $this->assertEquals(
             [
@@ -58,7 +58,6 @@ public function testWithEnvs()
 
     public function testWithOutEnvs()
     {
-        unset($_SERVER['HTTP_X_CLOUD_TRACE_CONTEXT']);
         $metadataProvider = new GAEFlexMetadataProvider([]);
         $this->assertEquals(
             [

diff --git a/tests/unit/Logging/PsrBatchLoggerTest.php b/tests/unit/Logging/PsrBatchLoggerTest.php
@@ -79,9 +79,10 @@ public function testTraceIdLabelOnGAEFlex(
         $expectedLabels
     ) {
         if (empty($traceId)) {
+            $server = [];
             unset($_SERVER['HTTP_X_CLOUD_TRACE_CONTEXT']);
         } else {
-            $_SERVER['HTTP_X_CLOUD_TRACE_CONTEXT'] = $traceId;
+            $server = ['HTTP_X_CLOUD_TRACE_CONTEXT' => $traceId];
         }
         $this->runner->submitItem(
             'stackdriver-logging-my-log', Argument::any()
@@ -98,7 +99,7 @@ public function testTraceIdLabelOnGAEFlex(
             'my-log',
             [
                 'batchRunner' => $this->runner->reveal(),
-                'metadataProvider' => new GaeFlexMetadataProvider([])
+                'metadataProvider' => new GaeFlexMetadataProvider($server)
             ]
         );
         $psrBatchLogger->info(