fix:完善代码结构

Author: billpyang

src/Facades/Metric.php

@@ -10,10 +10,10 @@
  * @method static bool isEnabled()
  * @method static void reset()
  * @method static \OpenTelemetry\API\Metrics\MeterInterface meter()
- * @method static \OpenTelemetry\API\Metrics\CounterInterface createCounter(string $name, ?string $unit = null, ?string $description = null, array $advisory = [])
- * @method static \OpenTelemetry\API\Metrics\HistogramInterface createHistogram(string $name, ?string $unit = null, ?string $description = null, array $advisory = [])
- * @method static \OpenTelemetry\API\Metrics\GaugeInterface createGauge(string $name, ?string $unit = null, ?string $description = null, array $advisory = [])
- * @method static \OpenTelemetry\API\Metrics\ObservableGaugeInterface createObservableGauge(string $name, ?string $unit = null, ?string $description = null, array|callable $advisory = [], callable ...$callbacks)
+ * @method static \OpenTelemetry\API\Metrics\CounterInterface counter(string $name, ?string $unit = null, ?string $description = null, array $advisories = [])
+ * @method static \OpenTelemetry\API\Metrics\HistogramInterface histogram(string $name, ?string $unit = null, ?string $description = null, array $advisories = [])
+ * @method static \OpenTelemetry\API\Metrics\GaugeInterface gauge(string $name, ?string $unit = null, ?string $description = null, array $advisories = [])
+ * @method static \OpenTelemetry\API\Metrics\ObservableGaugeInterface observableGauge(string $name, ?string $unit = null, ?string $description = null, array|callable $advisories = [], callable ...$callbacks)
  *
  * @see \Overtrue\LaravelOpenTelemetry\Support\Metric
  */

src/OpenTelemetryServiceProvider.php

@@ -14,7 +14,6 @@
 use OpenTelemetry\API\Trace\TracerInterface;
 use Overtrue\LaravelOpenTelemetry\Console\Commands\TestCommand;
 use Overtrue\LaravelOpenTelemetry\Facades\Measure;
-use Overtrue\LaravelOpenTelemetry\Facades\Metric;
 use Overtrue\LaravelOpenTelemetry\Http\Middleware\AddTraceId;
 use Overtrue\LaravelOpenTelemetry\Http\Middleware\TraceRequest;
 

src/Support/Metric.php

@@ -63,27 +63,27 @@ public function meter(): MeterInterface
         }
     }
 
-    public function createCounter(string $name, ?string $unit = null,
-        ?string $description = null, array $advisory = []): CounterInterface
+    public function counter(string $name, ?string $unit = null,
+        ?string $description = null, array $advisories = []): CounterInterface
     {
-        return $this->meter()->createCounter($name, $unit, $description, $advisory);
+        return $this->meter()->createCounter($name, $unit, $description, $advisories);
     }
 
-    public function createHistogram(string $name, ?string $unit = null,
-        ?string $description = null, array $advisory = []): HistogramInterface
+    public function histogram(string $name, ?string $unit = null,
+        ?string $description = null, array $advisories = []): HistogramInterface
     {
-        return $this->meter()->createHistogram($name, $unit, $description, $advisory);
+        return $this->meter()->createHistogram($name, $unit, $description, $advisories);
     }
 
-    public function createGauge(string $name, ?string $unit = null,
-        ?string $description = null, array $advisory = []): GaugeInterface
+    public function gauge(string $name, ?string $unit = null,
+        ?string $description = null, array $advisories = []): GaugeInterface
     {
-        return $this->meter()->createGauge($name, $unit, $description, $advisory);
+        return $this->meter()->createGauge($name, $unit, $description, $advisories);
     }
 
-    public function createObservableGauge(string $name, ?string $unit = null,
-        ?string $description = null, array|callable $advisory = [], callable ...$callbacks): ObservableGaugeInterface
+    public function observableGauge(string $name, ?string $unit = null,
+        ?string $description = null, array|callable $advisories = [], callable ...$callbacks): ObservableGaugeInterface
     {
-        return $this->meter()->createObservableGauge($name, $unit, $description, $advisory, $callbacks);
+        return $this->meter()->createObservableGauge($name, $unit, $description, $advisories, ...$callbacks);
     }
 }