diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9b6161135..7fdc60cfd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -62,6 +62,8 @@ updates: - "/src/AutoInstrumentationInstaller" - "/src/Aws" - "/src/Context/Swoole" + - "/src/Exporter/Instana" + - "/src/Instrumentation/AwsSdk" - "/src/Instrumentation/CakePHP" - "/src/Instrumentation/CodeIgniter" - "/src/Instrumentation/Curl" @@ -76,12 +78,12 @@ updates: - "/src/Instrumentation/MySqli" - "/src/Instrumentation/OpenAIPHP" - "/src/Instrumentation/PDO" + - "/src/Instrumentation/Psr3" + - "/src/Instrumentation/Psr6" - "/src/Instrumentation/Psr14" - "/src/Instrumentation/Psr15" - "/src/Instrumentation/Psr16" - "/src/Instrumentation/Psr18" - - "/src/Instrumentation/Psr3" - - "/src/Instrumentation/Psr6" - "/src/Instrumentation/ReactPHP" - "/src/Instrumentation/Slim" - "/src/Instrumentation/Symfony" diff --git a/.gitsplit.yml b/.gitsplit.yml index b357f4137..2d1f9e186 100644 --- a/.gitsplit.yml +++ b/.gitsplit.yml @@ -6,18 +6,24 @@ project_url: "https://github.com/open-telemetry/opentelemetry-php-contrib.git" # List of splits. splits: - - prefix: "src/MetaPackages/opentelemetry" - target: "https://${GH_TOKEN}@github.com/opentelemetry-php/opentelemetry-meta.git" + - prefix: "src/AutoInstrumentationInstaller" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-instrumentation-installer.git" - prefix: "src/Aws" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-aws.git" + - prefix: "src/Context/Swoole" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/context-swoole.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/AwsSdk" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-aws-sdk.git" + - prefix: "src/Instrumentation/CakePHP" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-cakephp.git" - prefix: "src/Instrumentation/CodeIgniter" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-codeigniter.git" - prefix: "src/Instrumentation/Curl" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-curl.git" + - prefix: "src/Instrumentation/Doctrine" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-doctrine.git" - prefix: "src/Instrumentation/ExtAmqp" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-ext-amqp.git" - prefix: "src/Instrumentation/ExtRdKafka" @@ -58,20 +64,12 @@ splits: target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-symfony.git" - prefix: "src/Instrumentation/Wordpress" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-wordpress.git" - - prefix: "src/Instrumentation/CakePHP" - target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-cakephp.git" - prefix: "src/Instrumentation/Yii" 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" - target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-instrumentation-installer.git" - prefix: "src/Logs/Monolog" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-logger-monolog.git" + - prefix: "src/MetaPackages/opentelemetry" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/opentelemetry-meta.git" - prefix: "src/Propagation/Instana" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-propagator-instana.git" - prefix: "src/Propagation/ServerTiming" @@ -88,6 +86,8 @@ splits: target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-sampler-rulebased.git" - prefix: "src/Shims/OpenTracing" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-shim-opentracing.git" + - prefix: "src/Symfony" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-sdk-bundle.git" - prefix: "src/Utils/Test" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-utils-test.git" # List of references to split (defined as regexp) diff --git a/composer.json b/composer.json index f61b34ffc..56945bd4b 100644 --- a/composer.json +++ b/composer.json @@ -18,9 +18,11 @@ "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\\AwsSdk\\": "src/Instrumentation/AwsSdk/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\\Doctrine\\": "src/Instrumentation/Doctrine/src", "OpenTelemetry\\Contrib\\Instrumentation\\ExtAmqp\\": "src/Instrumentation/ExtAmqp/src", "OpenTelemetry\\Contrib\\Instrumentation\\ExtRdKafka\\": "src/Instrumentation/ExtRdKafka/src", "OpenTelemetry\\Contrib\\Instrumentation\\Guzzle\\": "src/Instrumentation/Guzzle/src", @@ -46,15 +48,21 @@ "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\\Azure\\": "src/ResourceDetectors/Azure/src", "OpenTelemetry\\Contrib\\Resource\\Detector\\Container\\": "src/ResourceDetectors/Container/src", "OpenTelemetry\\Contrib\\Resource\\Detector\\DigitalOcean\\": "src/ResourceDetectors/DigitalOcean/src", + "OpenTelemetry\\Contrib\\Sampler\\RuleBased\\": "src/Sampler/RuleBased/src", "OpenTelemetry\\Contrib\\Shim\\OpenTracing\\": "src/Shims/OpenTracing/src", - "OpenTelemetry\\Contrib\\Symfony\\": "src/Symfony/src" + "OpenTelemetry\\Contrib\\Symfony\\": "src/Symfony/src", + "OpenTelemetry\\TestUtils\\": "src/Utils/Test/src" }, "files": [ + "src/Exporter/Instana/_register.php", + "src/Instrumentation/AwsSdk/_register.php", "src/Instrumentation/CakePHP/_register.php", "src/Instrumentation/CodeIgniter/_register.php", "src/Instrumentation/Curl/_register.php", + "src/Instrumentation/Doctrine/_register.php", "src/Instrumentation/ExtAmqp/_register.php", "src/Instrumentation/ExtRdKafka/_register.php", "src/Instrumentation/Guzzle/_register.php", @@ -76,25 +84,59 @@ "src/Instrumentation/Symfony/_register.php", "src/Instrumentation/Wordpress/_register.php", "src/Instrumentation/Yii/_register.php", + "src/Propagation/Instana/_register.php", + "src/ResourceDetectors/Azure/_register.php", "src/ResourceDetectors/Container/_register.php", "src/ResourceDetectors/DigitalOcean/_register.php" ] }, "autoload-dev": { "psr-4": { - "OpenTelemetry\\TestUtils\\": "src/", - "OpenTelemetry\\TestUtils\\Tests\\": "tests/" + "OpenTelemetry\\Tests\\Aws\\": "src/Aws/tests", + "OpenTelemetry\\Tests\\Exporter\\Instana\\": "src/Exporter/Instana/tests", + "OpenTelemetry\\Tests\\Instrumentation\\AwsSdk\\": "src/Instrumentation/AwsSdk/tests", + "OpenTelemetry\\Tests\\Instrumentation\\CakePHP\\": "src/Instrumentation/CakePHP/tests", + "OpenTelemetry\\Tests\\Instrumentation\\CakePHP\\Integration\\App\\": "src/Instrumentation/CakePHP/tests/Integration/App", + "OpenTelemetry\\Tests\\Instrumentation\\CodeIgniter\\": "src/Instrumentation/CodeIgniter/tests", + "OpenTelemetry\\Tests\\Instrumentation\\Curl\\": "src/Instrumentation/Curl/tests", + "OpenTelemetry\\Tests\\Instrumentation\\Doctrine\\": "src/Instrumentation/Doctrine/tests", + "OpenTelemetry\\Tests\\Instrumentation\\ExtAmqp\\tests\\": "src/Instrumentation/ExtAmqp/tests", + "OpenTelemetry\\Tests\\Instrumentation\\ExtRdKafka\\tests\\": "src/Instrumentation/ExtRdKafka/tests", + "OpenTelemetry\\Tests\\Instrumentation\\Guzzle\\": "src/Instrumentation/Guzzle/tests", + "OpenTelemetry\\Tests\\Instrumentation\\IO\\": "src/Instrumentation/IO/tests", + "OpenTelemetry\\Tests\\Contrib\\Instrumentation\\Laravel\\": "src/Instrumentation/Laravel/tests", + "OpenTelemetry\\Tests\\Instrumentation\\MongoDB\\": "src/Instrumentation/MongoDB/tests", + "OpenTelemetry\\Tests\\Instrumentation\\MySqli\\": "src/Instrumentation/MySqli/tests", + "OpenTelemetry\\Contrib\\Instrumentation\\OpenAIPHP\\Tests\\": "src/Instrumentation/OpenAIPHP/tests", + "OpenTelemetry\\Tests\\Instrumentation\\PDO\\": "src/Instrumentation/PDO/tests", + "OpenTelemetry\\Tests\\Instrumentation\\Psr6\\": "src/Instrumentation/Psr6/tests", + "OpenTelemetry\\Instrumentation\\Psr14\\Tests\\": "src/Instrumentation/Psr14/tests", + "OpenTelemetry\\Tests\\Instrumentation\\Psr16\\": "src/Instrumentation/Psr16/tests", + "OpenTelemetry\\Tests\\Instrumentation\\ReactPHP\\": "src/Instrumentation/ReactPHP/tests", + "OpenTelemetry\\Tests\\Instrumentation\\Slim\\": "src/Instrumentation/Slim/tests", + "OpenTelemetry\\Tests\\Instrumentation\\Symfony\\tests\\": "src/Instrumentation/Symfony/tests", + "OpenTelemetry\\Tests\\Instrumentation\\Wordpress\\": "src/Instrumentation/Wordpress/tests", + "OpenTelemetry\\Tests\\Instrumentation\\Yii\\": "src/Instrumentation/Yii/tests", + "OpenTelemetry\\Tests\\Resource\\Detector\\Azure\\": "src/ResourceDetectors/Azure/tests", + "OpenTelemetry\\Contrib\\Resource\\Detector\\DigitalOcean\\": "src/ResourceDetectors/DigitalOcean/tests", + "OpenTelemetry\\Tests\\Contrib\\Symfony\\": "src/Symfony/tests", + "OpenTelemetry\\TestUtils\\Tests\\": "src/Utils/Test/tests" } }, "replace": { + "open-telemetry/context-swoole": "self.version", "open-telemetry/contrib-aws": "self.version", "open-telemetry/contrib-sdk-bundle": "self.version", - "open-telemetry/context-swoole": "self.version", + "open-telemetry/contrib-symfony-instrumentation-bundle": "self.version", + "open-telemetry/detector-azure": "self.version", + "open-telemetry/detector-container": "self.version", + "open-telemetry/detector-digitalocean": "self.version", + "open-telemetry/opentelemetry-auto-aws-sdk": "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-doctrine": "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", @@ -102,8 +144,8 @@ "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-pdo": "self.version", "open-telemetry/opentelemetry-auto-psr3": "self.version", "open-telemetry/opentelemetry-auto-psr6": "self.version", "open-telemetry/opentelemetry-auto-psr14": "self.version", @@ -115,14 +157,15 @@ "open-telemetry/opentelemetry-auto-symfony": "self.version", "open-telemetry/opentelemetry-auto-wordpress": "self.version", "open-telemetry/opentelemetry-auto-yii": "self.version", + "open-telemetry/opentelemetry-exporter-instana": "self.version", + "open-telemetry/opentelemetry-instrumentation-installer": "self.version", + "open-telemetry/opentelemetry-logger-monolog": "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/sampler-rule-based": "self.version", + "open-telemetry/symfony-sdk-bundle": "self.version", "open-telemetry/test-utils": "self.version" }, "config": {