-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* add traces context * add trace context section in readme * fix type * Update README.md * Update README.md * small fix to readme * fix typo Co-authored-by: Nico <86240618+nico-shishkin@users.noreply.github.com>
- Loading branch information
1 parent
f4713a6
commit 7e9a48f
Showing
5 changed files
with
139 additions
and
5 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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 |
---|---|---|
@@ -1 +1,3 @@ | ||
requests>=2.27.0 | ||
requests>=2.27.0 | ||
protobuf==3.20.1 | ||
opentelemetry-instrumentation-logging==0.32b0 |
This file contains 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
This file contains 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,80 @@ | ||
import fnmatch | ||
import logging.config | ||
import os | ||
import time | ||
import json | ||
from unittest import TestCase | ||
|
||
from .mockLogzioListener import listener | ||
|
||
|
||
def _find(pattern, path): | ||
result = [] | ||
for root, dirs, files in os.walk(path): | ||
for name in files: | ||
if fnmatch.fnmatch(name, pattern): | ||
result.append(os.path.join(root, name)) | ||
|
||
break # Not descending recursively | ||
return result | ||
|
||
|
||
class TestAddContext(TestCase): | ||
def setUp(self): | ||
self.logzio_listener = listener.MockLogzioListener() | ||
self.logzio_listener.clear_logs_buffer() | ||
self.logzio_listener.clear_server_error() | ||
self.logs_drain_timeout = 1 | ||
self.retries_no = 4 | ||
self.retry_timeout = 2 | ||
|
||
logging_configuration = { | ||
"version": 1, | ||
"formatters": { | ||
"logzio": { | ||
"format": '{"key": "value"}', | ||
"validate": False | ||
} | ||
}, | ||
"handlers": { | ||
"LogzioHandler": { | ||
"class": "logzio.handler.LogzioHandler", | ||
"formatter": "logzio", | ||
"level": "DEBUG", | ||
"token": "token", | ||
'logzio_type': "type", | ||
'logs_drain_timeout': self.logs_drain_timeout, | ||
'url': "http://" + self.logzio_listener.get_host() + ":" + str(self.logzio_listener.get_port()), | ||
'debug': True, | ||
'retries_no': self.retries_no, | ||
'retry_timeout': self.retry_timeout, | ||
'add_context': True | ||
} | ||
}, | ||
"loggers": { | ||
"test": { | ||
"handlers": ["LogzioHandler"], | ||
"level": "DEBUG" | ||
} | ||
} | ||
} | ||
|
||
logging.config.dictConfig(logging_configuration) | ||
self.logger = logging.getLogger('test') | ||
|
||
for curr_file in _find("logzio-failures-*.txt", "."): | ||
os.remove(curr_file) | ||
|
||
def test_add_context(self): | ||
log_message = "this log should have a trace context" | ||
self.logger.info(log_message) | ||
time.sleep(self.logs_drain_timeout * 2) | ||
logs_list = self.logzio_listener.logs_list | ||
for current_log in logs_list: | ||
if log_message in current_log: | ||
log_dict = json.loads(current_log) | ||
self.assertTrue('otelSpanID' in log_dict) | ||
self.assertTrue('otelTraceID' in log_dict) | ||
self.assertTrue('otelServiceName' in log_dict) | ||
|
||
|