Merge remote-tracking branch 'upstream/main' into pass-proper-client-name-and-region

Author: rtreffler

.github/workflows/fossa.yml

@@ -0,0 +1,20 @@
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry

.github/workflows/php.yml

@@ -17,14 +17,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2', '8.3']
+        php-version: ['8.1', '8.2', '8.3', '8.4']
         # Sorted alphabetically to ease finding the desired run in the GitHub Workflow UI.
         project: [
           'Aws',
           'Context/Swoole',
           'Instrumentation/CakePHP',
           'Instrumentation/CodeIgniter',
           'Instrumentation/Curl',
+          'Instrumentation/Doctrine',
           'Instrumentation/ExtAmqp',
           'Instrumentation/ExtRdKafka',
           'Instrumentation/Guzzle',
@@ -55,46 +56,21 @@ jobs:
           'Symfony',
         ]
         exclude:
-          - project: 'Instrumentation/IO'
-            php-version: 8.0
-          - project: 'Instrumentation/IO'
-            php-version: 8.1
-          - project: 'Instrumentation/Curl'
-            php-version: 7.4
-          - project: 'Instrumentation/Curl'
-            php-version: 8.0
+
           - project: 'Instrumentation/Curl'
             php-version: 8.1
-          - project: 'Instrumentation/MySqli'
-            php-version: 7.4
-          - project: 'Instrumentation/MySqli'
-            php-version: 8.0
-          - project: 'Instrumentation/MySqli'
+          - project: 'Instrumentation/Doctrine'
             php-version: 8.1
-          - project: 'Instrumentation/PDO'
-            php-version: 8.0
-          - project: 'Instrumentation/PDO'
-            php-version: 8.1
-          - project: 'Instrumentation/Psr3'
-            php-version: 8.0
-          - project: 'Instrumentation/ExtAmqp'
-            php-version: 8.0
           - project: 'Instrumentation/ExtAmqp'
             php-version: 8.1
           - project: 'Instrumentation/ExtRdKafka'
-            php-version: 7.4
-          - project: 'Instrumentation/ExtRdKafka'
-            php-version: 8.0
-          - project: 'Instrumentation/ExtRdKafka'
             php-version: 8.1
-          - project: 'Instrumentation/OpenAIPHP'
-            php-version: 8.0
-          - project: 'Logs/Monolog'
-            php-version: 8.0
-          - project: 'Sampler/RuleBased'
-            php-version: 8.0
-          - project: 'Symfony'
-            php-version: 8.0
+          - project: 'Instrumentation/IO'
+            php-version: 8.1
+          - project: 'Instrumentation/MySqli'
+            php-version: 8.1
+          - project: 'Instrumentation/PDO'
+            php-version: 8.1
     steps:
     - uses: actions/checkout@v4
 
@@ -130,7 +106,7 @@ jobs:
 
     - name: Check Style
       working-directory: src/${{ matrix.project }}
-      run: vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --stop-on-violation --using-cache=no -vvv
+      run: PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --stop-on-violation --using-cache=no -vvv
 
     - name: Run Phan
       working-directory: src/${{ matrix.project }}
@@ -179,7 +155,7 @@ jobs:
     - name: Code Coverage
       uses: codecov/codecov-action@v4
       # only generate coverage against the latest PHP version
-      if: ${{ matrix.php-version == '8.3' }}
+      if: ${{ matrix.php-version == '8.4' }}
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         directory: src/${{ matrix.project }}

.gitsplit.yml

@@ -58,6 +58,8 @@ splits:
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-cakephp.git"
   - prefix: "src/Instrumentation/Yii"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-yii.git"
+  - prefix: "src/Instrumentation/Doctrine"
+    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-doctrine.git"
   - prefix: "src/Context/Swoole"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/context-swoole.git"
   - prefix: "src/AutoInstrumentationInstaller"

Makefile

@@ -45,7 +45,7 @@ packages-composer: ## Validate all composer packages
 bash: ## Bash shell
 	$(DC_RUN_PHP) bash
 style: ## Run php-cs-fixer
-	$(DC_RUN_PHP) env XDEBUG_MODE=off vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --using-cache=no -vvv
+	$(DC_RUN_PHP) env XDEBUG_MODE=off PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --using-cache=no -vvv
 split: ## git-split dry run
 	${DOCKER_COMPOSE} -f docker/gitsplit/docker-compose.yaml --env-file ./.env up
 FORCE:

composer.json

@@ -6,7 +6,7 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "require": {
-    "php": "^7.4 || ^8.0",
+    "php": "^8.1",
     "ext-json": "*"
   },
   "require-dev": {

docker/Dockerfile

@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.0
+ARG PHP_VERSION=8.1
 FROM ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION}
 
 USER root

src/Aws/composer.json

@@ -13,7 +13,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.1",
         "open-telemetry/api": "^1.0",
         "open-telemetry/sdk": "^1.0",
         "aws/aws-sdk-php": "^3.232"
@@ -28,8 +28,8 @@
         "phpstan/phpstan": "^1.4",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "~9",
-        "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.0"
+        "psalm/plugin-phpunit": "^0.19.2",
+        "vimeo/psalm": "6.4.0"
     },
     "autoload": {
         "psr-4": {

src/Aws/src/AwsSdkInstrumentation.php

@@ -75,6 +75,7 @@ public function getTracer(): TracerInterface
         return $this->tracerProvider->getTracer('io.opentelemetry.contrib.php');
     }
 
+    /** @psalm-api */
     public function instrumentClients($clientsArray): void
     {
         $this->clients = $clientsArray;
@@ -92,7 +93,7 @@ public function activate(): bool
                 $clientName = $client->getApi()->getServiceName();
                 $region = $client->getRegion();
 
-                $client->getHandlerList()->prependInit(Middleware::tap(function ($cmd, $req) use ($clientName, $region, $hash) {
+                $client->getHandlerList()->prependInit(Middleware::tap(function ($cmd, $_req) use ($clientName, $region, $hash) {
                     $tracer = $this->getTracer();
                     $propagator = $this->getPropagator();
 

src/Aws/src/Ecs/Detector.php

@@ -175,7 +175,7 @@ private function getMetadataEndpointV4Resource(): ResourceInfo
 
         $containerMetadata = json_decode($containerResponse->getBody()->getContents(), true);
         $taskMetadata = json_decode($taskResponse->getBody()->getContents(), true);
-        
+
         $launchType = isset($taskMetadata['LaunchType']) ? strtolower($taskMetadata['LaunchType']) : null;
         $taskFamily = isset($taskMetadata['Family']) ? $taskMetadata['Family'] : null;
         $taskRevision = isset($taskMetadata['Revision']) ? $taskMetadata['Revision'] : null;
@@ -208,7 +208,7 @@ private function getMetadataEndpointV4Resource(): ResourceInfo
         }
 
         $containerArn = isset($containerMetadata['ContainerARN']) ? $containerMetadata['ContainerARN'] : null;
-    
+
         $logResource = ResourceInfoFactory::emptyResource();
         if (isset($containerMetadata['LogOptions']) && isset($containerMetadata['LogDriver']) && $containerMetadata['LogDriver'] === 'awslogs') {
             $logOptions = $containerMetadata['LogOptions'];
@@ -218,7 +218,7 @@ private function getMetadataEndpointV4Resource(): ResourceInfo
             $logsGroupArns = [];
             $logsStreamArns = [];
             if (isset($containerMetadata['ContainerARN']) && preg_match('/arn:aws:ecs:([^:]+):([^:]+):.*/', $containerMetadata['ContainerARN'], $matches)) {
-                [$arn, $awsRegion, $awsAccount] = $matches;
+                [$_arn, $awsRegion, $awsAccount] = $matches;
 
                 $logsGroupArns = ['arn:aws:logs:' . $awsRegion . ':' . $awsAccount . ':log-group:' . $logsGroupName];
                 $logsStreamArns = ['arn:aws:logs:' . $awsRegion . ':' . $awsAccount . ':log-group:' . $logsGroupName . ':log-stream:' . $logsStreamName];

src/Aws/src/Eks/DataProvider.php

@@ -28,7 +28,7 @@ public function getK8sHeader(): ?string
             return null;
         }
 
-        return 'Bearer' . file_get_contents($this->k8sTokenPath);
+        return 'Bearer' . (file_get_contents($this->k8sTokenPath) ?: '');
     }
 
     // Check if there exists a k8s certification file
@@ -43,6 +43,6 @@ public function getCgroupData(): ?array
             return null;
         }
 
-        return  file($this->cGroupPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+        return  file($this->cGroupPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: null;
     }
 }