Merge branch 'main' of https://github.com/RichardChukwu/opentelemetry…

…-php-contrib
open-telemetry · Oct 17, 2024 · f6a23dd · f6a23dd
2 parents ea5f1b1 + 78a04ce
commit f6a23dd
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/src/Instrumentation/Symfony/src/MessengerInstrumentation.php b/src/Instrumentation/Symfony/src/MessengerInstrumentation.php
@@ -56,8 +56,13 @@ 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)
@@ -118,6 +123,7 @@ public static function register(): void
 
                  // Instrument sending as a "send" operation with SpanKind::KIND_PRODUCER
                 $builder = $instrumentation
+<<<<<<< HEAD
                  ->tracer()
                  ->spanBuilder(\sprintf('send %s', $messageClass))
                  ->setSpanKind(SpanKind::KIND_PRODUCER) // Set KIND_PRODUCER for sending
@@ -127,6 +133,19 @@ public static function register(): void
                  ->setAttribute(TraceAttributes::CODE_LINENO, $lineno)
                  ->setAttribute(self::ATTRIBUTE_MESSENGER_TRANSPORT, $class)
                  ->setAttribute(self::ATTRIBUTE_MESSENGER_MESSAGE, $messageClass);
+=======
+                    ->tracer()
+                    ->spanBuilder(\sprintf('SEND %s', $messageClass))
+                    ->setSpanKind(SpanKind::KIND_PRODUCER)
+                    ->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
+                    ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
+                    ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
+                    ->setAttribute(TraceAttributes::CODE_LINENO, $lineno)
+
+                    ->setAttribute(self::ATTRIBUTE_MESSENGER_TRANSPORT, $class)
+                    ->setAttribute(self::ATTRIBUTE_MESSENGER_MESSAGE, $messageClass)
+                ;
+>>>>>>> 78a04cebaeba48d60a00dc1c48653695b926299d
 
                 $parent = Context::getCurrent();
                 $span = $builder