Skip to content

Commit 73b1952

Browse files
committed
fixing build errors
- bump psr3 + monolog deps to php8.1 - fix azure detector semconv, add composer dependency
1 parent 09ed016 commit 73b1952

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

.github/workflows/php.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ jobs:
7171
php-version: 8.0
7272
- project: 'Instrumentation/MySqli'
7373
php-version: 8.1
74-
- project: 'Instrumentation/PDO'
75-
php-version: 7.4
7674
- project: 'Instrumentation/PDO'
7775
php-version: 8.0
7876
- project: 'Instrumentation/PDO'
7977
php-version: 8.1
78+
- project: 'Instrumentation/Psr3'
79+
php-version: 8.0
8080
- project: 'Instrumentation/ExtAmqp'
8181
php-version: 8.0
8282
- project: 'Instrumentation/ExtAmqp'
@@ -89,6 +89,8 @@ jobs:
8989
php-version: 8.1
9090
- project: 'Instrumentation/OpenAIPHP'
9191
php-version: 8.0
92+
- project: 'Logs/Monolog'
93+
php-version: 8.0
9294
- project: 'Sampler/RuleBased'
9395
php-version: 8.0
9496
- project: 'Symfony'

src/Instrumentation/Psr3/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"minimum-stability": "dev",
1717
"prefer-stable": true,
1818
"require": {
19-
"php": "^8.0",
19+
"php": "^8.1",
2020
"ext-opentelemetry": "*",
2121
"open-telemetry/api": "^1.0",
2222
"open-telemetry/sem-conv": "^1.30",

src/Logs/Monolog/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"minimum-stability": "dev",
1010
"prefer-stable": true,
1111
"require": {
12+
"php": "^8.1",
1213
"monolog/monolog": "^1.1|^2|^3",
1314
"open-telemetry/api": "^1.0"
1415
},

src/ResourceDetectors/Azure/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"require": {
1616
"php": "^7.4 || ^8.0",
1717
"open-telemetry/api": "^1.0",
18-
"open-telemetry/sdk": "^1.0"
18+
"open-telemetry/sdk": "^1.0",
19+
"open-telemetry/sem-conv": "^1.30"
1920
},
2021
"require-dev": {
2122
"assertwell/phpunit-global-state": "^0.2.2",

src/ResourceDetectors/Azure/src/AppService/Detector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function getResource(): ResourceInfo
6060
ResourceAttributes::CLOUD_PROVIDER => self::CLOUD_PROVIDER,
6161
ResourceAttributes::CLOUD_REGION => getenv(self::ENV_REGION_NAME_KEY),
6262
ResourceAttributes::CLOUD_RESOURCE_ID => self::generateAzureResourceUri($name, $groupName, $subscriptionId),
63-
ResourceAttributes::DEPLOYMENT_ENVIRONMENT => getenv(self::ENV_WEBSITE_SLOT_NAME_KEY),
63+
ResourceAttributes::DEPLOYMENT_ENVIRONMENT_NAME => getenv(self::ENV_WEBSITE_SLOT_NAME_KEY),
6464
ResourceAttributes::HOST_ID => getenv(self::ENV_WEBSITE_HOSTNAME_KEY),
6565
ResourceAttributes::SERVICE_INSTANCE_ID => getenv(self::ENV_WEBSITE_INSTANCE_ID_KEY),
6666
ResourceAttributes::SERVICE_NAME => $name,

0 commit comments

Comments
 (0)