error fix

open-telemetry · Oct 17, 2024 · 3e46678 · 3e46678
1 parent f6a23dd
commit 3e46678
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/Instrumentation/Symfony/src/MessengerInstrumentation.php b/src/Instrumentation/Symfony/src/MessengerInstrumentation.php
@@ -56,13 +56,8 @@ public static function register(): void
                 // Instrument dispatch as a "send" operation with SpanKind::KIND_PRODUCER
                 $builder = $instrumentation
                     ->tracer()
-<<<<<<< HEAD
                     ->spanBuilder(\sprintf('publish %s', $messageClass))
                     ->setSpanKind(SpanKind::KIND_PRODUCER) // Set KIND_PRODUCER for dispatch
-=======
-                    ->spanBuilder(\sprintf('DISPATCH %s', $messageClass))
-                    ->setSpanKind(SpanKind::KIND_PRODUCER)
->>>>>>> 78a04cebaeba48d60a00dc1c48653695b926299d
                     ->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
                     ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
                     ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)