Skip to content
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#3884](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3884))
- `opentelemetry-instrumentation-aiohttp-server`: add support for custom header captures via `OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST` and `OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE`
([#3916](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3916))
- Update for Log SDK breaking changes. Rename InMemoryLogExporter to InMemoryLogRecordExporter in several tests
([#3850](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3589))

### Fixed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from opentelemetry.metrics import get_meter_provider, set_meter_provider
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 @@ -114,7 +114,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 @@ -13,7 +13,7 @@
)
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
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
)
from opentelemetry.sdk._logs import LoggerProvider
from opentelemetry.sdk._logs.export import (
InMemoryLogExporter,
InMemoryLogRecordExporter,
SimpleLogRecordProcessor,
)
from opentelemetry.sdk.metrics import (
Expand All @@ -66,7 +66,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 @@ -14,7 +14,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 @@ -26,7 +26,7 @@
@pytest.mark.vcr()
def test_generate_content(
span_exporter: InMemorySpanExporter,
log_exporter: InMemoryLogExporter,
log_exporter: InMemoryLogRecordExporter,
generate_content: callable,
instrument_with_content: VertexAIInstrumentor,
):
Expand Down Expand Up @@ -94,7 +94,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: callable,
instrument_no_content: VertexAIInstrumentor,
):
Expand Down Expand Up @@ -242,7 +242,7 @@ def test_generate_content_invalid_temperature(

@pytest.mark.vcr()
def test_generate_content_invalid_role(
log_exporter: InMemoryLogExporter,
log_exporter: InMemoryLogRecordExporter,
generate_content: callable,
instrument_with_content: VertexAIInstrumentor,
):
Expand Down Expand Up @@ -335,7 +335,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: callable,
instrument_with_content: VertexAIInstrumentor,
):
Expand All @@ -353,7 +353,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: callable,
instrument_with_content: VertexAIInstrumentor,
):
Expand All @@ -371,7 +371,7 @@ def test_preview_generate_content_all_input_events(

def generate_content_all_input_events(
model: GenerativeModel | PreviewGenerativeModel,
log_exporter: InMemoryLogExporter,
log_exporter: InMemoryLogRecordExporter,
instrument_with_content: VertexAIInstrumentor,
):
model.generate_content(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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 @@ -27,7 +27,7 @@
@pytest.mark.vcr()
def test_generate_content_with_files(
span_exporter: InMemorySpanExporter,
log_exporter: InMemoryLogExporter,
log_exporter: InMemoryLogRecordExporter,
generate_content: callable,
instrument_with_experimental_semconvs: VertexAIInstrumentor,
):
Expand Down Expand Up @@ -113,7 +113,7 @@ def test_generate_content_with_files(
@pytest.mark.vcr()
def test_generate_content_without_events(
span_exporter: InMemorySpanExporter,
log_exporter: InMemoryLogExporter,
log_exporter: InMemoryLogRecordExporter,
generate_content: callable,
instrument_with_experimental_semconvs: VertexAIInstrumentor,
):
Expand Down Expand Up @@ -274,7 +274,7 @@ def test_generate_content_invalid_temperature(

@pytest.mark.vcr()
def test_generate_content_invalid_role(
log_exporter: InMemoryLogExporter,
log_exporter: InMemoryLogRecordExporter,
generate_content: callable,
instrument_with_experimental_semconvs: VertexAIInstrumentor,
):
Expand Down Expand Up @@ -371,7 +371,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: callable,
instrument_with_experimental_semconvs: VertexAIInstrumentor,
):
Expand All @@ -389,7 +389,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: callable,
instrument_with_experimental_semconvs: VertexAIInstrumentor,
):
Expand All @@ -407,7 +407,7 @@ def test_preview_generate_content_all_input_events(

def generate_content_all_input_events(
model: GenerativeModel | PreviewGenerativeModel,
log_exporter: InMemoryLogExporter,
log_exporter: InMemoryLogRecordExporter,
instrument_with_experimental_semconvs: VertexAIInstrumentor,
):
model.generate_content(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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 @@ -16,7 +16,7 @@
@pytest.mark.vcr()
def test_function_call_choice(
span_exporter: InMemorySpanExporter,
log_exporter: InMemoryLogExporter,
log_exporter: InMemoryLogRecordExporter,
instrument_with_content: VertexAIInstrumentor,
generate_content: callable,
):
Expand Down Expand Up @@ -96,7 +96,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,
generate_content: callable,
):
Expand Down Expand Up @@ -136,7 +136,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,
generate_content: callable,
):
Expand Down Expand Up @@ -228,7 +228,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,
generate_content: callable,
):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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 @@ -20,7 +20,7 @@

def test_function_call_choice(
span_exporter: InMemorySpanExporter,
log_exporter: InMemoryLogExporter,
log_exporter: InMemoryLogRecordExporter,
instrument_with_experimental_semconvs: VertexAIInstrumentor,
generate_content: callable,
):
Expand Down Expand Up @@ -92,7 +92,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_with_experimental_semconvs: VertexAIInstrumentor,
generate_content: callable,
):
Expand All @@ -117,7 +117,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_experimental_semconvs: VertexAIInstrumentor,
generate_content: callable,
):
Expand Down Expand Up @@ -216,7 +216,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_with_experimental_semconvs: VertexAIInstrumentor,
generate_content: callable,
):
Expand Down Expand Up @@ -261,7 +261,7 @@ def assert_fsspec_equal(path: str, value: Any) -> None:
@pytest.mark.vcr()
def test_tool_events_with_completion_hook(
span_exporter: InMemorySpanExporter,
log_exporter: InMemoryLogExporter,
log_exporter: InMemoryLogRecordExporter,
instrument_with_upload_hook: VertexAIInstrumentor,
generate_content: callable,
):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
)
from opentelemetry.sdk._logs import LoggerProvider
from opentelemetry.sdk._logs.export import (
InMemoryLogExporter,
InMemoryLogRecordExporter,
SimpleLogRecordProcessor,
)
from opentelemetry.sdk.metrics import (
Expand All @@ -37,7 +37,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