Merge branch 'open-telemetry:main' into main

Author: weslenteche

.github/dependabot.yml

@@ -82,6 +82,7 @@ updates:
       - "/src/Instrumentation/Psr18"
       - "/src/Instrumentation/Psr3"
       - "/src/Instrumentation/Psr6"
+      - "/src/Instrumentation/ReactPHP"
       - "/src/Instrumentation/Slim"
       - "/src/Instrumentation/Symfony"
       - "/src/Instrumentation/Wordpress"

.github/workflows/fossa.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
+      - uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
         with:
           api-key: ${{secrets.FOSSA_API_KEY}}
           team: OpenTelemetry

.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@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
         with:
           sarif_file: results.sarif

.github/workflows/php.yml

@@ -43,6 +43,7 @@ jobs:
           'Instrumentation/Psr15',
           'Instrumentation/Psr16',
           'Instrumentation/Psr18',
+          'Instrumentation/ReactPHP',
           'Instrumentation/Slim',
           'Instrumentation/Symfony',
           'Instrumentation/Yii',

.gitsplit.yml

@@ -48,6 +48,8 @@ splits:
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-psr16.git"
   - prefix: "src/Instrumentation/Psr18"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-psr18.git"
+  - prefix: "src/Instrumentation/ReactPHP"
+    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-reactphp.git"
   - prefix: "src/Instrumentation/Slim"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-slim.git"
   - prefix: "src/Instrumentation/Symfony"

composer.json

@@ -29,6 +29,7 @@
       "OpenTelemetry\\Contrib\\Instrumentation\\Psr3\\": "src/Instrumentation/Psr3/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\Psr15\\": "src/Instrumentation/Psr15/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",
@@ -54,6 +55,7 @@
       "src/Instrumentation/Psr3/_register.php",
       "src/Instrumentation/Psr15/_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",
@@ -80,6 +82,7 @@
     "open-telemetry/opentelemetry-auto-psr3": "self.version",
     "open-telemetry/opentelemetry-auto-psr15": "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",

src/Instrumentation/OpenAIPHP/src/OpenAIPHPInstrumentation.php

@@ -193,7 +193,7 @@ private static function hookApi(CachedInstrumentation $instrumentation, $class,
 
     private static function recordUsage(SpanInterface $span, object $response, ContextInterface $context)
     {
-        if (!property_exists($response, 'usage') || !method_exists($response->usage, 'toArray')) {
+        if (!property_exists($response, 'usage') || !isset($response->usage) || !method_exists($response->usage, 'toArray')) {
             return;
         }
 

src/Instrumentation/ReactPHP/.gitattributes

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

src/Instrumentation/ReactPHP/.gitignore

@@ -0,0 +1 @@
+/vendor/