Preparing repo for package split + housekeeping (#39)

* Allow composer/package-versions-deprecated plugin

* Add integration test suite

* Update sdk-bundle to opentelemetry-php 0.0.5

* Add conflict configuration for open-telemetry/opentelemetry 0.0.5 to composer.json

* Add composer.json and basic Readme for AWS package

* Add PHP version to codecoverage report

* Fix autoloading

* Update composer.json

Author: tidal

.github/workflows/php.yml

@@ -60,11 +60,11 @@ jobs:
     - name: Run Phpstan
       run: vendor/bin/phpstan analyse --error-format=github
 
-    - name: Run Unit Tests
-      run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+    - name: Run PHPUnit (unit tests)
+      run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover --testsuite unit
 
-    - name: Run Integration tests
-      run: vendor/bin/phpunit --coverage-text tests/Integration
+    - name: Run PHPUnit (integration tests)
+      run: vendor/bin/phpunit --testsuite integration
 
     - name: Code Coverage
-      run: bash <(curl -s https://codecov.io/bash)
+      run: bash <(curl -s https://codecov.io/bash) -F ${{ matrix.php-version }}

Makefile

@@ -6,10 +6,13 @@ install:
 	$(DC_RUN_PHP) env XDEBUG_MODE=off composer install
 update:
 	$(DC_RUN_PHP) env XDEBUG_MODE=off composer update
-test:
-	$(DC_RUN_PHP) env XDEBUG_MODE=coverage vendor/bin/phpunit --colors=always --coverage-text --testdox --coverage-clover coverage.clover
+test: test-unit test-integration
+test-unit:
+	$(DC_RUN_PHP) env XDEBUG_MODE=coverage vendor/bin/phpunit --testsuite unit --colors=always --coverage-text --testdox --coverage-clover coverage.clover --coverage-html=tests/coverage/html
+test-integration:
+	$(DC_RUN_PHP) env XDEBUG_MODE=off vendor/bin/phpunit --testsuite integration  --coverage-text --testdox --colors=always
 test-coverage:
-	$(DC_RUN_PHP) env XDEBUG_MODE=coverage vendor/bin/phpunit --colors=always --testdox --coverage-html=tests/coverage/html
+	$(DC_RUN_PHP) env XDEBUG_MODE=coverage vendor/bin/phpunit --testsuite unit --coverage-html=tests/coverage/html
 phan:
 	$(DC_RUN_PHP) env XDEBUG_MODE=off env PHAN_DISABLE_XDEBUG_WARN=1 vendor/bin/phan
 psalm:

composer.json

@@ -22,7 +22,7 @@
         "open-telemetry/otel-sdk-bundle": "self.version"
     },
     "conflict": {
-        "open-telemetry/opentelemetry": "<=0.0.3"
+        "open-telemetry/opentelemetry": "<=0.0.3|0.0.5"
     },
     "autoload": {
         "psr-4": {
@@ -71,6 +71,9 @@
         ]
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true
+        }
     }
 }

phpunit.xml.dist

@@ -40,9 +40,12 @@
     </php>
 
     <testsuites>
-        <testsuite name="Unit Tests">
+        <testsuite name="unit">
             <directory>tests/Unit</directory>
         </testsuite>
+        <testsuite name="integration">
+            <directory>tests/Integration</directory>
+        </testsuite>
     </testsuites>
 
 </phpunit>

src/Aws/README.md

@@ -0,0 +1 @@
+Readme for opentelemetry-php-contrib AWS package (temporary file)

src/Aws/composer.json

@@ -0,0 +1,33 @@
+{
+    "name": "open-telemetry/contrib-aws",
+    "description": "The Aws package for opentelemetry-php",
+    "keywords": ["opentelemetry", "otel", "aws", "tracing", "detector", "propagator"],
+    "type": "library",
+    "license": "Apache-2.0",
+    "authors": [
+        {
+            "name": "opentelemetry-php-contrib contributors",
+            "homepage": "https://github.com/open-telemetry/opentelemetry-php-contrib/graphs/contributors"
+        }
+    ],
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "require": {
+        "php": "^7.4 || ^8.0",
+        "open-telemetry/opentelemetry": "^0.0.4"
+    },
+    "conflict": {
+        "open-telemetry/opentelemetry": "<=0.0.3|0.0.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "OpenTelemetry\\Aws\\": "."
+        }
+    },
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true
+        }
+    }
+}

src/Symfony/OtelSdkBundle/composer.json

@@ -1,13 +1,20 @@
 {
-    "name": "open-telemetry/otel-sdk-bundle",
+    "name": "open-telemetry/contrib-sdk-bundle",
     "description": "Symfony bundle for easily integrating OpenTelemetry PHP SDk into symfony projects.",
+    "keywords": ["opentelemetry", "otel", "symfony", "bundle", "tracing", "logging", "apm", "sdk"],
     "type": "symfony-bundle",
     "license": "Apache-2.0",
+    "authors": [
+        {
+            "name": "opentelemetry-php-contrib contributors",
+            "homepage": "https://github.com/open-telemetry/opentelemetry-php-contrib/graphs/contributors"
+        }
+    ],
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
         "php": "^7.4 || ^8.0",
-        "open-telemetry/opentelemetry": "dev-main",
+        "open-telemetry/opentelemetry": "^0.0.5",
         "php-http/message": "^1.12",
         "php-http/discovery": "^1.14",
         "symfony/config": "^4.4|^5.3|^6.0",
@@ -20,7 +27,7 @@
     },
     "autoload": {
         "psr-4": {
-            "OpenTelemetry\\Symfony\\OtelSdkBundle\\": "src/"
+            "OpenTelemetry\\Symfony\\OtelSdkBundle\\": "."
         }
     },
     "scripts": {