opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-07-29 05:04:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring (#1169)

Browse Source 
* Minor refactoring across multiple instrumentation libraries

* Reformat using black

* Put span_kind back in aws_lambda

Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
This commit is contained in:
Artem Rys
2022-12-03 14:11:06 +01:00
committed by GitHub
parent 538c655830
commit 155fc46596
7 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py
View File

@ -287,9 +287,12 @@ def _instrument(
span_kind = None span_kind = None
try: try:
if lambda_event["Records"][0]["eventSource"] in set( if lambda_event["Records"][0]["eventSource"] in {
["aws:sqs", "aws:s3", "aws:sns", "aws:dynamodb"] "aws:sqs",
): "aws:s3",
"aws:sns",
"aws:dynamodb",
}:
# See more: # See more:
# https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html # https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html
# https://docs.aws.amazon.com/lambda/latest/dg/with-sns.html # https://docs.aws.amazon.com/lambda/latest/dg/with-sns.html

2
instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py
View File

@ -178,8 +178,6 @@ class BotoInstrumentor(BaseInstrumentor):
) )
def _patched_auth_request(self, original_func, instance, args, kwargs): def _patched_auth_request(self, original_func, instance, args, kwargs):
operation_name = None
frame = currentframe().f_back frame = currentframe().f_back
operation_name = None operation_name = None
while frame: while frame:

2
instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py
View File

@ -130,7 +130,7 @@ class ElasticsearchInstrumentor(BaseInstrumentor):
def _instrument(self, **kwargs): def _instrument(self, **kwargs):
""" """
Instruments elasticsearch module Instruments Elasticsearch module
""" """
tracer_provider = kwargs.get("tracer_provider") tracer_provider = kwargs.get("tracer_provider")
tracer = get_tracer(__name__, __version__, tracer_provider) tracer = get_tracer(__name__, __version__, tracer_provider)

1
instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py
View File

@ -266,7 +266,6 @@ _excluded_urls_from_env = get_excluded_urls("FLASK")
def get_default_span_name(): def get_default_span_name():
span_name = ""
try: try:
span_name = flask.request.url_rule.rule span_name = flask.request.url_rule.rule
except AttributeError: except AttributeError:

2
instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py
View File

@ -194,7 +194,7 @@ class CommandTracer(monitoring.CommandListener):
def _get_span_dict_key(event): def _get_span_dict_key(event):
if event.connection_id is not None: if event.connection_id is not None:
return (event.request_id, event.connection_id) return event.request_id, event.connection_id
return event.request_id return event.request_id

1
instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py
View File

@ -142,7 +142,6 @@ def _instrument(
): ):
def _traced_execute_command(func, instance, args, kwargs): def _traced_execute_command(func, instance, args, kwargs):
query = _format_command_args(args) query = _format_command_args(args)
name = ""
if len(args) > 0 and args[0]: if len(args) > 0 and args[0]:
name = args[0] name = args[0]
else: else:

2
instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py
View File

@ -78,7 +78,7 @@ from typing import Collection, Dict, Iterable, List, Optional
import psutil import psutil
# FIXME Remove this pyling disabling line when Github issue is cleared # FIXME Remove this pylint disabling line when Github issue is cleared
# pylint: disable=no-name-in-module # pylint: disable=no-name-in-module
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
from opentelemetry.instrumentation.system_metrics.package import _instruments from opentelemetry.instrumentation.system_metrics.package import _instruments