Fix: Non-global skywalking logging

skywalking/agent/__init__.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-import logging
+from skywalking.loggings import logger
 from queue import Queue
 from threading import Thread, Event
 from typing import TYPE_CHECKING
@@ -26,8 +26,6 @@
 if TYPE_CHECKING:
     from skywalking.trace.context import Segment
 
-logger = logging.getLogger(__name__)
-
 
 def __heartbeat():
     while not __finished.is_set():

skywalking/agent/protocol/grpc.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-import logging
+from skywalking.loggings import logger
 import traceback
 from queue import Queue
 
@@ -29,8 +29,6 @@
 from skywalking.protocol.language_agent.Tracing_pb2 import SegmentObject, SpanObject, Log, SegmentReference
 from skywalking.trace.segment import Segment
 
-logger = logging.getLogger(__name__)
-
 
 class GrpcProtocol(Protocol):
     def __init__(self):

skywalking/agent/protocol/http.py

@@ -15,15 +15,13 @@
 # limitations under the License.
 #
 
-import logging
+from skywalking.loggings import logger
 from queue import Queue
 
 from skywalking.agent import Protocol
 from skywalking.client.http import HttpServiceManagementClient, HttpTraceSegmentReportService
 from skywalking.trace.segment import Segment
 
-logger = logging.getLogger(__name__)
-
 
 class HttpProtocol(Protocol):
     def __init__(self):

skywalking/agent/protocol/kafka.py

@@ -16,6 +16,7 @@
 #
 
 import logging
+from skywalking.loggings import logger, getLogger
 from queue import Queue
 
 from skywalking import config
@@ -25,11 +26,9 @@
 from skywalking.protocol.language_agent.Tracing_pb2 import SegmentObject, SpanObject, Log, SegmentReference
 from skywalking.trace.segment import Segment
 
-logger = logging.getLogger(__name__)
-
 # avoid too many kafka logs
-logger_kafka = logging.getLogger('kafka')
-logger_kafka.setLevel(logging.WARN)
+logger_kafka = getLogger('kafka')
+logger_kafka.setLevel(max(logging.WARN, logger.level))
 
 
 class KafkaProtocol(Protocol):

skywalking/client/grpc.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-import logging
+from skywalking.loggings import logger
 
 import grpc
 
@@ -26,8 +26,6 @@
 from skywalking.protocol.management.Management_pb2 import InstancePingPkg, InstanceProperties
 from skywalking.protocol.management.Management_pb2_grpc import ManagementServiceStub
 
-logger = logging.getLogger(__name__)
-
 
 class GrpcServiceManagementClient(ServiceManagementClient):
     def __init__(self, channel: grpc.Channel):

skywalking/client/http.py

@@ -15,15 +15,13 @@
 # limitations under the License.
 #
 
-import logging
+from skywalking.loggings import logger
 
 import requests
 
 from skywalking import config
 from skywalking.client import ServiceManagementClient, TraceSegmentReportService
 
-logger = logging.getLogger(__name__)
-
 
 class HttpServiceManagementClient(ServiceManagementClient):
     def __init__(self):

skywalking/client/kafka.py

@@ -17,7 +17,7 @@
 
 import os
 import ast
-import logging
+from skywalking.loggings import logger
 
 from skywalking import config
 from skywalking.client import ServiceManagementClient, TraceSegmentReportService
@@ -26,8 +26,6 @@
 
 from kafka import KafkaProducer
 
-logger = logging.getLogger(__name__)
-
 kafka_configs = {}
 
 

skywalking/loggings.py

@@ -20,8 +20,19 @@
 from skywalking import config
 
 
+def getLogger(name=None):
+    logger = logging.getLogger(name)
+    ch = logging.StreamHandler()
+    formatter = logging.Formatter('%(name)-32s [%(threadName)-15s] [%(levelname)-8s] %(message)s')
+    ch.setFormatter(formatter)
+    logger.addHandler(ch)
+
+    return logger
+
+
+logger = getLogger('skywalking')
+
+
 def init():
-    logging.basicConfig(
-        level=logging.getLevelName(config.logging_level),
-        format='%(name)-32s [%(threadName)-15s] [%(levelname)-8s] %(message)s',
-    )
+    logging.addLevelName(logging.CRITICAL + 10, 'OFF')
+    logger.setLevel(logging.getLevelName(config.logging_level))

skywalking/plugins/__init__.py

@@ -16,6 +16,7 @@
 #
 import inspect
 import logging
+from skywalking.loggings import logger
 import pkgutil
 import re
 import traceback
@@ -28,8 +29,6 @@
 
 import skywalking
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     disable_patterns = config.disable_plugins

skywalking/plugins/sw_django.py

@@ -14,16 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import logging
 
 from skywalking import Layer, Component, config
 from skywalking.trace import tags
 from skywalking.trace.carrier import Carrier
 from skywalking.trace.context import get_context
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 version_rule = {
     "name": "django",
     "rules": [">=2.0"]

skywalking/plugins/sw_elasticsearch.py

@@ -14,15 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import logging
 
 from skywalking import Layer, Component, config
 from skywalking.trace import tags
 from skywalking.trace.context import get_context
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     from elasticsearch import Transport

skywalking/plugins/sw_flask.py

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import logging
 
 from skywalking import Layer, Component, config
 from skywalking.trace import tags
@@ -23,8 +22,6 @@
 from skywalking.trace.span import NoopSpan
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     from flask import Flask

skywalking/plugins/sw_http_server.py

@@ -14,17 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 import inspect
-import logging
 
 from skywalking import Layer, Component
 from skywalking.trace import tags
 from skywalking.trace.carrier import Carrier
 from skywalking.trace.context import get_context
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     from http.server import BaseHTTPRequestHandler

skywalking/plugins/sw_kafka.py

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import logging
 
 from skywalking import config
 from skywalking import Layer, Component
@@ -23,8 +22,6 @@
 from skywalking.trace.context import get_context
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     from kafka import KafkaProducer

skywalking/plugins/sw_pymongo.py

@@ -15,16 +15,12 @@
 # limitations under the License.
 #
 
-import logging
-
 from skywalking import Layer, Component, config
 from skywalking.trace import tags
 from skywalking.trace.carrier import Carrier
 from skywalking.trace.context import get_context
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 version_rule = {
     "name": "pymongo",
     "rules": [">=3.7.0"]

skywalking/plugins/sw_pymysql.py

@@ -14,15 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import logging
+
 from skywalking import Layer, Component, config
 from skywalking.trace import tags
 from skywalking.trace.carrier import Carrier
 from skywalking.trace.context import get_context
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     from pymysql.cursors import Cursor

skywalking/plugins/sw_rabbitmq.py

@@ -14,16 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import logging
 
 from skywalking import Layer, Component
 from skywalking.trace import tags
 from skywalking.trace.carrier import Carrier
 from skywalking.trace.context import get_context
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     from pika.channel import Channel

skywalking/plugins/sw_redis.py

@@ -14,15 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import logging
 
 from skywalking import Layer, Component
 from skywalking.trace import tags
 from skywalking.trace.context import get_context
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     from redis.connection import Connection

skywalking/plugins/sw_requests.py

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import logging
 
 from skywalking import Layer, Component
 from skywalking.trace import tags
@@ -23,8 +22,6 @@
 from skywalking.trace.tags import Tag
 from skywalking import config
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     from requests import Session

skywalking/plugins/sw_tornado.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import logging
+
 from inspect import iscoroutinefunction, isawaitable
 
 from skywalking import Layer, Component
@@ -23,8 +23,6 @@
 from skywalking.trace.context import get_context
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     from tornado.web import RequestHandler

skywalking/plugins/sw_urllib3.py

@@ -15,16 +15,12 @@
 # limitations under the License.
 #
 
-import logging
-
 from skywalking import Layer, Component
 from skywalking.trace import tags
 from skywalking.trace.carrier import Carrier
 from skywalking.trace.context import get_context
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     from urllib3.request import RequestMethods

skywalking/plugins/sw_urllib_request.py

@@ -15,7 +15,6 @@
 # limitations under the License.
 #
 
-import logging
 from urllib.request import Request
 
 from skywalking import Layer, Component
@@ -24,8 +23,6 @@
 from skywalking.trace.context import get_context
 from skywalking.trace.tags import Tag
 
-logger = logging.getLogger(__name__)
-
 
 def install():
     import socket