Skip to content

Rename InMemoryLogExporter to InMemoryLogRecordExporter #3589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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,
):
Expand Down Expand Up @@ -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,
):
Expand Down Expand Up @@ -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,
):
Expand Down Expand Up @@ -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,
):
Expand All @@ -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,
):
Expand All @@ -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(
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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


Expand Down
Loading