Merge branch 'main' into reactphp

Author: smaddock

.github/dependabot.yml

@@ -89,6 +89,7 @@ updates:
       - "/src/Instrumentation/Yii"
       - "/src/Logs/Monolog"
       - "/src/MetaPackages/opentelemetry"
+      - "/src/Propagation/Instana"
       - "/src/Propagation/ServerTiming"
       - "/src/Propagation/TraceResponse"
       - "/src/ResourceDetectors/Azure"

.github/workflows/ossf-scorecard.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+      - uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
         with:
           sarif_file: results.sarif

.github/workflows/php.yml

@@ -22,6 +22,7 @@ jobs:
         project: [
           'Aws',
           'Context/Swoole',
+          'Instrumentation/AwsSdk',
           'Instrumentation/CakePHP',
           'Instrumentation/CodeIgniter',
           'Instrumentation/Curl',

.gitsplit.yml

@@ -62,6 +62,8 @@ splits:
     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/Instrumentation/AwsSdk"
+    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-aws-sdk.git"
   - prefix: "src/Context/Swoole"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/context-swoole.git"
   - prefix: "src/AutoInstrumentationInstaller"

composer.json

@@ -17,23 +17,30 @@
     "psr-4": {
       "OpenTelemetry\\Contrib\\Aws\\": "src/Aws/src",
       "OpenTelemetry\\Contrib\\Context\\Swoole\\": "src/Context/Swoole/src",
+      "OpenTelemetry\\Contrib\\Instrumentation\\CakePHP\\": "src/Instrumentation/CakePHP/src",
+      "OpenTelemetry\\Contrib\\Instrumentation\\CodeIgniter\\": "src/Instrumentation/CodeIgniter/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\Curl\\": "src/Instrumentation/Curl/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\ExtAmqp\\": "src/Instrumentation/ExtAmqp/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\ExtRdKafka\\": "src/Instrumentation/ExtRdKafka/src",
-      "OpenTelemetry\\Contrib\\Instrumentation\\Laravel\\": "src/Instrumentation/Laravel/src",
+      "OpenTelemetry\\Contrib\\Instrumentation\\Guzzle\\": "src/Instrumentation/Guzzle/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\HttpAsyncClient\\": "src/Instrumentation/HttpAsyncClient/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\IO\\": "src/Instrumentation/IO/src",
+      "OpenTelemetry\\Contrib\\Instrumentation\\Laravel\\": "src/Instrumentation/Laravel/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\MongoDB\\": "src/Instrumentation/MongoDB/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\MySqli\\": "src/Instrumentation/MySqli/src",
+      "OpenTelemetry\\Contrib\\Instrumentation\\OpenAIPHP\\": "src/Instrumentation/OpenAIPHP/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\PDO\\": "src/Instrumentation/PDO/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\Psr3\\": "src/Instrumentation/Psr3/src",
+      "OpenTelemetry\\Contrib\\Instrumentation\\Psr6\\": "src/Instrumentation/Psr6/src",
+      "OpenTelemetry\\Contrib\\Instrumentation\\Psr14\\": "src/Instrumentation/Psr14/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\Psr15\\": "src/Instrumentation/Psr15/src",
+      "OpenTelemetry\\Contrib\\Instrumentation\\Psr16\\": "src/Instrumentation/Psr16/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\Psr18\\": "src/Instrumentation/Psr18/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\ReactPHP\\": "src/Instrumentation/ReactPHP/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\Slim\\": "src/Instrumentation/Slim/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\Symfony\\": "src/Instrumentation/Symfony/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\Wordpress\\": "src/Instrumentation/Wordpress/src",
-      "OpenTelemetry\\Contrib\\Instrumentation\\CakePHP\\": "src/Instrumentation/CakePHP/src",
+      "OpenTelemetry\\Contrib\\Instrumentation\\Yii\\": "src/Instrumentation/Yii/src",
       "OpenTelemetry\\Contrib\\Logs\\Monolog\\": "src/Logs/Monolog/src",
       "OpenTelemetry\\Contrib\\Propagation\\Instana\\": "src/Propagation/Instana/src",
       "OpenTelemetry\\Contrib\\Propagation\\ServerTiming\\": "src/Propagation/ServerTiming/src",
@@ -43,22 +50,30 @@
       "OpenTelemetry\\Contrib\\Symfony\\": "src/Symfony/src"
     },
     "files": [
+      "src/Instrumentation/CakePHP/_register.php",
+      "src/Instrumentation/CodeIgniter/_register.php",
       "src/Instrumentation/Curl/_register.php",
       "src/Instrumentation/ExtAmqp/_register.php",
       "src/Instrumentation/ExtRdKafka/_register.php",
+      "src/Instrumentation/Guzzle/_register.php",
       "src/Instrumentation/HttpAsyncClient/_register.php",
       "src/Instrumentation/IO/_register.php",
       "src/Instrumentation/Laravel/_register.php",
       "src/Instrumentation/MongoDB/_register.php",
       "src/Instrumentation/MySqli/_register.php",
+      "src/Instrumentation/OpenAIPHP/_register.php",
       "src/Instrumentation/PDO/_register.php",
       "src/Instrumentation/Psr3/_register.php",
+      "src/Instrumentation/Psr6/_register.php",
+      "src/Instrumentation/Psr14/_register.php",
       "src/Instrumentation/Psr15/_register.php",
+      "src/Instrumentation/Psr16/_register.php",
       "src/Instrumentation/Psr18/_register.php",
       "src/Instrumentation/ReactPHP/_register.php",
       "src/Instrumentation/Slim/_register.php",
       "src/Instrumentation/Symfony/_register.php",
       "src/Instrumentation/Wordpress/_register.php",
+      "src/Instrumentation/Yii/_register.php",
       "src/ResourceDetectors/Container/_register.php"
     ]
   },
@@ -72,20 +87,30 @@
     "open-telemetry/contrib-aws": "self.version",
     "open-telemetry/contrib-sdk-bundle": "self.version",
     "open-telemetry/context-swoole": "self.version",
+    "open-telemetry/opentelemetry-auto-cakephp": "self.version",
+    "open-telemetry/opentelemetry-auto-codeigniter": "self.version",
     "open-telemetry/opentelemetry-auto-curl": "self.version",
-    "open-telemetry/opentelemetry-auto-laravel": "self.version",
+    "open-telemetry/opentelemetry-auto-ext-amqp": "self.version",
+    "open-telemetry/opentelemetry-auto-ext-rdkafka": "self.version",
+    "open-telemetry/opentelemetry-auto-guzzle": "self.version",
     "open-telemetry/opentelemetry-auto-http-async": "self.version",
     "open-telemetry/opentelemetry-auto-io": "self.version",
+    "open-telemetry/opentelemetry-auto-laravel": "self.version",
     "open-telemetry/opentelemetry-auto-mongodb": "self.version",
     "open-telemetry/opentelemetry-auto-mysqli": "self.version",
     "open-telemetry/opentelemetry-auto-pdo": "self.version",
+    "open-telemetry/opentelemetry-auto-openai-php": "self.version",
     "open-telemetry/opentelemetry-auto-psr3": "self.version",
+    "open-telemetry/opentelemetry-auto-psr6": "self.version",
+    "open-telemetry/opentelemetry-auto-psr14": "self.version",
     "open-telemetry/opentelemetry-auto-psr15": "self.version",
+    "open-telemetry/opentelemetry-auto-psr16": "self.version",
     "open-telemetry/opentelemetry-auto-psr18": "self.version",
     "open-telemetry/opentelemetry-auto-reactphp": "self.version",
     "open-telemetry/opentelemetry-auto-slim": "self.version",
     "open-telemetry/opentelemetry-auto-symfony": "self.version",
     "open-telemetry/opentelemetry-auto-wordpress": "self.version",
+    "open-telemetry/opentelemetry-auto-yii": "self.version",
     "open-telemetry/opentelemetry-propagation-instana": "self.version",
     "open-telemetry/opentelemetry-propagation-server-timing": "self.version",
     "open-telemetry/opentelemetry-propagation-traceresponse": "self.version",

src/Instrumentation/AwsSdk/.gitattributes

@@ -0,0 +1,12 @@
+* text=auto
+
+*.md diff=markdown
+*.php diff=php
+
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.php-cs-fixer.php export-ignore
+/phpstan.neon.dist export-ignore
+/phpunit.xml.dist export-ignore
+/psalm.xml.dist export-ignore
+/tests export-ignore

src/Instrumentation/AwsSdk/.gitignore

@@ -0,0 +1,2 @@
+/vendor/
+composer.lock