Ensure compatibility with upstream (#55)

* Ensure compatibility with upstream * Fix CS * Pin upstream version to 0.0.8
open-telemetry · Mar 28, 2022 · 258aa9c · 258aa9c
1 parent dbc5850
commit 258aa9c
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 40 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "ext-json": "*",
-        "open-telemetry/opentelemetry": "~0.0.6",
+        "open-telemetry/opentelemetry": "^0.0.8",
         "php-http/discovery": "^1.14",
         "php-http/message": "^1.12"
     },

diff --git a/src/Aws/Ec2/Detector.php b/src/Aws/Ec2/Detector.php
@@ -20,9 +20,10 @@
 
 namespace OpenTelemetry\Aws\Ec2;
 
-use OpenTelemetry\SDK\Attributes;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
 use OpenTelemetry\SemConv\ResourceAttributes;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
@@ -67,15 +68,15 @@ public function getResource(): ResourceInfo
             $token = $this->fetchToken();
 
             if ($token === null) {
-                return ResourceInfo::emptyResource();
+                return ResourceInfoFactory::emptyResource();
             }
 
             $hostName = $this->fetchHostname($token);
 
             $identitiesJson = $this->fetchIdentity($token);
 
             if (!$token || !$identitiesJson) {
-                return ResourceInfo::emptyResource();
+                return ResourceInfoFactory::emptyResource();
             }
 
             $attributes = new Attributes();
@@ -115,7 +116,7 @@ public function getResource(): ResourceInfo
             return ResourceInfo::create(new Attributes($attributes), ResourceAttributes::SCHEMA_URL);
         } catch (\Throwable $e) {
             //TODO: add 'Process is not running on K8S when logging is added
-            return ResourceInfo::emptyResource();
+            return ResourceInfoFactory::emptyResource();
         }
     }
 

diff --git a/src/Aws/Ecs/Detector.php b/src/Aws/Ecs/Detector.php
@@ -19,9 +19,10 @@
 
 namespace OpenTelemetry\Aws\Ecs;
 
-use OpenTelemetry\SDK\Attributes;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
 use OpenTelemetry\SemConv\ResourceAttributes;
 use Throwable;
 
@@ -54,14 +55,14 @@ public function getResource(): ResourceInfo
         // Check if running on ECS by looking for below environment variables
         if (!getenv(self::ECS_METADATA_KEY_V4) && !getenv(self::ECS_METADATA_KEY_V3)) {
             // TODO: add 'Process is not running on ECS' when logs are added
-            return ResourceInfo::emptyResource();
+            return ResourceInfoFactory::emptyResource();
         }
 
         $hostName = $this->processData->getHostname();
         $containerId = $this->getContainerId();
 
         return !$hostName && !$containerId
-            ? ResourceInfo::emptyResource()
+            ? ResourceInfoFactory::emptyResource()
             : ResourceInfo::create(new Attributes([
                 ResourceAttributes::CONTAINER_NAME => $hostName,
                 ResourceAttributes::CONTAINER_ID => $containerId,

diff --git a/src/Aws/Eks/Detector.php b/src/Aws/Eks/Detector.php
@@ -19,9 +19,10 @@
 
 namespace OpenTelemetry\Aws\Eks;
 
-use OpenTelemetry\SDK\Attributes;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
 use OpenTelemetry\SemConv\ResourceAttributes;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface;
@@ -62,21 +63,21 @@ public function getResource(): ResourceInfo
     {
         try {
             if (!$this->dataProvider->isK8s() || !$this->isEks()) {
-                return ResourceInfo::emptyResource();
+                return ResourceInfoFactory::emptyResource();
             }
 
             $clusterName = $this->getClusterName();
             $containerId = $this->getContainerId();
 
             return !$clusterName && !$containerId
-                ? ResourceInfo::emptyResource()
+                ? ResourceInfoFactory::emptyResource()
                 : ResourceInfo::create(new Attributes([
                     ResourceAttributes::CONTAINER_ID => $containerId,
                     ResourceAttributes::K8S_CLUSTER_NAME => $clusterName,
                 ]));
         } catch (\Throwable $e) {
             //TODO: add 'Process is not running on K8S when logging is added
-            return ResourceInfo::emptyResource();
+            return ResourceInfoFactory::emptyResource();
         }
     }
 

diff --git a/src/Aws/Lambda/Detector.php b/src/Aws/Lambda/Detector.php
@@ -20,9 +20,10 @@
 
 namespace OpenTelemetry\Aws\Lambda;
 
-use OpenTelemetry\SDK\Attributes;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
 use OpenTelemetry\SemConv\ResourceAttributes;
 
 /**
@@ -51,7 +52,7 @@ public function getResource(): ResourceInfo
         $awsRegion = $awsRegion ? $awsRegion : null;
 
         return !$lambdaName && !$awsRegion && !$functionVersion
-            ? ResourceInfo::emptyResource()
+            ? ResourceInfoFactory::emptyResource()
             : ResourceInfo::create(new Attributes([
                 ResourceAttributes::FAAS_NAME => $lambdaName,
                 ResourceAttributes::FAAS_VERSION => $functionVersion,

diff --git a/src/Symfony/OtelSdkBundle/DependencyInjection/OtelSdkExtension.php b/src/Symfony/OtelSdkBundle/DependencyInjection/OtelSdkExtension.php
@@ -4,8 +4,8 @@
 
 namespace OpenTelemetry\Symfony\OtelSdkBundle\DependencyInjection;
 
-use OpenTelemetry\SDK\AttributeLimits;
-use OpenTelemetry\SDK\Attributes;
+use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Trace;
 use OpenTelemetry\Symfony\OtelSdkBundle\DependencyInjection\Configuration as Conf;
 use OpenTelemetry\Symfony\OtelSdkBundle\Trace\ExporterFactory;

diff --git a/src/Symfony/OtelSdkBundle/Resources/config/sdk.php b/src/Symfony/OtelSdkBundle/Resources/config/sdk.php
@@ -4,10 +4,10 @@
 
 namespace OpenTelemetry\Symfony\OtelSdkBundle\Resources;
 
-use OpenTelemetry\SDK\AttributeLimits;
-use OpenTelemetry\SDK\Attributes;
+use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
+use OpenTelemetry\SDK\Common\Time\SystemClock;
 use OpenTelemetry\SDK\Resource;
-use OpenTelemetry\SDK\SystemClock;
 use OpenTelemetry\SDK\Trace;
 use OpenTelemetry\SDK\Trace\Sampler;
 use OpenTelemetry\SDK\Trace\SpanProcessor;

diff --git a/tests/Integration/Symfony/OtelSdkBundle/DependencyInjection/OtelSdkExtensionTest.php b/tests/Integration/Symfony/OtelSdkBundle/DependencyInjection/OtelSdkExtensionTest.php
@@ -6,9 +6,9 @@
 
 use Exception;
 use OpenTelemetry\SDK;
-use OpenTelemetry\SDK\AttributeLimits;
-use OpenTelemetry\SDK\Attributes;
-use OpenTelemetry\SDK\SystemClock;
+use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
+use OpenTelemetry\SDK\Common\Time\SystemClock;
 use OpenTelemetry\SDK\Trace\SpanProcessor;
 use OpenTelemetry\Symfony\OtelSdkBundle\DependencyInjection\OtelSdkExtension;
 use OpenTelemetry\Symfony\OtelSdkBundle\DependencyInjection\Parameters;

diff --git a/tests/Integration/Symfony/OtelSdkBundle/Resources/SdkConfigTest.php b/tests/Integration/Symfony/OtelSdkBundle/Resources/SdkConfigTest.php
@@ -5,10 +5,10 @@
 namespace OpenTelemetry\Test\Integration\Symfony\OtelSdkBundle\Resources;
 
 use Exception;
-use OpenTelemetry\SDK\AttributeLimits;
-use OpenTelemetry\SDK\Attributes;
+use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
+use OpenTelemetry\SDK\Common\Time\SystemClock;
 use OpenTelemetry\SDK\Resource;
-use OpenTelemetry\SDK\SystemClock;
 use OpenTelemetry\SDK\Trace;
 use OpenTelemetry\SDK\Trace\Sampler;
 use OpenTelemetry\SDK\Trace\SpanProcessor;

diff --git a/tests/Unit/Aws/Ec2/DetectorTest.php b/tests/Unit/Aws/Ec2/DetectorTest.php
@@ -10,8 +10,8 @@
 use GuzzleHttp\Psr7\HttpFactory;
 use GuzzleHttp\Psr7\Response;
 use OpenTelemetry\Aws\Ec2\Detector;
-use OpenTelemetry\SDK\Attributes;
-use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
+use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
 use OpenTelemetry\SemConv\ResourceAttributes;
 use PHPUnit\Framework\TestCase;
 
@@ -100,7 +100,7 @@ public function TestInvalidTokenBody()
 
         $detector = new Detector($client, $requestFactory);
 
-        $this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
+        $this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
     }
 
     /**
@@ -123,7 +123,7 @@ public function TestInvalidTokenResponseCode()
 
         $detector = new Detector($client, $requestFactory);
 
-        $this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
+        $this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
     }
 
     /**
@@ -182,7 +182,7 @@ public function TestInvalidIdentities()
 
         $detector = new Detector($client, $requestFactory);
 
-        $this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
+        $this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
     }
 
     /**

diff --git a/tests/Unit/Aws/Ecs/DetectorTest.php b/tests/Unit/Aws/Ecs/DetectorTest.php
@@ -6,8 +6,9 @@
 
 use OpenTelemetry\Aws\Ecs\DataProvider;
 use OpenTelemetry\Aws\Ecs\Detector;
-use OpenTelemetry\SDK\Attributes;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
 use OpenTelemetry\SemConv\ResourceAttributes;
 use PHPUnit\Framework\TestCase;
 
@@ -95,7 +96,7 @@ public function TestIsRunningOnEcsReturnsEmpty()
 
         $detector = new Detector($mockData);
 
-        $this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
+        $this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
     }
 
     /**
@@ -197,7 +198,7 @@ public function TestReturnEmptyResourceInvalidContainerIdAndHostname()
 
         $detector = new Detector($mockData);
 
-        $this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
+        $this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
 
         // Unset environment variable
         putenv(self::ECS_ENV_VAR_V4_KEY);

diff --git a/tests/Unit/Aws/Eks/DetectorTest.php b/tests/Unit/Aws/Eks/DetectorTest.php
@@ -11,8 +11,9 @@
 use GuzzleHttp\Psr7\Response;
 use OpenTelemetry\Aws\Eks\DataProvider;
 use OpenTelemetry\Aws\Eks\Detector;
-use OpenTelemetry\SDK\Attributes;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
 use OpenTelemetry\SemConv\ResourceAttributes;
 use PHPUnit\Framework\TestCase;
 
@@ -257,7 +258,7 @@ public function testInvalidBodyIsEks()
 
         $detector = new Detector($mockData, $client, $requestFactory);
 
-        $this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
+        $this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
     }
 
     public function testInvalidResponseCode()
@@ -280,7 +281,7 @@ public function testInvalidResponseCode()
 
         $detector = new Detector($mockData, $client, $requestFactory);
 
-        $this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
+        $this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
     }
 
     public function testInvalidContainerIdAndClusterName()
@@ -303,7 +304,7 @@ public function testInvalidContainerIdAndClusterName()
 
         $detector = new Detector($mockData, $client, $requestFactory);
 
-        $this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
+        $this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
     }
 
     public function testInvalidKubernetesFile()
@@ -324,6 +325,6 @@ public function testInvalidKubernetesFile()
 
         $detector = new Detector($mockData, $client, $requestFactory);
 
-        $this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
+        $this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
     }
 }
diff --git a/tests/Unit/Aws/Lambda/DetectorTest.php b/tests/Unit/Aws/Lambda/DetectorTest.php
@@ -5,8 +5,9 @@
 namespace OpenTelemetry\Test\Unit\Aws\Lambda;
 
 use OpenTelemetry\Aws\Lambda\Detector;
-use OpenTelemetry\SDK\Attributes;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
 use OpenTelemetry\SemConv\ResourceAttributes;
 use PHPUnit\Framework\TestCase;
 
@@ -53,7 +54,7 @@ public function TestValidLambda()
     public function TestInvalidLambda()
     {
         $detector = new Detector();
-        $this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
+        $this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
     }
 
     /**