Merge pull request #7 from worksome/feature/otel-1.x

chore(deps): update to OpenTelemetry 1.x

Author: owenvoke

README.md

@@ -5,24 +5,26 @@
 [![GitHub Static Analysis Action Status](https://img.shields.io/github/actions/workflow/status/worksome/laravel-telemetry/static.yml?branch=main&style=flat-square&label=Static%20Analysis)](https://github.com/worksome/laravel-telemetry/actions?query=workflow%3A"Static%20Analysis"+branch%3Amain)
 [![Total Downloads](https://img.shields.io/packagist/dt/worksome/laravel-telemetry.svg?style=flat-square)](https://packagist.org/packages/worksome/laravel-telemetry)
 
-This is where your description should go. Limit it to a paragraph or two. Consider adding a small example.
+Add [Open Telemetry](https://opentelemetry.io) support to Laravel.
 
-## Installation
+## Install
 
 You can install the package via composer:
 
-```bash
+```shell
 composer require worksome/laravel-telemetry
 ```
 
 You can publish the config file with:
 
-```bash
+```shell
 php artisan vendor:publish --tag="laravel-telemetry-config"
 ```
 ## Usage
 
-TODO
+This package will work out of the box with a default OTLP exporter configuration.
+
+The default port is `4318`, and requests will be sent to `http://localhost:4318`.
 
 ## Testing
 

composer.json

@@ -18,18 +18,18 @@
     "require": {
         "php": "^8.2",
         "illuminate/contracts": "^10.0",
-        "open-telemetry/api": "^0.0.17",
-        "open-telemetry/sdk": "^0.0.17",
-        "open-telemetry/exporter-otlp": "^0.0.17",
+        "open-telemetry/api": "^1.0",
+        "open-telemetry/sdk": "^1.0",
+        "open-telemetry/exporter-otlp": "^1.0",
         "php-http/guzzle7-adapter": "^1.0"
     },
     "require-dev": {
-        "nunomaduro/collision": "^7.0",
-        "nunomaduro/larastan": "^2.3.4",
-        "orchestra/testbench": "^8.0",
-        "pestphp/pest": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0",
-        "worksome/coding-style": "^2.5"
+        "nunomaduro/collision": "^7.10",
+        "nunomaduro/larastan": "^2.6.4",
+        "orchestra/testbench": "^8.15",
+        "pestphp/pest": "^2.24.3",
+        "pestphp/pest-plugin-laravel": "^2.2",
+        "worksome/coding-style": "^2.6.1"
     },
     "autoload": {
         "psr-4": {

config/telemetry.php

@@ -18,4 +18,5 @@
             ],
         ],
     ],
+
 ];

src/LaravelTelemetryServiceProvider.php

@@ -8,20 +8,20 @@
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Queue\Events\WorkerStopping;
 use Illuminate\Support\ServiceProvider;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Metrics\MeterProviderInterface;
 use OpenTelemetry\API\Trace\TracerProviderInterface;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Common\Configuration\Resolver\CompositeResolver;
 use OpenTelemetry\SDK\Common\Instrumentation\InstrumentationScopeFactory;
-use OpenTelemetry\SDK\Common\Log\LoggerHolder;
 use OpenTelemetry\SDK\Common\Time\ClockFactory;
-use OpenTelemetry\SDK\FactoryRegistry;
 use OpenTelemetry\SDK\Metrics\Exemplar\ExemplarFilter\WithSampledTraceExemplarFilter;
 use OpenTelemetry\SDK\Metrics\MeterProvider;
 use OpenTelemetry\SDK\Metrics\MeterProviderInterface as MeterProviderSdkInterface;
 use OpenTelemetry\SDK\Metrics\MetricReader\ExportingReader;
 use OpenTelemetry\SDK\Metrics\StalenessHandler\NoopStalenessHandlerFactory;
 use OpenTelemetry\SDK\Metrics\View\CriteriaViewRegistry;
+use OpenTelemetry\SDK\Registry;
 use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
 use OpenTelemetry\SDK\Trace\TracerProviderFactory;
 use OpenTelemetry\SDK\Trace\TracerProviderInterface as TracerProviderSdkInterface;
@@ -44,8 +44,7 @@ public function register(): void
                 new InstrumentationScopeFactory(Attributes::factory()),
                 [
                     new ExportingReader(
-                        FactoryRegistry::metricExporterFactory('otlp')->create(),
-                        ClockFactory::getDefault()
+                        Registry::metricExporterFactory('otlp')->create(),
                     ),
                 ],
                 new CriteriaViewRegistry(),
@@ -70,11 +69,11 @@ public function register(): void
     public function boot(): void
     {
         $this->publishes([
-            __DIR__.'/../config/telemetry.php' => $this->app->configPath('telemetry.php'),
+            __DIR__ . '/../config/telemetry.php' => $this->app->configPath('telemetry.php'),
         ], 'laravel-telemetry-config');
 
         $this->mergeConfigFrom(
-            __DIR__.'/../config/telemetry.php',
+            __DIR__ . '/../config/telemetry.php',
             'telemetry',
         );