Remove event logger

examples/autoload_sdk.php

@@ -4,12 +4,12 @@
 
 namespace OpenTelemetry\Example;
 
+use OpenTelemetry\API\Logs\LogRecord;
+
 putenv('OTEL_PHP_AUTOLOAD_ENABLED=true');
-putenv('OTEL_TRACES_EXPORTER=otlp');
-putenv('OTEL_METRICS_EXPORTER=otlp');
-putenv('OTEL_LOGS_EXPORTER=otlp');
-putenv('OTEL_EXPORTER_OTLP_PROTOCOL=grpc');
-putenv('OTEL_EXPORTER_OTLP_ENDPOINT=http://collector:4317');
+putenv('OTEL_TRACES_EXPORTER=console');
+putenv('OTEL_METRICS_EXPORTER=console');
+putenv('OTEL_LOGS_EXPORTER=console');
 putenv('OTEL_PROPAGATORS=b3,baggage,tracecontext');
 
 echo 'autoloading SDK example starting...' . PHP_EOL;
@@ -21,6 +21,6 @@
 
 $instrumentation->tracer()->spanBuilder('root')->startSpan()->end();
 $instrumentation->meter()->createCounter('cnt')->add(1);
-$instrumentation->eventLogger()->emit('foo', 'hello, otel');
+$instrumentation->logger()->emit((new LogRecord('hello, otel'))->setEventName('foo'));
 
 echo 'Finished!' . PHP_EOL;

examples/load_config.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use OpenTelemetry\API\Logs\LogRecord;
 use OpenTelemetry\Config\SDK\Configuration;
 
 require __DIR__ . '/../vendor/autoload.php';
@@ -16,13 +17,13 @@
 
 $tracer = $sdk->getTracerProvider()->getTracer('demo');
 $meter = $sdk->getMeterProvider()->getMeter('demo');
-$eventLogger = $sdk->getEventLoggerProvider()->getEventLogger('demo');
+$logger = $sdk->getLoggerProvider()->getLogger('demo');
 
 $span = $tracer->spanBuilder('root')->startSpan();
 $scope = $span->activate();
 $meter->createCounter('cnt')->add(1);
 
-$eventLogger->emit('foo', 'hello, otel');
+$logger->emit((new LogRecord('hello, otel'))->setEventName('foo'));
 $scope->detach();
 $span->end();
 

examples/load_config_env.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use OpenTelemetry\API\Logs\LogRecord;
 use OpenTelemetry\Config\SDK\Configuration;
 
 require __DIR__ . '/../vendor/autoload.php';
@@ -21,10 +22,10 @@
 
 $tracer = $sdk->getTracerProvider()->getTracer('demo');
 $meter = $sdk->getMeterProvider()->getMeter('demo');
-$eventLogger = $sdk->getEventLoggerProvider()->getEventLogger('demo');
+$logger = $sdk->getLoggerProvider()->getLogger('demo');
 
 $tracer->spanBuilder('root')->startSpan()->end();
 $meter->createCounter('cnt')->add(1);
-$eventLogger->emit('foo', 'hello, otel');
+$logger->emit((new LogRecord('hello, otel'))->setEventName('foo'));
 
 echo 'Finished!' . PHP_EOL;

examples/logs/exporters/otlp_grpc.php

@@ -5,13 +5,13 @@
 namespace OpenTelemetry\Example;
 
 use OpenTelemetry\API\Common\Time\Clock;
+use OpenTelemetry\API\Logs\LogRecord;
 use OpenTelemetry\API\Logs\Severity;
 use OpenTelemetry\API\Signals;
 use OpenTelemetry\Contrib\Grpc\GrpcTransportFactory;
 use OpenTelemetry\Contrib\Otlp\LogsExporter;
 use OpenTelemetry\Contrib\Otlp\OtlpUtil;
 use OpenTelemetry\SDK\Common\Instrumentation\InstrumentationScopeFactory;
-use OpenTelemetry\SDK\Logs\EventLoggerProvider;
 use OpenTelemetry\SDK\Logs\LoggerProvider;
 use OpenTelemetry\SDK\Logs\LogRecordLimitsBuilder;
 use OpenTelemetry\SDK\Logs\Processor\BatchLogRecordProcessor;
@@ -29,18 +29,9 @@
         (new LogRecordLimitsBuilder())->build()->getAttributeFactory()
     )
 );
-$eventLoggerProvider = new EventLoggerProvider($loggerProvider);
-$eventLogger = $eventLoggerProvider->getEventLogger('demo', '1.0', 'http://schema.url', ['foo' => 'bar']);
+$logger = $loggerProvider->getLogger('demo', '1.0', 'http://schema.url', ['foo' => 'bar']);
 
-$eventLogger->emit(
-    name: 'foo',
-    body: ['foo' => 'bar', 'baz' => 'bat', 'msg' => 'hello world'],
-    severityNumber: Severity::INFO
-);
-
-$eventLogger->emit(
-    'bar',
-    'otel is great'
-);
+$logger->emit((new LogRecord(['foo' => 'bar', 'baz' => 'bat', 'msg' => 'hello world']))->setEventName('foo')->setSeverityNumber(Severity::INFO));
+$logger->emit((new LogRecord('otel is great'))->setEventName('bar'));
 
 $loggerProvider->shutdown();

examples/logs/exporters/otlp_http.php

@@ -9,7 +9,6 @@
 use OpenTelemetry\Contrib\Otlp\LogsExporter;
 use OpenTelemetry\SDK\Common\Export\Http\PsrTransportFactory;
 use OpenTelemetry\SDK\Common\Instrumentation\InstrumentationScopeFactory;
-use OpenTelemetry\SDK\Logs\EventLoggerProvider;
 use OpenTelemetry\SDK\Logs\LoggerProvider;
 use OpenTelemetry\SDK\Logs\LogRecordLimitsBuilder;
 use OpenTelemetry\SDK\Logs\Processor\SimpleLogRecordProcessor;
@@ -27,12 +26,10 @@
         (new LogRecordLimitsBuilder())->build()->getAttributeFactory()
     )
 );
-$eventLoggerProvider = new EventLoggerProvider($loggerProvider);
-$eventLogger = $eventLoggerProvider->getEventLogger('demo', '1.0', 'https://opentelemetry.io/schemas/1.7.1', ['foo' => 'bar']);
-
-$eventLogger->emit(
-    name: 'foo',
-    body: ['foo' => 'bar', 'baz' => 'bat', 'msg' => 'hello world'],
-    timestamp: (new \DateTime())->getTimestamp() * LogRecord::NANOS_PER_SECOND,
-    severityNumber: Severity::INFO,
+$logger = $loggerProvider->getLogger('demo', '1.0', 'https://opentelemetry.io/schemas/1.7.1', ['foo' => 'bar']);
+$logger->emit(
+    (new LogRecord(['foo' => 'bar', 'baz' => 'bat', 'msg' => 'hello world']))
+    ->setEventName('foo')
+    ->setSeverityNumber(Severity::INFO)
+    ->setTimestamp((new \DateTime())->getTimestamp() * LogRecord::NANOS_PER_SECOND)
 );

examples/logs/features/batch_exporting.php

@@ -5,11 +5,10 @@
 namespace OpenTelemetry\Example;
 
 use OpenTelemetry\API\Common\Time\Clock;
+use OpenTelemetry\API\Logs\LogRecord;
 use OpenTelemetry\API\Logs\Severity;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Common\Instrumentation\InstrumentationScopeFactory;
-use OpenTelemetry\SDK\Logs\EventLogger;
-use OpenTelemetry\SDK\Logs\EventLoggerProvider;
 use OpenTelemetry\SDK\Logs\Exporter\ConsoleExporterFactory;
 use OpenTelemetry\SDK\Logs\LoggerProvider;
 use OpenTelemetry\SDK\Logs\Processor\BatchLogRecordProcessor;
@@ -23,16 +22,15 @@
     ),
     new InstrumentationScopeFactory(Attributes::factory())
 );
-$eventLoggerProvider = new EventLoggerProvider($loggerProvider);
-//get a logger, and emit a log record from an EventLogger.
-$eventLoggerOne = $eventLoggerProvider->getEventLogger('demo', '1.0');
-$eventLoggerTwo = $eventLoggerProvider->getEventLogger('demo', '2.0');
+//get a logger, and emit an event.
+$loggerOne = $loggerProvider->getLogger('demo', '1.0');
+$loggerTwo = $loggerProvider->getLogger('demo', '2.0');
 
 $payload = ['foo' => 'bar', 'baz' => 'bat', 'msg' => 'hello world'];
 
-$eventLoggerOne->emit(name: 'foo', body: $payload, severityNumber: Severity::INFO);
-$eventLoggerOne->emit('bar', 'hello world');
-$eventLoggerTwo->emit(name: 'foo', body: $payload, severityNumber: Severity::INFO);
+$loggerOne->emit((new LogRecord($payload))->setEventName('foo')->setSeverityNumber(Severity::INFO));
+$loggerOne->emit((new LogRecord('hello world'))->setEventName('bar'));
+$loggerTwo->emit((new LogRecord($payload))->setEventName('foo')->setSeverityNumber(Severity::INFO));
 
 //shut down logger provider
 $loggerProvider->shutdown();

examples/logs/getting_started.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
+use OpenTelemetry\API\Logs\LogRecord;
 use OpenTelemetry\API\Logs\Severity;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Common\Instrumentation\InstrumentationScopeFactory;
-use OpenTelemetry\SDK\Logs\EventLoggerProvider;
 use OpenTelemetry\SDK\Logs\Exporter\ConsoleExporterFactory;
 use OpenTelemetry\SDK\Logs\LoggerProvider;
 use OpenTelemetry\SDK\Logs\Processor\SimpleLogRecordProcessor;
@@ -26,7 +26,6 @@
     ),
     new InstrumentationScopeFactory(Attributes::factory())
 );
-$eventLoggerProvider = new EventLoggerProvider($loggerProvider);
 $tracerProvider = new TracerProvider();
 $tracer = $tracerProvider->getTracer('demo-tracer');
 
@@ -36,12 +35,12 @@
 echo 'Trace id: ' . $span->getContext()->getTraceId() . PHP_EOL;
 echo 'Span id: ' . $span->getContext()->getSpanId() . PHP_EOL;
 
-//get an event logger, and emit an event. The active context (trace id + span id) will be
+//get a logger, and emit an event. The active context (trace id + span id) will be
 //attached to the log record
-$eventLogger = $eventLoggerProvider->getEventLogger('demo', '1.0', 'http://schema.url', ['foo' => 'bar']);
+$logger = $loggerProvider->getLogger('demo', '1.0', 'http://schema.url', ['foo' => 'bar']);
 $payload = ['foo' => 'bar', 'baz' => 'bat', 'msg' => 'hello world'];
 
-$eventLogger->emit(name: 'foo', body: $payload, severityNumber: Severity::INFO);
+$logger->emit((new LogRecord($payload))->setEventName('foo')->setSeverityNumber(Severity::INFO));
 
 //end span
 $span->end();

examples/src/_register.php

@@ -3,8 +3,8 @@
 declare(strict_types=1);
 
 use Nevay\SPI\ServiceLoader;
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\Instrumentation;
 use OpenTelemetry\API\Configuration\Config\ComponentProvider;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\Instrumentation;
 use OpenTelemetry\Example\ExampleConfigProvider;
 use OpenTelemetry\Example\ExampleInstrumentation;
 use OpenTelemetry\Example\TestResourceDetectorFactory;

examples/traces/exporters/otlp_file_autoload.php

@@ -5,6 +5,7 @@
 namespace OpenTelemetry\Example;
 
 use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Logs\LogRecord;
 
 putenv('OTEL_PHP_AUTOLOAD_ENABLED=true');
 putenv('OTEL_TRACES_EXPORTER=otlp/stdout');
@@ -17,7 +18,7 @@
 
 $instrumentation->tracer()->spanBuilder('root')->startSpan()->end();
 $instrumentation->meter()->createCounter('cnt')->add(1);
-$instrumentation->eventLogger()->emit('foo', 'hello, otel');
+$instrumentation->logger()->emit(new LogRecord('foo'));
 
 echo PHP_EOL . 'OTLP/stdout autoload example complete!';
 echo PHP_EOL;

phpstan.neon.dist

@@ -51,10 +51,6 @@ parameters:
             message: "#.*return with type T is not subtype.*#"
             paths:
                 - src/SDK/Common/InstrumentationScope
-        -
-            message: "#.*assertCount\\(\\) expects Countable\\|iterable.*#"
-            paths:
-                - tests/Unit/Contrib/Otlp/
         -
             message: "#.*expects Google\\\\Protobuf\\\\RepeatedField.*#"
             paths:

src/API/Globals.php

@@ -9,7 +9,6 @@
 use OpenTelemetry\API\Behavior\LogsMessagesTrait;
 use OpenTelemetry\API\Instrumentation\Configurator;
 use OpenTelemetry\API\Instrumentation\ContextKeys;
-use OpenTelemetry\API\Logs\EventLoggerProviderInterface;
 use OpenTelemetry\API\Logs\LoggerProviderInterface;
 use OpenTelemetry\API\Metrics\MeterProviderInterface;
 use OpenTelemetry\API\Trace\TracerProviderInterface;
@@ -33,7 +32,6 @@ public function __construct(
         private readonly TracerProviderInterface $tracerProvider,
         private readonly MeterProviderInterface $meterProvider,
         private readonly LoggerProviderInterface $loggerProvider,
-        private readonly EventLoggerProviderInterface $eventLoggerProvider,
         private readonly TextMapPropagatorInterface $propagator,
     ) {
     }
@@ -58,15 +56,6 @@ public static function loggerProvider(): LoggerProviderInterface
         return Context::getCurrent()->get(ContextKeys::loggerProvider()) ?? self::globals()->loggerProvider;
     }
 
-    /**
-     * @deprecated
-     * @phan-suppress PhanDeprecatedFunction
-     */
-    public static function eventLoggerProvider(): EventLoggerProviderInterface
-    {
-        return Context::getCurrent()->get(ContextKeys::eventLoggerProvider()) ?? self::globals()->eventLoggerProvider;
-    }
-
     /**
      * @param Closure(Configurator): Configurator $initializer
      *
@@ -108,11 +97,10 @@ private static function globals(): self
         $meterProvider = $context->get(ContextKeys::meterProvider());
         $propagator = $context->get(ContextKeys::propagator());
         $loggerProvider = $context->get(ContextKeys::loggerProvider());
-        $eventLoggerProvider = $context->get(ContextKeys::eventLoggerProvider());
 
-        assert(isset($tracerProvider, $meterProvider, $loggerProvider, $eventLoggerProvider, $propagator));
+        assert(isset($tracerProvider, $meterProvider, $loggerProvider, $propagator));
 
-        return self::$globals = new self($tracerProvider, $meterProvider, $loggerProvider, $eventLoggerProvider, $propagator);
+        return self::$globals = new self($tracerProvider, $meterProvider, $loggerProvider, $propagator);
     }
 
     /**

src/API/Instrumentation/CachedInstrumentation.php

@@ -5,8 +5,6 @@
 namespace OpenTelemetry\API\Instrumentation;
 
 use OpenTelemetry\API\Globals;
-use OpenTelemetry\API\Logs\EventLoggerInterface;
-use OpenTelemetry\API\Logs\EventLoggerProviderInterface;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Logs\LoggerProviderInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
@@ -31,8 +29,6 @@ final class CachedInstrumentation
     private WeakMap $meters;
     /** @var WeakMap<LoggerProviderInterface, LoggerInterface> */
     private WeakMap $loggers;
-    /** @var WeakMap<EventLoggerProviderInterface, EventLoggerInterface> */
-    private WeakMap $eventLoggers;
 
     /**
      * @psalm-suppress PropertyTypeCoercion
@@ -46,7 +42,6 @@ public function __construct(
         $this->tracers = new \WeakMap();
         $this->meters = new \WeakMap();
         $this->loggers = new \WeakMap();
-        $this->eventLoggers = new \WeakMap();
     }
 
     public function tracer(): TracerInterface
@@ -68,15 +63,4 @@ public function logger(): LoggerInterface
 
         return $this->loggers[$loggerProvider] ??= $loggerProvider->getLogger($this->name, $this->version, $this->schemaUrl, $this->attributes);
     }
-
-    /**
-     * @deprecated
-     * @phan-suppress PhanDeprecatedFunction
-     */
-    public function eventLogger(): EventLoggerInterface
-    {
-        $eventLoggerProvider = Globals::eventLoggerProvider();
-
-        return $this->eventLoggers[$eventLoggerProvider] ??= $eventLoggerProvider->getEventLogger($this->name, $this->version, $this->schemaUrl, $this->attributes);
-    }
 }

src/API/Instrumentation/Configurator.php

@@ -4,9 +4,7 @@
 
 namespace OpenTelemetry\API\Instrumentation;
 
-use OpenTelemetry\API\Logs\EventLoggerProviderInterface;
 use OpenTelemetry\API\Logs\LoggerProviderInterface;
-use OpenTelemetry\API\Logs\NoopEventLoggerProvider;
 use OpenTelemetry\API\Logs\NoopLoggerProvider;
 use OpenTelemetry\API\Metrics\MeterProviderInterface;
 use OpenTelemetry\API\Metrics\Noop\NoopMeterProvider;
@@ -30,7 +28,6 @@ final class Configurator implements ImplicitContextKeyedInterface
     private ?MeterProviderInterface $meterProvider = null;
     private ?TextMapPropagatorInterface $propagator = null;
     private ?LoggerProviderInterface $loggerProvider = null;
-    private ?EventLoggerProviderInterface $eventLoggerProvider = null;
 
     private function __construct()
     {
@@ -55,7 +52,6 @@ public static function createNoop(): Configurator
             ->withMeterProvider(new NoopMeterProvider())
             ->withPropagator(new NoopTextMapPropagator())
             ->withLoggerProvider(NoopLoggerProvider::getInstance())
-            ->withEventLoggerProvider(new NoopEventLoggerProvider())
         ;
     }
 
@@ -83,9 +79,6 @@ public function storeInContext(?ContextInterface $context = null): ContextInterf
         if ($this->loggerProvider !== null) {
             $context = $context->with(ContextKeys::loggerProvider(), $this->loggerProvider);
         }
-        if ($this->eventLoggerProvider !== null) {
-            $context = $context->with(ContextKeys::eventLoggerProvider(), $this->eventLoggerProvider);
-        }
 
         return $context;
     }
@@ -121,15 +114,4 @@ public function withLoggerProvider(?LoggerProviderInterface $loggerProvider): Co
 
         return $self;
     }
-
-    /**
-     * @deprecated
-     */
-    public function withEventLoggerProvider(?EventLoggerProviderInterface $eventLoggerProvider): Configurator
-    {
-        $self = clone $this;
-        $self->eventLoggerProvider = $eventLoggerProvider;
-
-        return $self;
-    }
 }