internal comments

Author: JWinermaSplunk

instrumentation/opentelemetry-instrumentation-structlog/pyproject.toml

@@ -23,10 +23,12 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-instrumentation == 0.62b0.dev",
+  "opentelemetry-semantic-conventions == 0.62b0.dev",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-structlog/src/opentelemetry/instrumentation/structlog/__init__.py

@@ -48,7 +48,7 @@
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.log_utils import std_to_otel
 from opentelemetry.instrumentation.structlog.package import _instruments
-from opentelemetry.semconv._incubating.attributes import (
+from opentelemetry.semconv.attributes import (
     exception_attributes,
 )
 
@@ -306,7 +306,18 @@ def _instrument(self, **kwargs):
         def _patched_configure(*args, **kwargs):
             # If the user is supplying a processors list, ensure our handler
             # is included before passing it to the original configure.
-            if "processors" in kwargs:
+            # processors may be passed as the first positional arg or as a kwarg.
+            if args:
+                processors = list(args[0])
+                if not any(
+                    isinstance(p, StructlogHandler) for p in processors
+                ):
+                    insert_position = max(len(processors) - 1, 0)
+                    processors.insert(
+                        insert_position, StructlogInstrumentor._processor
+                    )
+                args = (processors,) + args[1:]
+            elif "processors" in kwargs:
                 processors = list(kwargs["processors"])
                 if not any(
                     isinstance(p, StructlogHandler) for p in processors
@@ -318,7 +329,7 @@ def _patched_configure(*args, **kwargs):
                     kwargs["processors"] = processors
             original = StructlogInstrumentor._original_configure
             if original is not None:
-                original(*args, **kwargs)
+                return original(*args, **kwargs)
 
         structlog.configure = _patched_configure
 

instrumentation/opentelemetry-instrumentation-structlog/tests/test_structlog.py

@@ -28,7 +28,7 @@
     InMemoryLogRecordExporter,
     SimpleLogRecordProcessor,
 )
-from opentelemetry.semconv._incubating.attributes import exception_attributes
+from opentelemetry.semconv.attributes import exception_attributes
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import TraceFlags
 

tox.ini

@@ -195,7 +195,7 @@ envlist =
     lint-instrumentation-starlette
 
     ; opentelemetry-instrumentation-structlog
-    py3{9,10,11,12,13}-test-instrumentation-structlog
+    py3{9,10,11,12,13,14}-test-instrumentation-structlog
     pypy3-test-instrumentation-structlog
     lint-instrumentation-structlog