Skip to content

Commit 258aa9c

Browse files
tidaltidal
authored
Ensure compatibility with upstream (#55)
* Ensure compatibility with upstream * Fix CS * Pin upstream version to 0.0.8
1 parent dbc5850 commit 258aa9c

File tree

13 files changed

+47
-40
lines changed

13 files changed

+47
-40
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"require": {
1515
"php": "^7.4 || ^8.0",
1616
"ext-json": "*",
17-
"open-telemetry/opentelemetry": "~0.0.6",
17+
"open-telemetry/opentelemetry": "^0.0.8",
1818
"php-http/discovery": "^1.14",
1919
"php-http/message": "^1.12"
2020
},

‎src/Aws/Ec2/Detector.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@
2020

2121
namespace OpenTelemetry\Aws\Ec2;
2222

23-
use OpenTelemetry\SDK\Attributes;
23+
use OpenTelemetry\SDK\Common\Attribute\Attributes;
2424
use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;
2525
use OpenTelemetry\SDK\Resource\ResourceInfo;
26+
use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
2627
use OpenTelemetry\SemConv\ResourceAttributes;
2728
use Psr\Http\Client\ClientInterface;
2829
use Psr\Http\Message\RequestFactoryInterface;
@@ -67,15 +68,15 @@ public function getResource(): ResourceInfo
6768
$token = $this->fetchToken();
6869

6970
if ($token === null) {
70-
return ResourceInfo::emptyResource();
71+
return ResourceInfoFactory::emptyResource();
7172
}
7273

7374
$hostName = $this->fetchHostname($token);
7475

7576
$identitiesJson = $this->fetchIdentity($token);
7677

7778
if (!$token || !$identitiesJson) {
78-
return ResourceInfo::emptyResource();
79+
return ResourceInfoFactory::emptyResource();
7980
}
8081

8182
$attributes = new Attributes();
@@ -115,7 +116,7 @@ public function getResource(): ResourceInfo
115116
return ResourceInfo::create(new Attributes($attributes), ResourceAttributes::SCHEMA_URL);
116117
} catch (\Throwable $e) {
117118
//TODO: add 'Process is not running on K8S when logging is added
118-
return ResourceInfo::emptyResource();
119+
return ResourceInfoFactory::emptyResource();
119120
}
120121
}
121122

‎src/Aws/Ecs/Detector.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919

2020
namespace OpenTelemetry\Aws\Ecs;
2121

22-
use OpenTelemetry\SDK\Attributes;
22+
use OpenTelemetry\SDK\Common\Attribute\Attributes;
2323
use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;
2424
use OpenTelemetry\SDK\Resource\ResourceInfo;
25+
use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
2526
use OpenTelemetry\SemConv\ResourceAttributes;
2627
use Throwable;
2728

@@ -54,14 +55,14 @@ public function getResource(): ResourceInfo
5455
// Check if running on ECS by looking for below environment variables
5556
if (!getenv(self::ECS_METADATA_KEY_V4) && !getenv(self::ECS_METADATA_KEY_V3)) {
5657
// TODO: add 'Process is not running on ECS' when logs are added
57-
return ResourceInfo::emptyResource();
58+
return ResourceInfoFactory::emptyResource();
5859
}
5960

6061
$hostName = $this->processData->getHostname();
6162
$containerId = $this->getContainerId();
6263

6364
return !$hostName && !$containerId
64-
? ResourceInfo::emptyResource()
65+
? ResourceInfoFactory::emptyResource()
6566
: ResourceInfo::create(new Attributes([
6667
ResourceAttributes::CONTAINER_NAME => $hostName,
6768
ResourceAttributes::CONTAINER_ID => $containerId,

‎src/Aws/Eks/Detector.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919

2020
namespace OpenTelemetry\Aws\Eks;
2121

22-
use OpenTelemetry\SDK\Attributes;
22+
use OpenTelemetry\SDK\Common\Attribute\Attributes;
2323
use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;
2424
use OpenTelemetry\SDK\Resource\ResourceInfo;
25+
use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
2526
use OpenTelemetry\SemConv\ResourceAttributes;
2627
use Psr\Http\Client\ClientExceptionInterface;
2728
use Psr\Http\Client\ClientInterface;
@@ -62,21 +63,21 @@ public function getResource(): ResourceInfo
6263
{
6364
try {
6465
if (!$this->dataProvider->isK8s() || !$this->isEks()) {
65-
return ResourceInfo::emptyResource();
66+
return ResourceInfoFactory::emptyResource();
6667
}
6768

6869
$clusterName = $this->getClusterName();
6970
$containerId = $this->getContainerId();
7071

7172
return !$clusterName && !$containerId
72-
? ResourceInfo::emptyResource()
73+
? ResourceInfoFactory::emptyResource()
7374
: ResourceInfo::create(new Attributes([
7475
ResourceAttributes::CONTAINER_ID => $containerId,
7576
ResourceAttributes::K8S_CLUSTER_NAME => $clusterName,
7677
]));
7778
} catch (\Throwable $e) {
7879
//TODO: add 'Process is not running on K8S when logging is added
79-
return ResourceInfo::emptyResource();
80+
return ResourceInfoFactory::emptyResource();
8081
}
8182
}
8283

‎src/Aws/Lambda/Detector.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@
2020

2121
namespace OpenTelemetry\Aws\Lambda;
2222

23-
use OpenTelemetry\SDK\Attributes;
23+
use OpenTelemetry\SDK\Common\Attribute\Attributes;
2424
use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;
2525
use OpenTelemetry\SDK\Resource\ResourceInfo;
26+
use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
2627
use OpenTelemetry\SemConv\ResourceAttributes;
2728

2829
/**
@@ -51,7 +52,7 @@ public function getResource(): ResourceInfo
5152
$awsRegion = $awsRegion ? $awsRegion : null;
5253

5354
return !$lambdaName && !$awsRegion && !$functionVersion
54-
? ResourceInfo::emptyResource()
55+
? ResourceInfoFactory::emptyResource()
5556
: ResourceInfo::create(new Attributes([
5657
ResourceAttributes::FAAS_NAME => $lambdaName,
5758
ResourceAttributes::FAAS_VERSION => $functionVersion,

‎src/Symfony/OtelSdkBundle/DependencyInjection/OtelSdkExtension.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace OpenTelemetry\Symfony\OtelSdkBundle\DependencyInjection;
66

7-
use OpenTelemetry\SDK\AttributeLimits;
8-
use OpenTelemetry\SDK\Attributes;
7+
use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
8+
use OpenTelemetry\SDK\Common\Attribute\Attributes;
99
use OpenTelemetry\SDK\Trace;
1010
use OpenTelemetry\Symfony\OtelSdkBundle\DependencyInjection\Configuration as Conf;
1111
use OpenTelemetry\Symfony\OtelSdkBundle\Trace\ExporterFactory;

‎src/Symfony/OtelSdkBundle/Resources/config/sdk.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace OpenTelemetry\Symfony\OtelSdkBundle\Resources;
66

7-
use OpenTelemetry\SDK\AttributeLimits;
8-
use OpenTelemetry\SDK\Attributes;
7+
use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
8+
use OpenTelemetry\SDK\Common\Attribute\Attributes;
9+
use OpenTelemetry\SDK\Common\Time\SystemClock;
910
use OpenTelemetry\SDK\Resource;
10-
use OpenTelemetry\SDK\SystemClock;
1111
use OpenTelemetry\SDK\Trace;
1212
use OpenTelemetry\SDK\Trace\Sampler;
1313
use OpenTelemetry\SDK\Trace\SpanProcessor;

‎tests/Integration/Symfony/OtelSdkBundle/DependencyInjection/OtelSdkExtensionTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
use Exception;
88
use OpenTelemetry\SDK;
9-
use OpenTelemetry\SDK\AttributeLimits;
10-
use OpenTelemetry\SDK\Attributes;
11-
use OpenTelemetry\SDK\SystemClock;
9+
use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
10+
use OpenTelemetry\SDK\Common\Attribute\Attributes;
11+
use OpenTelemetry\SDK\Common\Time\SystemClock;
1212
use OpenTelemetry\SDK\Trace\SpanProcessor;
1313
use OpenTelemetry\Symfony\OtelSdkBundle\DependencyInjection\OtelSdkExtension;
1414
use OpenTelemetry\Symfony\OtelSdkBundle\DependencyInjection\Parameters;

‎tests/Integration/Symfony/OtelSdkBundle/Resources/SdkConfigTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
namespace OpenTelemetry\Test\Integration\Symfony\OtelSdkBundle\Resources;
66

77
use Exception;
8-
use OpenTelemetry\SDK\AttributeLimits;
9-
use OpenTelemetry\SDK\Attributes;
8+
use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
9+
use OpenTelemetry\SDK\Common\Attribute\Attributes;
10+
use OpenTelemetry\SDK\Common\Time\SystemClock;
1011
use OpenTelemetry\SDK\Resource;
11-
use OpenTelemetry\SDK\SystemClock;
1212
use OpenTelemetry\SDK\Trace;
1313
use OpenTelemetry\SDK\Trace\Sampler;
1414
use OpenTelemetry\SDK\Trace\SpanProcessor;

‎tests/Unit/Aws/Ec2/DetectorTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use GuzzleHttp\Psr7\HttpFactory;
1111
use GuzzleHttp\Psr7\Response;
1212
use OpenTelemetry\Aws\Ec2\Detector;
13-
use OpenTelemetry\SDK\Attributes;
14-
use OpenTelemetry\SDK\Resource\ResourceInfo;
13+
use OpenTelemetry\SDK\Common\Attribute\Attributes;
14+
use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
1515
use OpenTelemetry\SemConv\ResourceAttributes;
1616
use PHPUnit\Framework\TestCase;
1717

@@ -100,7 +100,7 @@ public function TestInvalidTokenBody()
100100

101101
$detector = new Detector($client, $requestFactory);
102102

103-
$this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
103+
$this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
104104
}
105105

106106
/**
@@ -123,7 +123,7 @@ public function TestInvalidTokenResponseCode()
123123

124124
$detector = new Detector($client, $requestFactory);
125125

126-
$this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
126+
$this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
127127
}
128128

129129
/**
@@ -182,7 +182,7 @@ public function TestInvalidIdentities()
182182

183183
$detector = new Detector($client, $requestFactory);
184184

185-
$this->assertEquals(ResourceInfo::emptyResource(), $detector->getResource());
185+
$this->assertEquals(ResourceInfoFactory::emptyResource(), $detector->getResource());
186186
}
187187

188188
/**

0 commit comments

Comments
 (0)