Merge branch 'main' of https://github.com/AsakerMohd/opentelemetry-php-contrib

Author: AsakerMohd

.github/workflows/php.yml

@@ -48,6 +48,7 @@ jobs:
           'Instrumentation/Symfony',
           'Instrumentation/Yii',
           'Logs/Monolog',
+          'Propagation/Instana',
           'Propagation/ServerTiming',
           'Propagation/TraceResponse',
           'ResourceDetectors/Azure',

.gitsplit.yml

@@ -68,6 +68,8 @@ splits:
     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/Propagation/Instana"
+    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-propagator-instana.git"
   - prefix: "src/Propagation/ServerTiming"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-propagator-server-timing.git"
   - prefix: "src/Propagation/TraceResponse"

composer.json

@@ -34,6 +34,7 @@
       "OpenTelemetry\\Contrib\\Instrumentation\\Wordpress\\": "src/Instrumentation/Wordpress/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\CakePHP\\": "src/Instrumentation/CakePHP/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",
@@ -82,6 +83,7 @@
     "open-telemetry/opentelemetry-auto-slim": "self.version",
     "open-telemetry/opentelemetry-auto-symfony": "self.version",
     "open-telemetry/opentelemetry-auto-wordpress": "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",

src/Propagation/Instana/.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/Propagation/Instana/.gitignore

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