-
Notifications
You must be signed in to change notification settings - Fork 709
Implement events sdk #4176
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
Merged
Merged
Implement events sdk #4176
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
2fc9f64
sdk
lzchen 8775a0b
tests
lzchen b0d36a9
Update test_events.py
lzchen ed13d15
lint
lzchen 1b31dca
tests
lzchen 9ec06a5
Merge branch 'main' into event
tammy-baylis-swi 9511789
tests
lzchen 91c501b
Merge branch 'event' of https://github.com/lzchen/opentelemetry-pytho…
lzchen 989475c
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
lzchen 2ed192e
Update opentelemetry-sdk/src/opentelemetry/sdk/_events/__init__.py
xrmx a09fb2b
Update opentelemetry-sdk/src/opentelemetry/sdk/_events/__init__.py
xrmx 17bba30
Merge branch 'main' into event
xrmx b1a3c66
Update opentelemetry-sdk/src/opentelemetry/sdk/_events/__init__.py
xrmx 6a995c3
Update opentelemetry-sdk/tests/events/test_events.py
xrmx de50834
Update opentelemetry-sdk/tests/events/test_events.py
xrmx b01b81a
feedback
lzchen 6e206ff
Merge branch 'event' of https://github.com/lzchen/opentelemetry-pytho…
lzchen 88ea2fe
test
lzchen 6347b84
Update test_events.py
lzchen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
opentelemetry-sdk/src/opentelemetry/sdk/_events/__init__.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
# Copyright The OpenTelemetry Authors | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
import logging | ||
from time import time_ns | ||
from typing import Optional | ||
|
||
from opentelemetry import trace | ||
from opentelemetry._events import Event | ||
from opentelemetry._events import EventLogger as APIEventLogger | ||
from opentelemetry._events import EventLoggerProvider as APIEventLoggerProvider | ||
from opentelemetry._logs import NoOpLogger, SeverityNumber, get_logger_provider | ||
from opentelemetry.sdk._logs import Logger, LoggerProvider, LogRecord | ||
from opentelemetry.util.types import Attributes | ||
|
||
_logger = logging.getLogger(__name__) | ||
|
||
|
||
class EventLogger(APIEventLogger): | ||
def __init__( | ||
self, | ||
logger_provider: LoggerProvider, | ||
name: str, | ||
version: Optional[str] = None, | ||
schema_url: Optional[str] = None, | ||
attributes: Optional[Attributes] = None, | ||
): | ||
super().__init__( | ||
name=name, | ||
version=version, | ||
schema_url=schema_url, | ||
attributes=attributes, | ||
) | ||
self._logger: Logger = logger_provider.get_logger( | ||
name, version, schema_url, attributes | ||
) | ||
|
||
def emit(self, event: Event) -> None: | ||
if isinstance(self._logger, NoOpLogger): | ||
# Do nothing if SDK is disabled | ||
return | ||
span_context = trace.get_current_span().get_span_context() | ||
log_record = LogRecord( | ||
timestamp=event.timestamp or time_ns(), | ||
observed_timestamp=None, | ||
trace_id=event.trace_id or span_context.trace_id, | ||
span_id=event.span_id or span_context.span_id, | ||
trace_flags=event.trace_flags or span_context.trace_flags, | ||
severity_text=None, | ||
severity_number=event.severity_number or SeverityNumber.INFO, | ||
body=event.body, | ||
resource=getattr(self._logger, "resource", None), | ||
attributes=event.attributes, | ||
) | ||
self._logger.emit(log_record) | ||
|
||
|
||
class EventLoggerProvider(APIEventLoggerProvider): | ||
def __init__(self, logger_provider: Optional[LoggerProvider] = None): | ||
self._logger_provider = logger_provider or get_logger_provider() | ||
|
||
def get_event_logger( | ||
self, | ||
name: str, | ||
version: Optional[str] = None, | ||
schema_url: Optional[str] = None, | ||
attributes: Optional[Attributes] = None, | ||
) -> EventLogger: | ||
if not name: | ||
_logger.warning("EventLogger created with invalid name: %s", name) | ||
return EventLogger( | ||
self._logger_provider, name, version, schema_url, attributes | ||
) | ||
|
||
def shutdown(self): | ||
self._logger_provider.shutdown() | ||
|
||
def force_flush(self, timeout_millis: int = 30000) -> bool: | ||
self._logger_provider.force_flush(timeout_millis) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# Copyright The OpenTelemetry Authors | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,202 @@ | ||
# Copyright The OpenTelemetry Authors | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# pylint: disable=protected-access,no-self-use | ||
|
||
import unittest | ||
xrmx marked this conversation as resolved.
Show resolved
Hide resolved
|
||
from unittest.mock import Mock, patch | ||
|
||
from opentelemetry._events import Event | ||
from opentelemetry._logs import SeverityNumber, set_logger_provider | ||
from opentelemetry.sdk._events import EventLoggerProvider | ||
from opentelemetry.sdk._logs import LoggerProvider | ||
from opentelemetry.sdk._logs._internal import Logger, NoOpLogger | ||
from opentelemetry.sdk.environment_variables import OTEL_SDK_DISABLED | ||
|
||
|
||
class TestEventLoggerProvider(unittest.TestCase): | ||
lzchen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
def test_event_logger_provider(self): | ||
logger_provider = LoggerProvider() | ||
event_logger_provider = EventLoggerProvider( | ||
logger_provider=logger_provider | ||
) | ||
|
||
self.assertEqual( | ||
event_logger_provider._logger_provider, | ||
logger_provider, | ||
) | ||
|
||
def test_event_logger_provider_default(self): | ||
logger_provider = LoggerProvider() | ||
set_logger_provider(logger_provider) | ||
event_logger_provider = EventLoggerProvider() | ||
|
||
self.assertEqual( | ||
event_logger_provider._logger_provider, | ||
logger_provider, | ||
) | ||
|
||
def test_get_event_logger(self): | ||
logger_provider = LoggerProvider() | ||
event_logger = EventLoggerProvider(logger_provider).get_event_logger( | ||
"name", | ||
version="version", | ||
schema_url="schema_url", | ||
attributes={"key": "value"}, | ||
) | ||
self.assertTrue( | ||
event_logger._logger, | ||
Logger, | ||
) | ||
logger = event_logger._logger | ||
self.assertEqual(logger._instrumentation_scope.name, "name") | ||
self.assertEqual(logger._instrumentation_scope.version, "version") | ||
self.assertEqual( | ||
logger._instrumentation_scope.schema_url, "schema_url" | ||
) | ||
self.assertEqual( | ||
logger._instrumentation_scope.attributes, {"key": "value"} | ||
) | ||
|
||
@patch.dict("os.environ", {OTEL_SDK_DISABLED: "true"}) | ||
def test_get_event_logger_with_sdk_disabled(self): | ||
logger_provider = LoggerProvider() | ||
event_logger = EventLoggerProvider(logger_provider).get_event_logger( | ||
"name", | ||
version="version", | ||
schema_url="schema_url", | ||
attributes={"key": "value"}, | ||
) | ||
self.assertIsInstance(event_logger._logger, NoOpLogger) | ||
|
||
def test_force_flush(self): | ||
logger_provider = Mock() | ||
event_logger = EventLoggerProvider(logger_provider) | ||
event_logger.force_flush(1000) | ||
logger_provider.force_flush.assert_called_once_with(1000) | ||
|
||
def test_shutdown(self): | ||
logger_provider = Mock() | ||
event_logger = EventLoggerProvider(logger_provider) | ||
event_logger.shutdown() | ||
logger_provider.shutdown.assert_called_once() | ||
|
||
@patch("opentelemetry.sdk._logs._internal.LoggerProvider.get_logger") | ||
def test_event_logger(self, logger_mock): | ||
logger_provider = LoggerProvider() | ||
logger_mock_inst = Mock() | ||
logger_mock.return_value = logger_mock_inst | ||
EventLoggerProvider(logger_provider).get_event_logger( | ||
"name", | ||
version="version", | ||
schema_url="schema_url", | ||
attributes={"key": "value"}, | ||
) | ||
logger_mock.assert_called_once_with( | ||
"name", "version", "schema_url", {"key": "value"} | ||
) | ||
|
||
@patch("opentelemetry.sdk._events.LogRecord") | ||
@patch("opentelemetry.sdk._logs._internal.LoggerProvider.get_logger") | ||
def test_event_logger_emit(self, logger_mock, log_record_mock): | ||
logger_provider = LoggerProvider() | ||
logger_mock_inst = Mock() | ||
logger_mock.return_value = logger_mock_inst | ||
event_logger = EventLoggerProvider(logger_provider).get_event_logger( | ||
"name", | ||
version="version", | ||
schema_url="schema_url", | ||
attributes={"key": "value"}, | ||
) | ||
logger_mock.assert_called_once_with( | ||
"name", "version", "schema_url", {"key": "value"} | ||
) | ||
now = Mock() | ||
trace_id = Mock() | ||
span_id = Mock() | ||
trace_flags = Mock() | ||
event = Event( | ||
name="test_event", | ||
timestamp=now, | ||
trace_id=trace_id, | ||
span_id=span_id, | ||
trace_flags=trace_flags, | ||
body="test body", | ||
severity_number=SeverityNumber.ERROR, | ||
attributes={ | ||
"key": "val", | ||
"foo": "bar", | ||
"event.name": "not this one", | ||
}, | ||
) | ||
log_record_mock_inst = Mock() | ||
log_record_mock.return_value = log_record_mock_inst | ||
event_logger.emit(event) | ||
log_record_mock.assert_called_once_with( | ||
timestamp=now, | ||
observed_timestamp=None, | ||
trace_id=trace_id, | ||
span_id=span_id, | ||
trace_flags=trace_flags, | ||
severity_text=None, | ||
severity_number=SeverityNumber.ERROR, | ||
body="test body", | ||
resource=event_logger._logger.resource, | ||
attributes={ | ||
"key": "val", | ||
"foo": "bar", | ||
"event.name": "test_event", | ||
}, | ||
) | ||
logger_mock_inst.emit.assert_called_once_with(log_record_mock_inst) | ||
|
||
@patch("opentelemetry.sdk._events.LogRecord") | ||
@patch("opentelemetry.sdk._logs._internal.LoggerProvider.get_logger") | ||
def test_event_logger_emit_sdk_disabled( | ||
self, logger_mock, log_record_mock | ||
): | ||
logger_provider = LoggerProvider() | ||
logger_mock_inst = Mock(spec=NoOpLogger) | ||
logger_mock.return_value = logger_mock_inst | ||
event_logger = EventLoggerProvider(logger_provider).get_event_logger( | ||
"name", | ||
version="version", | ||
schema_url="schema_url", | ||
attributes={"key": "value"}, | ||
) | ||
logger_mock.assert_called_once_with( | ||
"name", "version", "schema_url", {"key": "value"} | ||
) | ||
now = Mock() | ||
trace_id = Mock() | ||
span_id = Mock() | ||
trace_flags = Mock() | ||
event = Event( | ||
name="test_event", | ||
timestamp=now, | ||
trace_id=trace_id, | ||
span_id=span_id, | ||
trace_flags=trace_flags, | ||
body="test body", | ||
severity_number=SeverityNumber.ERROR, | ||
attributes={ | ||
"key": "val", | ||
"foo": "bar", | ||
"event.name": "not this one", | ||
}, | ||
) | ||
log_record_mock_inst = Mock() | ||
log_record_mock.return_value = log_record_mock_inst | ||
event_logger.emit(event) | ||
logger_mock_inst.emit.assert_not_called() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.