Fix log creation issues related to updating the upstream sdk version (#683)

* Update to latest versions of upstream otel-python

* Adjust profile log emission and tests, collaboration with Codex

* formatting fix

* Instrumentation scope was not set correctly

Author: johnbley

pyproject.toml

@@ -23,14 +23,14 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
 dependencies = [
-  "opentelemetry-api==1.38.0",
-  "opentelemetry-sdk==1.38.0",
-  "opentelemetry-propagator-b3==1.38.0",
-  "opentelemetry-exporter-otlp-proto-grpc==1.38.0",
-  "opentelemetry-exporter-otlp-proto-http==1.38.0",
-  "opentelemetry-instrumentation==0.59b0",
-  "opentelemetry-instrumentation-system-metrics==0.59b0",
-  "opentelemetry-semantic-conventions==0.59b0",
+  "opentelemetry-api==1.39.1",
+  "opentelemetry-sdk==1.39.1",
+  "opentelemetry-propagator-b3==1.39.1",
+  "opentelemetry-exporter-otlp-proto-grpc==1.39.1",
+  "opentelemetry-exporter-otlp-proto-http==1.39.1",
+  "opentelemetry-instrumentation==0.60b1",
+  "opentelemetry-instrumentation-system-metrics==0.60b1",
+  "opentelemetry-semantic-conventions==0.60b1",
   "protobuf>=6.31.1", # not our direct dep, prevents installing vulnerable proto versions (CVE‑2025‑4565)
 ]
 

src/splunk_otel/profile.py

@@ -10,13 +10,18 @@
 
 import opentelemetry.context
 import wrapt
-from opentelemetry._logs import Logger, SeverityNumber, get_logger
+from opentelemetry._logs import Logger, LogRecord, SeverityNumber, get_logger
 from opentelemetry.context import Context
 from opentelemetry.instrumentation.version import __version__ as version
-from opentelemetry.sdk._logs import LogRecord
+from opentelemetry.sdk._logs import ReadWriteLogRecord
 from opentelemetry.sdk.environment_variables import OTEL_SERVICE_NAME
 from opentelemetry.sdk.resources import Resource
-from opentelemetry.trace import TraceFlags
+from opentelemetry.trace import (
+    NonRecordingSpan,
+    SpanContext,
+    TraceFlags,
+    set_span_in_context,
+)
 from opentelemetry.trace.propagation import _SPAN_KEY
 
 from splunk_otel import profile_pb2
@@ -178,21 +183,40 @@ def mk_log_record(self, stacktraces):
         pb_profile = _stacktraces_to_cpu_profile(stacktraces, self.thread_states, self.interval_millis, time_seconds)
         pb_profile_str = _pb_profile_to_str(pb_profile)
 
-        return LogRecord(
-            timestamp=int(time_seconds * 1e9),
+        span_context = SpanContext(
             trace_id=0,
             span_id=0,
+            is_remote=False,
             trace_flags=TraceFlags(0x01),
+        )
+        # Build an explicit Context so LogRecord doesn't fall back to the current span
+        # (trace_id/span_id=0 are falsy) and keeps the wire format unchanged.
+        log_context = set_span_in_context(
+            NonRecordingSpan(span_context),
+            Context(),
+        )
+        log_record = LogRecord(
+            timestamp=int(time_seconds * 1e9),
+            context=log_context,
             severity_number=SeverityNumber.UNSPECIFIED,
             body=pb_profile_str,
-            resource=self.resource,
             attributes={
                 "profiling.data.format": "pprof-gzip-base64",
                 "profiling.data.type": "cpu",
                 "com.splunk.sourcetype": "otel.profiling",
                 "profiling.data.total.frame.count": total_frame_count,
             },
         )
+        instrumentation_scope = getattr(
+            self.logger,
+            "_instrumentation_scope",
+            None,
+        )
+        return ReadWriteLogRecord(
+            log_record=log_record,
+            resource=self.resource,
+            instrumentation_scope=instrumentation_scope,
+        )
 
 
 def _pb_profile_to_str(pb_profile) -> str:

tests/test_profile.py

@@ -9,7 +9,15 @@
 import pytest
 from google.protobuf.json_format import MessageToDict
 from opentelemetry._logs import Logger
+from opentelemetry.context import attach, detach
 from opentelemetry.sdk.resources import Resource
+from opentelemetry.trace import (
+    NonRecordingSpan,
+    SpanContext,
+    TraceFlags,
+    get_current_span,
+    set_span_in_context,
+)
 from splunk_otel import profile_pb2
 from splunk_otel.profile import (
     _get_line,
@@ -83,13 +91,38 @@ def test_profile_scraper(stacktraces_fixture):
     )
     ps.tick()
 
-    log_record = logger.log_records[0]
+    log_record = logger.log_records[0].log_record
 
     assert log_record.timestamp == int(time_seconds * 1e9)
     assert len(MessageToDict(_pb_profile_from_str(log_record.body))) == 4  # sanity check
     assert log_record.attributes["profiling.data.total.frame.count"] == 30
 
 
+# The "override the current context" stuff for the log record is weird,
+# so test it more thorougly
+def test_profile_scraper_log_context_overrides_current_span():
+    logger = _FakeLogger()
+    ps = _ProfileScraper(Resource({}), {}, 100, logger, time_func=lambda: 1726760000)
+    span_context = SpanContext(
+        trace_id=1,
+        span_id=2,
+        is_remote=False,
+        trace_flags=TraceFlags(0x00),
+    )
+    token = attach(set_span_in_context(NonRecordingSpan(span_context)))
+    try:
+        log_record = ps.mk_log_record([])
+        # make sure that the fake log emission context set didn't affect "reality"
+        assert get_current_span().get_span_context().trace_id == 1
+    finally:
+        detach(token)
+
+    record = log_record.log_record
+    assert record.trace_id == 0
+    assert record.span_id == 0
+    assert record.trace_flags == TraceFlags(0x01)
+
+
 def _pb_profile_from_str(stringified: str) -> profile_pb2.Profile:
     byte_array = base64.b64decode(stringified)
     decompressed = gzip.decompress(byte_array)