Bug fix and comment on test

Author: lrafeei

newrelic/api/opentelemetry.py

@@ -17,7 +17,6 @@
 
 from opentelemetry import trace as otel_api_trace
 from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
-from opentelemetry import metrics as otel_api_metric
 from opentelemetry.baggage.propagation import W3CBaggagePropagator
 from opentelemetry.propagators.composite import CompositePropagator
 from opentelemetry.propagate import set_global_textmap
@@ -234,6 +233,11 @@ def __init__(
         # for debug purposes but eventually take this out.
         if not self.nr_transaction:
             raise ValueError("HOW DID WE GET HERE??")
+        
+        # Do not create a New Relic trace if parent
+        # is a remote span and it is not sampled
+        if self._is_remote() and not self._is_sampled():
+            return
 
         self.nr_parent = None
         current_nr_trace = current_trace()
@@ -330,7 +334,7 @@ def get_span_context(self):
                 (key, str(value)) for key, value in nr_tracestate_headers.items()
             ]
         else:
-        otel_tracestate_headers = None
+            otel_tracestate_headers = None
 
         return otel_api_trace.SpanContext(
             trace_id=int(self.nr_transaction._trace_id, 16),
@@ -433,17 +437,6 @@ class Tracer(otel_api_trace.Tracer):
     def __init__(self, resource=None, instrumentation_library=None, *args, **kwargs):
         self.resource = resource
         self.instrumentation_library = instrumentation_library.split(".")[-1].capitalize()
-        self.nr_application = application_instance(activate=False) or register_application("OtelTracer")
-        self.global_settings = self.nr_application and self.nr_application.global_settings
-
-        if self.nr_application and self.global_settings.enabled and self.nr_application.enabled:
-            self._settings = self.nr_application.settings
-            if not self._settings:
-                self.nr_application.activate()
-                self._settings = self.nr_application.settings
-        else:
-            # Unable to find or register application.  We should log this.
-            pass
 
     def start_span(
         self,
@@ -465,13 +458,14 @@ def start_span(
             parent_span_context = None
 
         nr_trace_type = FunctionTrace
+        self.nr_application = application_instance()
         transaction = current_transaction()
         self.attributes = attributes or {}
 
         # If parent_span_context exists, we can create traceparent
         # and tracestate headers
         _headers = {}
-        if parent_span_context and application_instance(activate=False).settings.distributed_tracing.enabled:
+        if parent_span_context and self.nr_application.settings.distributed_tracing.enabled:
             parent_span_trace_id = parent_span_context.trace_id
             parent_span_span_id = parent_span_context.span_id
             parent_span_trace_flags = parent_span_context.trace_flags
@@ -489,9 +483,9 @@ def start_span(
                 request_method = self.attributes.get("http.method")
                 request_path = self.attributes.get("http.route")
 
-                    if not headers:
-                        headers = _headers
-                        update_sampled_flag = True
+                if not headers:
+                    headers = _headers
+                    update_sampled_flag = True
 
                 transaction = WebTransaction(
                     self.nr_application,
@@ -504,8 +498,8 @@ def start_span(
                     headers=headers,
                 )
 
-                    if update_sampled_flag and parent_span_context:
-                        transaction._sampled = bool(parent_span_trace_flags)
+                if update_sampled_flag and parent_span_context:
+                    transaction._sampled = bool(parent_span_trace_flags)
             elif kind in (
                 otel_api_trace.SpanKind.PRODUCER,
                 otel_api_trace.SpanKind.INTERNAL,

tests/hybridagent_opentelemetry/test_hybrid_cross_agent.py

@@ -23,6 +23,9 @@
 
 from testing_support.validators.validate_transaction_count import validate_transaction_count
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
+from testing_support.validators.validate_span_events import validate_span_events
+from testing_support.validators.validate_error_event_attributes import validate_error_event_attributes
+from testing_support.fixtures import override_application_settings
 
 from newrelic.api.application import application_instance
 from newrelic.api.background_task import BackgroundTask
@@ -296,16 +299,27 @@ def test_Starting_transaction_tests():
 # Inbound distributed tracing tests
 @validate_transaction_metrics(name="Foo")
 @validate_span_events(count=0)
+@override_application_settings(
+    {
+        "trusted_account_key": "1",
+        "account_id": "1",
+    }
+)
 def test_Inbound_distributed_tracing_tests():
+    """
+    This test intends to check for a scenario where an external call
+    span is made outside the context of an existing transaction.
+    By flagging that span as not sampled in OTel, it means that the OTel
+    api will reflect that our agent is also ignoring that span.  In
+    this case, it will create the server transaction, but no spans.
+    """
     with tracer.start_as_current_span(name="Foo", kind=otel_api_trace.SpanKind.SERVER):
         carrier = {
             "traceparent": "00-da8bc8cc6d062849b0efcf3c169afb5a-7d3efb1b173fecfa-00",
-            "tracestate": "11159259@nr=0-0-1-12345678-7d3efb1b173fecfa-da8bc8cc6d062849-0-0.23456-1011121314151",   # REMOVE FROM HERE.
+            "tracestate": "1@nr=0-0-1-12345678-7d3efb1b173fecfa-da8bc8cc6d062849-0-0.23456-1011121314151",
         }
         PROPAGATOR.extract(carrier=carrier)
 
         current_span = otel_api_trace.get_current_span()
 
         assert current_span.get_span_context().trace_id == 0xda8bc8cc6d062849b0efcf3c169afb5a
-
-