feat: orc-9153 refactoring existing bundle

Signed-off-by: Serhii Donii <[email protected]>

Author: serhiidonii

.gitignore

@@ -4,3 +4,4 @@ var/coverage/
 composer.lock
 /.phpunit.result.cache
 /.phpcs-cache
+/var/cache

Makefile

@@ -18,7 +18,7 @@ COMPOSE_FILE := docker-compose.yml
 COMPOSE_OVERRIDE := docker-compose.override.yml
 
 ## Environment Management
-start: ## Start the complete testing environment
+up: ## Start the complete testing environment
 	@echo "$(BLUE)🐳 Starting Symfony OpenTelemetry Bundle Test Environment$(NC)"
 	@docker-compose up -d --build
 	@echo "$(GREEN)✅ Environment started successfully!$(NC)"
@@ -29,12 +29,12 @@ start: ## Start the complete testing environment
 	@echo ""
 	@echo "$(YELLOW)Run 'make test' to run sample tests$(NC)"
 
-stop: ## Stop all services
+down: ## Stop all services
 	@echo "$(YELLOW)🛑 Stopping services...$(NC)"
 	@docker-compose down
 	@echo "$(GREEN)✅ Services stopped$(NC)"
 
-restart: stop start ## Restart all services
+restart: up down ## Restart all services
 
 build: ## Build/rebuild all services
 	@echo "$(BLUE)🔨 Building services...$(NC)"
@@ -145,13 +145,13 @@ load-test: ## Run simple load test
 	@echo "$(GREEN)✅ Load test completed$(NC)"
 
 ## Access Commands
-shell: ## Access PHP container shell
+bash: ## Access PHP container shell
 	@echo "$(BLUE)🐚 Accessing PHP container shell...$(NC)"
-	@docker-compose exec php-app /bin/sh
+	@docker-compose exec php-app /bin/bash
 
-shell-tempo: ## Access Tempo container shell
+bash-tempo: ## Access Tempo container shell
 	@echo "$(BLUE)🐚 Accessing Tempo container shell...$(NC)"
-	@docker-compose exec tempo /bin/sh
+	@docker-compose exec tempo /bin/bash
 
 ## Web Access
 grafana: ## Open Grafana in browser

Resources/config/otel_bundle.yml

@@ -1,5 +1,7 @@
 otel_bundle:
-  tracer_name: '%env(OTEL_TRACER_NAME)%'
-  service_name: '%env(OTEL_SERVICE_NAME)%'
+  #  tracer_name: '%env(OTEL_TRACER_NAME)%'
+  #  service_name: '%env(OTEL_SERVICE_NAME)%'
+  tracer_name: example
+  service_name: example
   span_tracers:
     - { class: 'Macpaw\SymfonyOtelBundle\Span\ExecutionTimeSpanTracer', tag: 'kernel.event_subscriber' }

composer.json

@@ -42,7 +42,8 @@
             "php-http/discovery": true,
             "tbachert/spi": true,
             "infection/extension": true,
-            "infection/extension-installer": true
+            "infection/extension-installer": true,
+            "symfony/runtime": true
         }
     },
     "require-dev": {
@@ -56,7 +57,8 @@
         "react/socket": "^1.15",
         "react/http": "^1.10",
         "react/promise": "^3.2",
-        "react/stream": "^1.4"
+        "react/stream": "^1.4",
+        "symfony/runtime": "^6.4|7.0"
     },
     "scripts": {
         "phpcs": "phpcs",

test_app/src/Kernel.php

@@ -4,11 +4,13 @@
 
 namespace App;
 
+use Macpaw\SymfonyOtelBundle\DependencyInjection\SymfonyOtelCompilerPass;
 use Macpaw\SymfonyOtelBundle\SymfonyOtelBundle;
 use OpenTelemetry\Contrib\Symfony\OtelBundle\OtelBundle;
 use OpenTelemetry\Contrib\Symfony\OtelSdkBundle\OtelSdkBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
@@ -27,8 +29,20 @@ public function registerBundles(): iterable
         ];
     }
 
+    protected function build(ContainerBuilder $container): void
+    {
+        parent::build($container);
+
+        $container->addCompilerPass(new SymfonyOtelCompilerPass());
+    }
+
     protected function configureContainer(ContainerConfigurator $container): void
     {
+        putenv('APP_DEBUG=true');
+        $_ENV['APP_DEBUG'] = $_SERVER['APP_DEBUG'] = true;
+
+        $container->import(__DIR__ . '/../../Resources/config/otel_bundle.yml');
+        $container->import(__DIR__ . '/../../Resources/config/services.yml');
         $container->import('../config/services.yaml');
 
         $container->extension('framework', [
@@ -37,39 +51,10 @@ protected function configureContainer(ContainerConfigurator $container): void
                 'utf8' => true,
             ],
         ]);
-
-        $container->extension('open_telemetry', [
-            'resource' => [
-                'service' => [
-                    'name' => '%env(OTEL_SERVICE_NAME)%',
-                    'version' => '1.0.0',
-                ],
-            ],
-            'tracing' => [
-                'enabled' => true,
-                'exporter' => [
-                    'otlp' => [
-                        'endpoint' => '%env(OTEL_EXPORTER_OTLP_ENDPOINT)%',
-                        'protocol' => '%env(OTEL_EXPORTER_OTLP_PROTOCOL)%',
-                    ],
-                ],
-            ],
-        ]);
-
-        $container->extension('otel_bundle', [
-            'tracer_name' => '%env(OTEL_TRACER_NAME)%',
-            'service_name' => '%env(OTEL_SERVICE_NAME)%',
-            'span_tracers' => [
-                [
-                    'class' => 'Macpaw\SymfonyOtelBundle\Span\ExecutionTimeSpanTracer',
-                    'tag' => 'kernel.event_subscriber',
-                ],
-            ],
-        ]);
     }
 
     protected function configureRoutes(RoutingConfigurator $routes): void
     {
         $routes->import('../config/routes.yaml');
     }
-} 
+}