diff --git a/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/otel_mocker.py b/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/otel_mocker.py index fd87d424d9..bd47dd7a9f 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/otel_mocker.py +++ b/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/otel_mocker.py @@ -26,7 +26,7 @@ from opentelemetry.sdk._events import EventLoggerProvider from opentelemetry.sdk._logs import LoggerProvider from opentelemetry.sdk._logs.export import ( - InMemoryLogExporter, + InMemoryLogRecordExporter, SimpleLogRecordProcessor, ) from opentelemetry.sdk.metrics import MeterProvider @@ -116,7 +116,7 @@ def data(self): class OTelMocker: def __init__(self): self._snapshot = None - self._logs = InMemoryLogExporter() + self._logs = InMemoryLogRecordExporter() self._traces = InMemorySpanExporter() self._metrics = InMemoryMetricReader() self._spans = [] diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/conftest.py b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/conftest.py index 87505046aa..c3350cc94c 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/conftest.py +++ b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/conftest.py @@ -14,7 +14,7 @@ from opentelemetry.sdk._events import EventLoggerProvider from opentelemetry.sdk._logs import LoggerProvider from opentelemetry.sdk._logs.export import ( - InMemoryLogExporter, + InMemoryLogRecordExporter, SimpleLogRecordProcessor, ) from opentelemetry.sdk.metrics import ( @@ -39,7 +39,7 @@ def fixture_span_exporter(): @pytest.fixture(scope="function", name="log_exporter") def fixture_log_exporter(): - exporter = InMemoryLogExporter() + exporter = InMemoryLogRecordExporter() yield exporter diff --git a/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/conftest.py b/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/conftest.py index fb0956f0b5..c3155d3c3e 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/conftest.py +++ b/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/conftest.py @@ -20,7 +20,7 @@ from opentelemetry.sdk._events import EventLoggerProvider from opentelemetry.sdk._logs import LoggerProvider from opentelemetry.sdk._logs.export import ( - InMemoryLogExporter, + InMemoryLogRecordExporter, SimpleLogRecordProcessor, ) from opentelemetry.sdk.metrics import ( @@ -46,7 +46,7 @@ def fixture_span_exporter(): @pytest.fixture(scope="function", name="log_exporter") def fixture_log_exporter(): - exporter = InMemoryLogExporter() + exporter = InMemoryLogRecordExporter() yield exporter diff --git a/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_chat_completions.py b/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_chat_completions.py index 0b80bcb745..3778b216af 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_chat_completions.py +++ b/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_chat_completions.py @@ -29,7 +29,7 @@ from opentelemetry.instrumentation.vertexai import VertexAIInstrumentor from opentelemetry.sdk._logs._internal.export.in_memory_log_exporter import ( - InMemoryLogExporter, + InMemoryLogRecordExporter, ) from opentelemetry.sdk.trace import ReadableSpan from opentelemetry.sdk.trace.export.in_memory_span_exporter import ( @@ -41,7 +41,7 @@ @pytest.mark.vcr def test_generate_content( span_exporter: InMemorySpanExporter, - log_exporter: InMemoryLogExporter, + log_exporter: InMemoryLogRecordExporter, generate_content: GenerateContentFixture, instrument_with_content: VertexAIInstrumentor, ): @@ -111,7 +111,7 @@ def test_generate_content( @pytest.mark.vcr def test_generate_content_without_events( span_exporter: InMemorySpanExporter, - log_exporter: InMemoryLogExporter, + log_exporter: InMemoryLogRecordExporter, generate_content: GenerateContentFixture, instrument_no_content: VertexAIInstrumentor, ): @@ -263,7 +263,7 @@ def test_generate_content_invalid_temperature( @pytest.mark.vcr def test_generate_content_invalid_role( - log_exporter: InMemoryLogExporter, + log_exporter: InMemoryLogRecordExporter, generate_content: GenerateContentFixture, instrument_with_content: VertexAIInstrumentor, ): @@ -355,7 +355,7 @@ def assert_span_error(span: ReadableSpan) -> None: @pytest.mark.vcr def test_generate_content_all_events( - log_exporter: InMemoryLogExporter, + log_exporter: InMemoryLogRecordExporter, generate_content: GenerateContentFixture, instrument_with_content: VertexAIInstrumentor, ): @@ -373,7 +373,7 @@ def test_generate_content_all_events( @pytest.mark.vcr def test_preview_generate_content_all_input_events( - log_exporter: InMemoryLogExporter, + log_exporter: InMemoryLogRecordExporter, generate_content: GenerateContentFixture, instrument_with_content: VertexAIInstrumentor, ): @@ -392,7 +392,7 @@ def test_preview_generate_content_all_input_events( def generate_content_all_input_events( model: GenerativeModel | PreviewGenerativeModel, generate_content: GenerateContentFixture, - log_exporter: InMemoryLogExporter, + log_exporter: InMemoryLogRecordExporter, ): model.generate_content( [ diff --git a/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_function_calling.py b/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_function_calling.py index cb8b6ab0df..bb4843a6b4 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_function_calling.py +++ b/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_function_calling.py @@ -9,7 +9,7 @@ from opentelemetry.instrumentation.vertexai import VertexAIInstrumentor from opentelemetry.sdk._logs._internal.export.in_memory_log_exporter import ( - InMemoryLogExporter, + InMemoryLogRecordExporter, ) from opentelemetry.sdk.trace.export.in_memory_span_exporter import ( InMemorySpanExporter, @@ -19,7 +19,7 @@ @pytest.mark.vcr def test_function_call_choice( span_exporter: InMemorySpanExporter, - log_exporter: InMemoryLogExporter, + log_exporter: InMemoryLogRecordExporter, instrument_with_content: VertexAIInstrumentor, ): ask_about_weather() @@ -102,7 +102,7 @@ def test_function_call_choice( @pytest.mark.vcr def test_function_call_choice_no_content( - log_exporter: InMemoryLogExporter, + log_exporter: InMemoryLogRecordExporter, instrument_no_content: VertexAIInstrumentor, ): ask_about_weather() @@ -145,7 +145,7 @@ def test_function_call_choice_no_content( @pytest.mark.vcr def test_tool_events( span_exporter: InMemorySpanExporter, - log_exporter: InMemoryLogExporter, + log_exporter: InMemoryLogRecordExporter, instrument_with_content: VertexAIInstrumentor, ): ask_about_weather_function_response() @@ -247,7 +247,7 @@ def test_tool_events( @pytest.mark.vcr def test_tool_events_no_content( span_exporter: InMemorySpanExporter, - log_exporter: InMemoryLogExporter, + log_exporter: InMemoryLogRecordExporter, instrument_no_content: VertexAIInstrumentor, ): ask_about_weather_function_response() diff --git a/instrumentation/opentelemetry-instrumentation-botocore/tests/conftest.py b/instrumentation/opentelemetry-instrumentation-botocore/tests/conftest.py index 0c3f98fe2f..9f07f8658a 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/tests/conftest.py +++ b/instrumentation/opentelemetry-instrumentation-botocore/tests/conftest.py @@ -14,7 +14,7 @@ from opentelemetry.sdk._events import EventLoggerProvider from opentelemetry.sdk._logs import LoggerProvider from opentelemetry.sdk._logs.export import ( - InMemoryLogExporter, + InMemoryLogRecordExporter, SimpleLogRecordProcessor, ) from opentelemetry.sdk.metrics import ( @@ -38,7 +38,7 @@ def fixture_span_exporter(): @pytest.fixture(scope="function", name="log_exporter") def fixture_log_exporter(): - exporter = InMemoryLogExporter() + exporter = InMemoryLogRecordExporter() yield exporter