Change queueing type

Author: lrafeei

newrelic/api/time_trace.py

@@ -225,6 +225,13 @@ def _add_span_link_event(self, span_id, trace_id, linked_span_id, linked_trace_i
         if not settings.opentelemetry.enabled:
             return
 
+        if len(self.span_link_events) >= 100:
+            _logger.debug(
+                "Maximum number of SpanLink events already added. Dropping SpanLink event: linkedSpanId=%r, linkedTraceId=%r",
+                linked_span_id,
+                linked_trace_id,
+            )
+            return
         attributes = dict(attributes) or {}
 
         event = [
@@ -250,6 +257,15 @@ def _add_span_event_event(self, name, span_id, trace_id, timestamp=None, attribu
         if not settings.opentelemetry.enabled:
             return
 
+        if len(self.span_event_events) >= 100:
+            _logger.debug(
+                "Maximum number of SpanEvent events already added. Dropping SpanEvent event: name=%r, spanId=%r, traceId=%r",
+                name,
+                span_id,
+                trace_id,
+            )
+            return
+
         attributes = dict(attributes) or {}
 
         event = [

newrelic/core/stats_engine.py

@@ -1076,27 +1076,24 @@ def _update_synthetics_transaction(self, transaction):
             self.__synthetics_transactions.append(transaction)
 
     def _add_spanlink_and_spanevent_events(self, event, priority):
-        """Add SpanLink and SpanEvent events into their own
-        SampledDataSets within the span_events SampledDataSet.
+        """Add SpanLink and SpanEvent events into their
+        own queue within the span_events' SampledDataSet.
         """
         if not self.__settings.opentelemetry.enabled or isinstance(event[-1], dict):
             return event
 
         span, span_link, span_event = event
 
-        span_link_queue = SampledDataSet()
-        span_event_queue = SampledDataSet()
+        span_link_queue = []
+        span_event_queue = []
 
         for span_link_event in span_link:
-            span_link_queue.add(span_link_event, priority=priority)
+            span_link_queue.append(span_link_event)
 
         for span_event_event in span_event:
-            span_event_queue.add(span_event_event, priority=priority)
+            span_event_queue.append(span_event_event)
 
-        span_link_list = list(span_link_queue)
-        span_event_list = list(span_event_queue)
-
-        return list(filter(bool, [span, span_link_list, span_event_list]))
+        return list(filter(bool, [span, span_link_queue, span_event_queue]))
 
     def record_transaction(self, transaction):
         """Record any apdex and time metrics for the transaction as

tests/hybridagent_opentelemetry/conftest.py

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 import pytest
-from opentelemetry import trace
 from testing_support.fixtures import collector_agent_registration_fixture, collector_available_fixture
 
 from newrelic.api.opentelemetry import TracerProvider
+from opentelemetry import trace
 
 _default_settings = {
     "package_reporting.enabled": False,  # Turn off package reporting for testing as it causes slow downs.
@@ -35,6 +35,7 @@
 
 @pytest.fixture(scope="session")
 def tracer():
-    trace.set_tracer_provider(TracerProvider())
-
-    return trace.get_tracer_provider().get_tracer()
+    tracer_provider = TracerProvider()
+    
+    trace.set_tracer_provider(tracer_provider=tracer_provider)
+    return tracer_provider.get_tracer()

tests/hybridagent_opentelemetry/test_spanevent_spanlinks.py

@@ -132,7 +132,7 @@ def _test():
 
 @dt_enabled
 @validate_spanlink_or_spanevent_events(
-    exact_intrinsics={"type": "SpanEvent", "name": "otelevent2"},
+    exact_intrinsics={"type": "SpanEvent", "name": "otelevent"},
     expected_intrinsics=["timestamp", "span.id", "trace.id", "name"],
     exact_users={"key99": "value99", "universe": 42},
 )
@@ -159,6 +159,6 @@ def _test():
         with tracer.start_as_current_span(
             "otelspan", links=[Link(linked_span_context, attributes={"key1": "value1", "key2": 42})]
         ) as otel_span:
-            otel_span.add_event("otelevent2", attributes={"key99": "value99", "universe": 42})
+            otel_span.add_event("otelevent", attributes={"key99": "value99", "universe": 42})
 
     _test()

tests/hybridagent_pika/test_distributed_tracing.py

@@ -70,10 +70,10 @@ def do_basic_consume(channel, queue_name):
         ("Supportability/DistributedTrace/AcceptPayload/Success", None),
         ("Supportability/TraceContext/TraceParent/Accept/Success", 1),
         ("Supportability/TraceContext/Accept/Success", 1),
-        ("DurationByCaller/App/33/12345/Unknown/all", 1),
-        ("TransportDuration/App/33/12345/Unknown/all", 1),
-        ("DurationByCaller/App/33/12345/Unknown/allOther", 1),
-        ("TransportDuration/App/33/12345/Unknown/allOther", 1),
+        ("DurationByCaller/App/33/12345/AMQP/all", 1),
+        ("TransportDuration/App/33/12345/AMQP/all", 1),
+        ("DurationByCaller/App/33/12345/AMQP/allOther", 1),
+        ("TransportDuration/App/33/12345/AMQP/allOther", 1),
     ]
 
     @validate_transaction_metrics(