fixing broken symfony build (#192)

open-telemetry · Sep 14, 2023 · e317b41 · e317b41
1 parent c8e79a8
commit e317b41
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/Symfony/composer.json b/src/Symfony/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "ext-json": "*",
-        "open-telemetry/api": "^1.0.0beta12",
+        "open-telemetry/api": "^1",
         "open-telemetry/context": "^1",
         "open-telemetry/exporter-otlp": "^1",
         "open-telemetry/exporter-zipkin": "^1",

diff --git a/src/Symfony/src/OtelSdkBundle/DependencyInjection/ConfigMappings.php b/src/Symfony/src/OtelSdkBundle/DependencyInjection/ConfigMappings.php
@@ -20,8 +20,8 @@ interface ConfigMappings
     ];
     public const SPAN_EXPORTERS = [
         Configuration::ZIPKIN_EXPORTER => SpanExporters::ZIPKIN,
-        Configuration::OTLP_HTTP_EXPORTER => SpanExporters::OTLP_HTTP,
-        Configuration::OTLP_GRPC_EXPORTER => SpanExporters::OTLP_GRPC,
+        Configuration::OTLP_HTTP_EXPORTER => SpanExporters::OTLP,
+        Configuration::OTLP_GRPC_EXPORTER => SpanExporters::OTLP,
     ];
     public const SPAN_EXPORTER_FACTORIES = [
         Configuration::ZIPKIN_EXPORTER_FACTORY => SpanExporterFactories::ZIPKIN,

diff --git a/src/Symfony/src/OtelSdkBundle/DependencyInjection/SpanExporters.php b/src/Symfony/src/OtelSdkBundle/DependencyInjection/SpanExporters.php
@@ -10,12 +10,10 @@
 interface SpanExporters
 {
     public const ZIPKIN = Contrib\Zipkin\Exporter::class;
-    public const OTLP_HTTP = Contrib\OtlpHttp\Exporter::class;
-    public const OTLP_GRPC = Contrib\OtlpGrpc\Exporter::class;
+    public const OTLP = Contrib\Otlp\SpanExporter::class;
     public const SPAN_EXPORTERS = [
         self::ZIPKIN,
-        self::OTLP_HTTP,
-        self::OTLP_GRPC,
+        self::OTLP,
     ];
     public const NAMESPACE = 'OpenTelemetry\SDK\Trace\SpanExporter';
 }