Merge branch 'main' into xraySampler2

Author: AsakerMohd

.github/dependabot.yml

@@ -89,10 +89,12 @@ updates:
       - "/src/Instrumentation/Yii"
       - "/src/Logs/Monolog"
       - "/src/MetaPackages/opentelemetry"
+      - "/src/Propagation/Instana"
       - "/src/Propagation/ServerTiming"
       - "/src/Propagation/TraceResponse"
       - "/src/ResourceDetectors/Azure"
       - "/src/ResourceDetectors/Container"
+      - "/src/ResourceDetectors/DigitalOcean"
       - "/src/Sampler/RuleBased"
       - "/src/Shims/OpenTracing"
       - "/src/Symfony"

.github/workflows/dependabot-auto-approve.yml

@@ -2,10 +2,12 @@ name: Dependabot auto-approve
 on: pull_request
 
 permissions:
-  pull-requests: write
+  contents: read
 
 jobs:
   dependabot:
+    permissions:
+      pull-requests: write
     runs-on: ubuntu-latest
     if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'open-telemetry/opentelemetry-php-contrib'
     steps:

.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@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           sarif_file: results.sarif

.github/workflows/php.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ main ]
 
+permissions:
+  contents: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -22,6 +25,7 @@ jobs:
         project: [
           'Aws',
           'Context/Swoole',
+          'Exporter/Instana',
           'Instrumentation/AwsSdk',
           'Instrumentation/CakePHP',
           'Instrumentation/CodeIgniter',
@@ -54,6 +58,7 @@ jobs:
           'Propagation/TraceResponse',
           'ResourceDetectors/Azure',
           'ResourceDetectors/Container',
+          'ResourceDetectors/DigitalOcean',
           'Sampler/RuleBased',
           'Shims/OpenTracing',
           'Symfony',
@@ -63,8 +68,6 @@ jobs:
 
           - project: 'Instrumentation/Curl'
             php-version: 8.1
-          - project: 'Instrumentation/Doctrine'
-            php-version: 8.1
           - project: 'Instrumentation/ExtAmqp'
             php-version: 8.1
           - project: 'Instrumentation/ExtRdKafka'

.github/workflows/split_monorepo.yaml

@@ -9,6 +9,9 @@ on:
   create:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   gitsplit:
     runs-on: ubuntu-latest

.github/workflows/update-dependabot-config.yml

@@ -7,6 +7,9 @@ on:
   # Allow manual triggering
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   update-dependabot-config:
     runs-on: ubuntu-latest

.gitsplit.yml

@@ -10,6 +10,8 @@ splits:
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/opentelemetry-meta.git"
   - prefix: "src/Aws"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-aws.git"
+  - prefix: "src/Exporter/Instana"
+    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-exporter-instana.git"
   - prefix: "src/Symfony"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-sdk-bundle.git"
   - prefix: "src/Instrumentation/CodeIgniter"
@@ -80,6 +82,8 @@ splits:
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-detector-azure.git"
   - prefix: "src/ResourceDetectors/Container"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-detector-container.git"
+  - prefix: "src/ResourceDetectors/DigitalOcean"
+    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-detector-digitalocean.git"
   - prefix: "src/Sampler/RuleBased"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-sampler-rulebased.git"
   - prefix: "src/Shims/OpenTracing"

CONTRIBUTING.md

@@ -1,19 +1,21 @@
-Maintainers ([@open-telemetry/php-maintainers](https://github.com/orgs/open-telemetry/teams/php-maintainers)):
+### Maintainers
 
-- [Bob Strecansky](https://github.com/bobstrecansky), Mailchimp
+- [Bob Strecansky](https://github.com/bobstrecansky), Intuit
+- [Brett McBride](https://github.com/brettmc), Deakin University
 
-Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer)
+For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
 
-Approvers ([@open-telemetry/php-approvers](https://github.com/orgs/open-telemetry/teams/php-approvers)):
+### Approvers
 
-- [Levi Morrison](https://github.com/morrisonlevi), Datadog
-- [Austin Schoen](https://github.com/AustinSchoen), Mailchimp
-- [Beniamin Calota](https://github.com/beniamin), eMag
+- [Ago Allikmaa](https://github.com/agoallikmaa)
+- [Cedriz Ziel](https://github.com/cedricziel)
+- [Chris Lightfoot-Wild](https://github.com/ChrisLightfootWild)
 
-Find more information about the approver role in the [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver)
+For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
 
-Triagers ([@open-telemetry/php-triagers](https://github.com/orgs/open-telemetry/teams/php-triagers)):
+### Triagers
 
-- [Jodee Varney](https://github.com/jodeev), Splunk
+
+For more information about the triager role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#triager).
 
 Find more information about the triager role in the [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#triager)

composer.json

@@ -17,49 +17,67 @@
     "psr-4": {
       "OpenTelemetry\\Contrib\\Aws\\": "src/Aws/src",
       "OpenTelemetry\\Contrib\\Context\\Swoole\\": "src/Context/Swoole/src",
+      "OpenTelemetry\\Contrib\\Exporter\\Instana\\": "src/Exporter/Instana/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",
       "OpenTelemetry\\Contrib\\Propagation\\TraceResponse\\": "src/Propagation/TraceResponse/src",
       "OpenTelemetry\\Contrib\\Resource\\Detector\\Container\\": "src/ResourceDetectors/Container/src",
+      "OpenTelemetry\\Contrib\\Resource\\Detector\\DigitalOcean\\": "src/ResourceDetectors/DigitalOcean/src",
       "OpenTelemetry\\Contrib\\Shim\\OpenTracing\\": "src/Shims/OpenTracing/src",
       "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/ResourceDetectors/Container/_register.php"
+      "src/Instrumentation/Yii/_register.php",
+      "src/ResourceDetectors/Container/_register.php",
+      "src/ResourceDetectors/DigitalOcean/_register.php"
     ]
   },
   "autoload-dev": {
@@ -72,25 +90,37 @@
     "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-exporter-instana": "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",
     "open-telemetry/opentelemetry-logger-monolog": "self.version",
     "open-telemetry/detector-container": "self.version",
+    "open-telemetry/detector-digitalocean": "self.version",
     "open-telemetry/symfony-sdk-bundle": "self.version",
     "open-telemetry/opentracing-shim": "self.version",
     "open-telemetry/test-utils": "self.version"

src/Exporter/Instana/.gitattributes

@@ -0,0 +1,13 @@
+* 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
+/.phan/ export-ignore