drop 7.4 testing

brettmc · brettmc · commit 09ed0165c897 · 2025-02-06T17:20:52.000+11:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
         # Sorted alphabetically to ease finding the desired run in the GitHub Workflow UI.
         project: [
           'Aws',
@@ -55,34 +55,6 @@ jobs:
           'Symfony',
         ]
         exclude:
-          - project: 'Instrumentation/Guzzle'
-            php-version: 7.4
-          - project: 'Instrumentation/HttpAsyncClient'
-            php-version: 7.4
-          - project: 'Instrumentation/Slim'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr3'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr6'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr14'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr15'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr16'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr18'
-            php-version: 7.4
-          - project: 'Instrumentation/IO'
-            php-version: 7.4
-          - project: 'Instrumentation/Symfony'
-            php-version: 7.4
-          - project: 'Instrumentation/Laravel'
-            php-version: 7.4
-          - project: 'Instrumentation/CodeIgniter'
-            php-version: 7.4
-          - project: 'Instrumentation/Yii'
-            php-version: 7.4
           - project: 'Instrumentation/IO'
             php-version: 8.0
           - project: 'Instrumentation/IO'
@@ -105,8 +77,6 @@ jobs:
             php-version: 8.0
           - project: 'Instrumentation/PDO'
             php-version: 8.1
-          - project: 'Instrumentation/ExtAmqp'
-            php-version: 7.4
           - project: 'Instrumentation/ExtAmqp'
             php-version: 8.0
           - project: 'Instrumentation/ExtAmqp'
@@ -117,22 +87,10 @@ jobs:
             php-version: 8.0
           - project: 'Instrumentation/ExtRdKafka'
             php-version: 8.1
-          - project: 'Instrumentation/OpenAIPHP'
-            php-version: 7.4
           - project: 'Instrumentation/OpenAIPHP'
             php-version: 8.0
-          - project: 'Instrumentation/CakePHP'
-            php-version: 7.4
-          - project: 'Propagation/ServerTiming'
-            php-version: 7.4
-          - project: 'ResourceDetectors/Container'
-            php-version: 7.4
-          - project: 'Sampler/RuleBased'
-            php-version: 7.4
           - project: 'Sampler/RuleBased'
             php-version: 8.0
-          - project: 'Symfony'
-            php-version: 7.4
           - project: 'Symfony'
             php-version: 8.0
     steps:
diff --git a/src/Instrumentation/CakePHP/src/CakePHPInstrumentation.php b/src/Instrumentation/CakePHP/src/CakePHPInstrumentation.php
@@ -8,7 +8,6 @@
 use OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\Cake\Command\Command;
 use OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\Cake\Controller\Controller;
 use OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\Cake\Http\Server;
-use OpenTelemetry\SemConv\Version;
 
 class CakePHPInstrumentation
 {
diff --git a/src/Instrumentation/CodeIgniter/src/CodeIgniterInstrumentation.php b/src/Instrumentation/CodeIgniter/src/CodeIgniterInstrumentation.php
@@ -16,7 +16,6 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 
 class CodeIgniterInstrumentation
 {
diff --git a/src/Instrumentation/Guzzle/src/GuzzleInstrumentation.php b/src/Instrumentation/Guzzle/src/GuzzleInstrumentation.php
@@ -15,7 +15,6 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use function sprintf;
diff --git a/src/Instrumentation/HttpAsyncClient/src/HttpAsyncClientInstrumentation.php b/src/Instrumentation/HttpAsyncClient/src/HttpAsyncClientInstrumentation.php
@@ -14,7 +14,6 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Throwable;
diff --git a/src/Instrumentation/Laravel/src/LaravelInstrumentation.php b/src/Instrumentation/Laravel/src/LaravelInstrumentation.php
@@ -6,7 +6,6 @@
 
 use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\SDK\Common\Configuration\Configuration;
-use OpenTelemetry\SemConv\Version;
 
 class LaravelInstrumentation
 {
diff --git a/src/Instrumentation/MongoDB/src/MongoDBInstrumentation.php b/src/Instrumentation/MongoDB/src/MongoDBInstrumentation.php
@@ -6,7 +6,6 @@
 
 use function MongoDB\Driver\Monitoring\addSubscriber;
 use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
-use OpenTelemetry\SemConv\Version;
 
 final class MongoDBInstrumentation
 {
diff --git a/src/Instrumentation/Psr14/src/Psr14Instrumentation.php b/src/Instrumentation/Psr14/src/Psr14Instrumentation.php
@@ -11,7 +11,6 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 use Psr\EventDispatcher\EventDispatcherInterface;
 
 use Throwable;
diff --git a/src/Instrumentation/Psr15/src/Psr15Instrumentation.php b/src/Instrumentation/Psr15/src/Psr15Instrumentation.php
@@ -13,7 +13,6 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
diff --git a/src/Instrumentation/Psr16/src/Psr16Instrumentation.php b/src/Instrumentation/Psr16/src/Psr16Instrumentation.php
@@ -13,7 +13,6 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 use Psr\SimpleCache\CacheInterface;
 use Throwable;
 
diff --git a/src/Instrumentation/Psr18/src/Psr18Instrumentation.php b/src/Instrumentation/Psr18/src/Psr18Instrumentation.php
@@ -13,7 +13,6 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
diff --git a/src/Instrumentation/Psr3/src/Psr3Instrumentation.php b/src/Instrumentation/Psr3/src/Psr3Instrumentation.php
@@ -10,7 +10,6 @@
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
-use OpenTelemetry\SemConv\Version;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LoggerTrait;
 
diff --git a/src/Instrumentation/Psr6/src/Psr6Instrumentation.php b/src/Instrumentation/Psr6/src/Psr6Instrumentation.php
@@ -13,7 +13,6 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
 use Throwable;
diff --git a/src/Instrumentation/Slim/src/SlimInstrumentation.php b/src/Instrumentation/Slim/src/SlimInstrumentation.php
@@ -13,7 +13,6 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Slim\App;
diff --git a/src/Instrumentation/Symfony/src/HttpClientInstrumentation.php b/src/Instrumentation/Symfony/src/HttpClientInstrumentation.php
@@ -13,7 +13,6 @@
 use OpenTelemetry\Context\Propagation\ArrayAccessGetterSetter;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
diff --git a/src/Instrumentation/Symfony/src/MessengerInstrumentation.php b/src/Instrumentation/Symfony/src/MessengerInstrumentation.php
@@ -11,7 +11,6 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Transport\Sender\SenderInterface;
diff --git a/src/Instrumentation/Symfony/src/SymfonyInstrumentation.php b/src/Instrumentation/Symfony/src/SymfonyInstrumentation.php
@@ -13,7 +13,6 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
-use OpenTelemetry\SemConv\Version;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernel;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`use OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\Cake\Command\Command;`
`9`	`9`	`use OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\Cake\Controller\Controller;`
`10`	`10`	`use OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\Cake\Http\Server;`
`11`		`-use OpenTelemetry\SemConv\Version;`
`12`	`11`
`13`	`12`	`class CakePHPInstrumentation`
`14`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`use OpenTelemetry\Context\Context;`
`17`	`17`	`use function OpenTelemetry\Instrumentation\hook;`
`18`	`18`	`use OpenTelemetry\SemConv\TraceAttributes;`
`19`		`-use OpenTelemetry\SemConv\Version;`
`20`	`19`
`21`	`20`	`class CodeIgniterInstrumentation`
`22`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`use OpenTelemetry\API\Instrumentation\CachedInstrumentation;`
`8`	`8`	`use OpenTelemetry\SDK\Common\Configuration\Configuration;`
`9`		`-use OpenTelemetry\SemConv\Version;`
`10`	`9`
`11`	`10`	`class LaravelInstrumentation`
`12`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`use function MongoDB\Driver\Monitoring\addSubscriber;`
`8`	`8`	`use OpenTelemetry\API\Instrumentation\CachedInstrumentation;`
`9`		`-use OpenTelemetry\SemConv\Version;`
`10`	`9`
`11`	`10`	`final class MongoDBInstrumentation`
`12`	`11`	`{`