fix: rename

Author: overtrue

README.md

@@ -29,8 +29,8 @@ php artisan vendor:publish --provider="Overtrue\LaravelOpenTelemetry\OpenTelemet
 ### Update the environment variables
 
 ```dotenv
-OTLE_ENABLED=true
-OTLE_AUTO_TRACE_REQUESTS=true
+OTEL_ENABLED=true
+OTEL_AUTO_TRACE_REQUESTS=true
 OTEL_PHP_AUTOLOAD_ENABLED=true
 OTEL_PHP_TRACE_CLI_ENABLED=true
 OTEL_SERVICE_NAME=my-app
@@ -52,7 +52,7 @@ protected $middleware = [
 ];
 ```
 
-or you can set the env variable `OTLE_AUTO_TRACE_REQUESTS` to `true` to enable it automatically.
+or you can set the env variable `OTEL_AUTO_TRACE_REQUESTS` to `true` to enable it automatically.
 
 ### Custom span
 

config/otel.php

@@ -0,0 +1,53 @@
+<?php
+
+use OpenTelemetry\SemConv\ResourceAttributes;
+use Overtrue\LaravelOpenTelemetry\Watchers;
+
+return [
+    /**
+     * Enable or disable the OpenTelemetry Laravel Extension.
+     */
+    'enabled' => env('OTEL_ENABLED', true),
+
+    /**
+     * Auto Register the MeasureRequest middleware.
+     */
+    'automatically_trace_requests' => env('OTEL_AUTO_TRACE_REQUESTS', true),
+
+    /**
+     * Allow to trace requests with specific headers. You can use `*` as wildcard.
+     */
+    'allowed_headers' => [
+        'referer',
+        'x-*',
+        'accept',
+        'request-id',
+    ],
+
+    /**
+     * Sensitive headers will be marked as *** from the span attributes. You can use `*` as wildcard.
+     */
+    'sensitive_headers' => [
+        // 'cookie',
+        // 'authorization',
+        // ...
+    ],
+
+    /**
+     * The name of the header that will be used to pass the trace id in the response.
+     * if set to `null`, the header will not be added to the response.
+     */
+    'response_trace_header_name' => env('OTEL_RESPONSE_TRACE_HEADER_NAME', 'X-Trace-Id'),
+
+    /**
+     * Watchers to be registered.
+     */
+    'watchers' => [
+        Watchers\ExceptionWatcher::class,
+        Watchers\AuthenticateWatcher::class,
+        Watchers\EventWatcher::class,
+        Watchers\QueueWatcher::class,
+        Watchers\RedisWatcher::class,
+        // App\Trace\Watchers\YourCustomWatcher::class, // Add your custom watcher here.
+    ],
+];

config/otle.php

@@ -4,12 +4,12 @@
 
 use Illuminate\Support\Facades\Facade;
 use OpenTelemetry\API\Trace\SpanInterface;
+use OpenTelemetry\API\Trace\TracerInterface;
 use OpenTelemetry\Context\ContextInterface;
 use OpenTelemetry\Context\Propagation\TextMapPropagatorInterface;
 use OpenTelemetry\Context\ScopeInterface;
 use Overtrue\LaravelOpenTelemetry\Support\SpanBuilder;
 use Overtrue\LaravelOpenTelemetry\Support\StartedSpan;
-use Overtrue\LaravelOpenTelemetry\Tracer;
 
 /**
  * @method static SpanBuilder span(string $name)
@@ -18,7 +18,7 @@
  * @method static SpanInterface activeSpan()
  * @method static ScopeInterface|null activeScope()
  * @method static string traceId()
- * @method static Tracer tracer()
+ * @method static TracerInterface tracer()
  * @method static TextMapPropagatorInterface propagator()
  * @method static array propagationHeaders(?ContextInterface $context = null)
  * @method static ContextInterface extractContextFromPropagationHeaders(array $headers)

src/Facades/Measure.php

@@ -26,15 +26,14 @@ class MeasureRequest
      */
     public function handle(Request $request, Closure $next, ?string $name = null)
     {
-        static::$allowedHeaders = $this->normalizeHeaders(config('otle.allowed_headers', []));
+        static::$allowedHeaders = $this->normalizeHeaders(config('otel.allowed_headers', []));
 
         static::$sensitiveHeaders = array_merge(
-            $this->normalizeHeaders(config('otle.sensitive_headers', [])),
+            $this->normalizeHeaders(config('otel.sensitive_headers', [])),
             $this->defaultSensitiveHeaders
         );
 
         $span = Measure::activeSpan()->setAttributes($this->getRequestSpanAttributes($request));
-        $scope = Measure::activeScope();
         $context = Context::getCurrent();
 
         try {
@@ -48,7 +47,7 @@ public function handle(Request $request, Closure $next, ?string $name = null)
             }
 
             // Add trace id to response header if configured.
-            if ($traceIdHeaderName = config('otle.response_trace_header_name')) {
+            if ($traceIdHeaderName = config('otel.response_trace_header_name')) {
                 $response->headers->set($traceIdHeaderName, Measure::traceId());
             }
 

src/Middlewares/MeasureRequest.php

@@ -14,29 +14,29 @@ class OpenTelemetryServiceProvider extends ServiceProvider
     public function boot(): void
     {
         $this->publishes([
-            __DIR__.'/../config/otle.php' => $this->app->configPath('otle.php'),
+            __DIR__.'/../config/otel.php' => $this->app->configPath('otel.php'),
         ], 'config');
 
-        if (config('otle.enabled') === false) {
+        if (config('otel.enabled') === false) {
             return;
         }
 
-        if (config('otle.automatically_trace_requests')) {
+        if (config('otel.automatically_trace_requests')) {
             $this->injectHttpMiddleware(app(Kernel::class));
         }
 
-        foreach (config('otle.watchers') as $watcher) {
+        foreach (config('otel.watchers') as $watcher) {
             $this->app->make($watcher)->register($this->app);
         }
     }
 
     public function register(): void
     {
         $this->mergeConfigFrom(
-            __DIR__.'/../config/otle.php', 'otle',
+            __DIR__.'/../config/otel.php', 'otel',
         );
 
-        if (config('otle.enabled') === false) {
+        if (config('otel.enabled') === false) {
             return;
         }
 

src/OpenTelemetryServiceProvider.php

@@ -7,6 +7,7 @@
 use OpenTelemetry\API\Trace\SpanContextInterface;
 use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\Context\ContextInterface;
+use OpenTelemetry\SDK\Common\Time\SystemClock;
 
 // this file is copied from https://github.com/keepsuit/laravel-opentelemetry/blob/main/src/Support/SpanBuilder.php
 class SpanBuilder