Merge pull request #20 from Blacksmoke16/fix-tests

Quick update pass

Author: bobstrecansky

.github/workflows/php.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['7.4', '8.0']
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/psalm-security-analysis.yml

@@ -14,7 +14,7 @@ jobs:
         uses: docker://vimeo/psalm-github-actions
         with:
           composer_require_dev: true
-          composer_ignore_platform_reqs: true
+          composer_ignore_platform_reqs: false # https://github.com/psalm/psalm-github-actions/pull/29
           security_analysis: true
           report_file: results.sarif
 

composer.json

@@ -10,7 +10,7 @@
         }
       ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-json": "*",
         "open-telemetry/opentelemetry": "dev-main"
     },

detectors/aws/Ec2Detector.php

@@ -23,9 +23,9 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Request;
-use OpenTelemetry\Sdk\Resource\ResourceConstants;
-use OpenTelemetry\Sdk\Resource\ResourceInfo;
-use OpenTelemetry\Sdk\Trace\Attributes;
+use OpenTelemetry\SDK\Resource\ResourceConstants;
+use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Trace\Attributes;
 
 /**
  * The AwsEc2Detector can be used to detect if a process is running in AWS EC2

detectors/aws/EcsDetector.php

@@ -19,9 +19,9 @@
 
 namespace Detectors\Aws;
 
-use OpenTelemetry\Sdk\Resource\ResourceConstants;
-use OpenTelemetry\Sdk\Resource\ResourceInfo;
-use OpenTelemetry\Sdk\Trace\Attributes;
+use OpenTelemetry\SDK\Resource\ResourceConstants;
+use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Trace\Attributes;
 
 /**
  * The AwsEcsDetector can be used to detect if a process is running in AWS

detectors/aws/EksDetector.php

@@ -22,9 +22,9 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Request;
-use OpenTelemetry\Sdk\Resource\ResourceConstants;
-use OpenTelemetry\Sdk\Resource\ResourceInfo;
-use OpenTelemetry\Sdk\Trace\Attributes;
+use OpenTelemetry\SDK\Resource\ResourceConstants;
+use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Trace\Attributes;
 
 /**
  * The AwsEksDetector can be used to detect if a process is running in AWS

detectors/aws/LambdaDetector.php

@@ -20,9 +20,9 @@
 
 namespace Detectors\Aws;
 
-use OpenTelemetry\Sdk\Resource\ResourceConstants;
-use OpenTelemetry\Sdk\Resource\ResourceInfo;
-use OpenTelemetry\Sdk\Trace\Attributes;
+use OpenTelemetry\SDK\Resource\ResourceConstants;
+use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Trace\Attributes;
 
 /**
  * The AwsLambdaDetector can be used to detect if a process is running in AWS Lambda

docker-compose.yaml

@@ -1,9 +1,7 @@
 version: '3.7'
 services:
   php:
-    build:
-      context: .
-      dockerfile: docker/Dockerfile
+    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:latest
     volumes:
     - ./:/usr/src/myapp
   zipkin:

docker/Dockerfile

@@ -19,15 +19,15 @@
 
 namespace Instrumentation\Aws\Xray;
 
-use OpenTelemetry\Sdk\Trace\IdGenerator;
-use OpenTelemetry\Sdk\Trace\RandomIdGenerator;
+use OpenTelemetry\SDK\Trace\IdGeneratorInterface;
+use OpenTelemetry\SDK\Trace\RandomIdGenerator;
 
 /**
  * An ID generator that generates trace IDs that conforms to AWS X-Ray format
  * Refer to the AWS X-Ray documentation:
  * https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-traceids
  */
-class AwsXrayIdGenerator implements IdGenerator
+class AwsXrayIdGenerator implements IdGeneratorInterface
 {
     private const TRACE_ID_RANDOM_HEX_LENGTH = 24;