Fix cherry picking issues

Author: lrafeei

newrelic/api/opentelemetry.py

@@ -31,6 +31,8 @@
     record_dimensional_metric,
     Sentinel,
 )
+from newrelic.core.otlp_utils import create_resource
+
 
 # Attributes that help distinguish span types are
 # sometimes added after span creation and sometimes
@@ -394,7 +396,7 @@ def start_span(
                         destination_name=name,
                         application=self.nr_application,
                         transport_type=self.instrumentation_library,
-                        headers=_headers,
+                        headers=headers,
                     )
                 else:
                     transaction = BackgroundTask(
@@ -470,7 +472,7 @@ def start_span(
                             destination_name=name,
                             application=self.nr_application,
                             transport_type=self.instrumentation_library,
-                            headers=_headers,
+                            headers=headers,
                         )
                     else:
                         transaction = BackgroundTask(

newrelic/config.py

@@ -683,6 +683,7 @@ def _process_configuration(section):
     _process_setting(section, "instrumentation.middleware.django.enabled", "getboolean", None)
     _process_setting(section, "instrumentation.middleware.django.exclude", "get", _map_inc_excl_middleware)
     _process_setting(section, "instrumentation.middleware.django.include", "get", _map_inc_excl_middleware)
+    _process_setting(section, "otel_bridge.enabled", "getboolean", None)
 
 
 # Loading of configuration from specified file and for specified
@@ -4359,6 +4360,19 @@ def _process_module_builtin_defaults():
         "pyzeebe.worker.job_executor", "newrelic.hooks.external_pyzeebe", "instrument_pyzeebe_worker_job_executor"
     )
 
+    # Hybrid Agent Hooks
+    _process_module_definition(
+        "opentelemetry.trace",
+        "newrelic.hooks.hybridagent_opentelemetry",
+        "instrument_trace_api",
+    )
+     
+    _process_module_definition(
+        "opentelemetry.instrumentation.utils",
+        "newrelic.hooks.hybridagent_opentelemetry",
+        "instrument_utils",
+    )
+
 
 def _process_module_entry_points():
     try:

newrelic/core/config.py

@@ -516,6 +516,9 @@ class EventHarvestConfigHarvestLimitSettings(Settings):
     nested = True
 
 
+class OtelBridgeSettings(Settings):
+    pass
+
 _settings = TopLevelSettings()
 _settings.agent_limits = AgentLimitsSettings()
 _settings.application_logging = ApplicationLoggingSettings()
@@ -592,6 +595,7 @@ class EventHarvestConfigHarvestLimitSettings(Settings):
 _settings.instrumentation.middleware = InstrumentationMiddlewareSettings()
 _settings.instrumentation.middleware.django = InstrumentationDjangoMiddlewareSettings()
 _settings.message_tracer = MessageTracerSettings()
+_settings.otel_bridge = OtelBridgeSettings()
 _settings.process_host = ProcessHostSettings()
 _settings.rum = RumSettings()
 _settings.serverless_mode = ServerlessModeSettings()
@@ -1223,6 +1227,9 @@ def default_otlp_host(host):
 _settings.azure_operator.enabled = _environ_as_bool("NEW_RELIC_AZURE_OPERATOR_ENABLED", default=False)
 _settings.package_reporting.enabled = _environ_as_bool("NEW_RELIC_PACKAGE_REPORTING_ENABLED", default=True)
 _settings.ml_insights_events.enabled = _environ_as_bool("NEW_RELIC_ML_INSIGHTS_EVENTS_ENABLED", default=False)
+_settings.otel_bridge.enabled = _environ_as_bool(
+    "NEW_RELIC_OTEL_BRIDGE_ENABLED", default=False
+)
 
 
 def global_settings():

newrelic/core/otlp_utils.py

@@ -116,8 +116,9 @@ def create_key_values_from_iterable(iterable):
     return list(filter(lambda i: i is not None, (create_key_value(key, value) for key, value in iterable)))
 
 
-def create_resource(attributes=None, attach_apm_entity=True):
-    attributes = attributes or {"instrumentation.provider": "newrelic-opentelemetry-python-ml"}
+def create_resource(attributes=None, attach_apm_entity=True, hybrid_bridge=False):
+    instrumentation_provider = "newrelic-opentelemetry-bridge" if hybrid_bridge else "newrelic-opentelemetry-python-ml"
+    attributes = attributes or {"instrumentation.provider": instrumentation_provider}
     if attach_apm_entity:
         metadata = get_service_linking_metadata()
         attributes.update(metadata)