Add changelog, fix lint, fix ruff

Author: DylanRussell

CHANGELOG.md

@@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3567](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3567))
 - `opentelemetry-resource-detector-containerid`: make it more quiet on platforms without cgroups
   ([#3579](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3579))
+- `opentelemetry-instrumentation-botocore`: migrate off the deprecated events API to use the logs API
+  ([#3624](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3624))
 
 ### Added
 

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

@@ -199,9 +199,8 @@ def _get_logger(self, extension: _AwsSdkExtension):
         """This is a multiplexer in order to have a logger per extension"""
 
         instrumentation_name = self._get_instrumentation_name(extension)
-        logger = self._loggers.get(instrumentation_name)
-        if logger:
-            return logger
+        if self._loggers.get(instrumentation_name):
+            return self._loggers.get(instrumentation_name)
 
         schema_version = extension.event_logger_schema_version()
         self._loggers[instrumentation_name] = get_logger(
@@ -287,11 +286,10 @@ def _patched_api_call(self, original_func, instance, args, kwargs):
         end_span_on_exit = extension.should_end_span_on_exit()
 
         tracer = self._get_tracer(extension)
-        logger = self._get_logger(extension)
         meter = self._get_meter(extension)
         metrics = self._get_metrics(extension, meter)
         instrumentor_ctx = _BotocoreInstrumentorContext(
-            logger=logger,
+            logger=self._get_logger(extension),
             metrics=metrics,
         )
         with tracer.start_as_current_span(

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/bedrock_utils.py

@@ -21,9 +21,9 @@
 
 from botocore.eventstream import EventStream, EventStreamError
 from wrapt import ObjectProxy
-from opentelemetry.context import get_current
-from opentelemetry._logs import LogRecord
 
+from opentelemetry._logs import LogRecord
+from opentelemetry.context import get_current
 from opentelemetry.instrumentation.botocore.environment_variables import (
     OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT,
 )
@@ -512,14 +512,14 @@ def message_to_event(
                 event_name="gen_ai.tool.message",
                 attributes=attributes,
                 body=tool_body,
-                context = get_current(),
+                context=get_current(),
             )
 
     yield LogRecord(
         event_name=f"gen_ai.{role}.message",
         attributes=attributes,
         body=body if body else None,
-        context = get_current(),
+        context=get_current(),
     )
 
 
@@ -627,5 +627,5 @@ def to_choice_event(self, **event_kwargs) -> LogRecord:
             attributes=attributes,
             body=self._to_body_dict(),
             **event_kwargs,
-            context = get_current(),
+            context=get_current(),
         )

instrumentation/opentelemetry-instrumentation-botocore/tests/bedrock_utils.py

@@ -26,9 +26,6 @@
 )
 from opentelemetry.sdk.metrics._internal.point import ResourceMetrics
 from opentelemetry.sdk.trace import ReadableSpan
-from opentelemetry.semconv._incubating.attributes import (
-    event_attributes as EventAttributes,
-)
 from opentelemetry.semconv._incubating.attributes import (
     gen_ai_attributes as GenAIAttributes,
 )
@@ -282,7 +279,9 @@ def remove_none_values(body):
 
 def assert_log_parent(log, span):
     if span:
-        assert log.log_record.trace_id == span.get_span_context().trace_id, "{} does not equal {}".format(span.get_span_context().trace_id, log.log_record.trace_id)
+        assert (
+            log.log_record.trace_id == span.get_span_context().trace_id
+        ), f"{span.get_span_context().trace_id} does not equal {log.log_record.trace_id}"
         assert log.log_record.span_id == span.get_span_context().span_id
         assert (
             log.log_record.trace_flags == span.get_span_context().trace_flags

instrumentation/opentelemetry-instrumentation-botocore/tests/conftest.py

@@ -99,9 +99,7 @@ def vcr_config():
 
 
 @pytest.fixture(scope="function")
-def instrument_no_content(
-    tracer_provider, logger_provider, meter_provider
-):
+def instrument_no_content(tracer_provider, logger_provider, meter_provider):
     os.environ.update(
         {OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT: "False"}
     )
@@ -119,9 +117,7 @@ def instrument_no_content(
 
 
 @pytest.fixture(scope="function")
-def instrument_with_content(
-    tracer_provider, logger_provider, meter_provider
-):
+def instrument_with_content(tracer_provider, logger_provider, meter_provider):
     os.environ.update(
         {OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT: "True"}
     )