chore: use get_tracer() for all tracer access

Signed-off-by: Cagri Yonca <[email protected]>

Author: CagriYonca

example/autoprofile/app.py

@@ -7,10 +7,11 @@
 import sys
 import os
 
-sys.path.append('../..')
-os.environ['INSTANA_DEBUG'] = 'yes'
-os.environ['INSTANA_AUTOPROFILE'] = 'yes'
-import instana
+sys.path.append("../..")
+os.environ["INSTANA_DEBUG"] = "yes"
+os.environ["INSTANA_AUTOPROFILE"] = "yes"
+import instana  # noqa: F401
+
 
 # Simulate CPU intensive work
 def simulate_cpu():
@@ -27,14 +28,15 @@ def simulate_mem_leak():
         for j in range(0, 1800):
             mem2 = []
             for i in range(0, 1000):
-                obj1 = {'v': random.randint(0, 1000000)}
+                obj1 = {"v": random.randint(0, 1000000)}
                 mem1.append(obj1)
 
-                obj2 = {'v': random.randint(0, 1000000)}
+                obj2 = {"v": random.randint(0, 1000000)}
                 mem2.append(obj2)
 
             time.sleep(1)
 
+
 threading.Thread(target=simulate_mem_leak).start()
 
 
@@ -48,13 +50,14 @@ def lock_wait():
 
     while True:
         lock.acquire()
-    
+
         threading.Thread(target=lock_wait).start()
 
         time.sleep(1)
         lock.release()
         time.sleep(1)
 
+
 threading.Thread(target=simulate_lock).start()
 
 

example/carry_context.py

@@ -11,10 +11,13 @@
 import uvloop
 import aiohttp
 
-from instana.singletons import tracer, async_tracer
+from instana.singletons import get_tracer
 
 uvloop.install()
 
+tracer = get_tracer()
+
+
 async def launch_async_calls(parent_span):
     """
     Method to launch a series (1 currently) of asynchronous http calls
@@ -24,24 +27,24 @@ async def launch_async_calls(parent_span):
 
     # Now that we are inside of the event loop, first thing to do is to initialize
     # the tracing context using <parent_span> _and_ the asynchronous tracer <async_tracer>
-    with async_tracer.start_active_span('launch_async_calls', child_of=parent_span):
+    with async_tracer.start_active_span("launch_async_calls", child_of=parent_span):  # noqa: F821
         async with aiohttp.ClientSession() as session:
             session.get("http://127.0.0.1/api/v2/endpoint/1")
             session.get("http://127.0.0.1/api/v2/endpoint/2")
             session.get("http://127.0.0.1/api/v2/endpoint/3")
 
+
 #
 # Synchronous application code such as from inside a Django or Flask handler
 #
 
 # Start an ENTRY span in our synchronous execution scope
 with tracer.start_active_span("launch_uvloop") as sync_scope:
-    sync_scope.span.set_tag('span.kind', 'entry')
+    sync_scope.span.set_tag("span.kind", "entry")
 
     # You can also retrieve the currently active span with:
     # tracer.active_span
 
     # Launch our requests asynchronously
     # Enter the event loop and pass in the parent tracing context (sync_scope) manually
     asyncio.run(launch_async_calls(sync_scope.span))
-

src/instana/agent/aws_eks_fargate.py

@@ -4,8 +4,7 @@
 The Instana agent (for AWS EKS Fargate) that manages
 monitoring state and reporting that data.
 """
-import os
-import time
+
 from instana.options import EKSFargateOptions
 from instana.collector.aws_eks_fargate import EKSFargateCollector
 from instana.collector.helpers.eks.process import get_pod_name
@@ -16,7 +15,8 @@
 
 
 class EKSFargateAgent(BaseAgent):
-    """ In-process agent for AWS Fargate """
+    """In-process agent for AWS Fargate"""
+
     def __init__(self):
         super(EKSFargateAgent, self).__init__()
 
@@ -29,15 +29,20 @@ def __init__(self):
         # Update log level (if INSTANA_LOG_LEVEL was set)
         self.update_log_level()
 
-        logger.info("Stan is on the EKS Pod on AWS Fargate scene.  Starting Instana instrumentation version: %s", VERSION)
+        logger.info(
+            "Stan is on the EKS Pod on AWS Fargate scene.  Starting Instana instrumentation version: %s",
+            VERSION,
+        )
 
         if self._validate_options():
             self._can_send = True
             self.collector = EKSFargateCollector(self)
             self.collector.start()
         else:
-            logger.warning("Required INSTANA_AGENT_KEY and/or INSTANA_ENDPOINT_URL environment variables not set.  "
-                           "We will not be able to monitor this Pod.")
+            logger.warning(
+                "Required INSTANA_AGENT_KEY and/or INSTANA_ENDPOINT_URL environment variables not set.  "
+                "We will not be able to monitor this Pod."
+            )
 
     def can_send(self):
         """
@@ -52,7 +57,7 @@ def get_from_structure(self):
         @return: dict()
         """
 
-        return {'hl': True, 'cp': 'k8s', 'e': self.podname}
+        return {"hl": True, "cp": "k8s", "e": self.podname}
 
     def report_data_payload(self, payload):
         """
@@ -67,15 +72,20 @@ def report_data_payload(self, payload):
                 self.report_headers["X-Instana-Host"] = self.podname
                 self.report_headers["X-Instana-Key"] = self.options.agent_key
 
-            response = self.client.post(self.__data_bundle_url(),
-                                        data=to_json(payload),
-                                        headers=self.report_headers,
-                                        timeout=self.options.timeout,
-                                        verify=self.options.ssl_verify,
-                                        proxies=self.options.endpoint_proxy)
+            response = self.client.post(
+                self.__data_bundle_url(),
+                data=to_json(payload),
+                headers=self.report_headers,
+                timeout=self.options.timeout,
+                verify=self.options.ssl_verify,
+                proxies=self.options.endpoint_proxy,
+            )
 
             if not 200 <= response.status_code < 300:
-                logger.info("report_data_payload: Instana responded with status code %s", response.status_code)
+                logger.info(
+                    "report_data_payload: Instana responded with status code %s",
+                    response.status_code,
+                )
         except Exception as exc:
             logger.debug("report_data_payload: connection error (%s)", type(exc))
         return response
@@ -84,7 +94,9 @@ def _validate_options(self):
         """
         Validate that the options used by this Agent are valid.  e.g. can we report data?
         """
-        return self.options.endpoint_url is not None and self.options.agent_key is not None
+        return (
+            self.options.endpoint_url is not None and self.options.agent_key is not None
+        )
 
     def __data_bundle_url(self):
         """

src/instana/agent/aws_fargate.py

@@ -5,7 +5,7 @@
 The Instana agent (for AWS Fargate) that manages
 monitoring state and reporting that data.
 """
-import time
+
 from instana.options import AWSFargateOptions
 from instana.collector.aws_fargate import AWSFargateCollector
 from ..log import logger
@@ -15,7 +15,8 @@
 
 
 class AWSFargateAgent(BaseAgent):
-    """ In-process agent for AWS Fargate """
+    """In-process agent for AWS Fargate"""
+
     def __init__(self):
         super(AWSFargateAgent, self).__init__()
 
@@ -27,15 +28,20 @@ def __init__(self):
         # Update log level (if INSTANA_LOG_LEVEL was set)
         self.update_log_level()
 
-        logger.info("Stan is on the AWS Fargate scene.  Starting Instana instrumentation version: %s", VERSION)
+        logger.info(
+            "Stan is on the AWS Fargate scene.  Starting Instana instrumentation version: %s",
+            VERSION,
+        )
 
         if self._validate_options():
             self._can_send = True
             self.collector = AWSFargateCollector(self)
             self.collector.start()
         else:
-            logger.warning("Required INSTANA_AGENT_KEY and/or INSTANA_ENDPOINT_URL environment variables not set.  "
-                           "We will not be able monitor this AWS Fargate cluster.")
+            logger.warning(
+                "Required INSTANA_AGENT_KEY and/or INSTANA_ENDPOINT_URL environment variables not set.  "
+                "We will not be able monitor this AWS Fargate cluster."
+            )
 
     def can_send(self):
         """
@@ -49,7 +55,7 @@ def get_from_structure(self):
         Retrieves the From data that is reported alongside monitoring data.
         @return: dict()
         """
-        return {'hl': True, 'cp': 'aws', 'e': self.collector.get_fq_arn()}
+        return {"hl": True, "cp": "aws", "e": self.collector.get_fq_arn()}
 
     def report_data_payload(self, payload):
         """
@@ -64,15 +70,20 @@ def report_data_payload(self, payload):
                 self.report_headers["X-Instana-Host"] = self.collector.get_fq_arn()
                 self.report_headers["X-Instana-Key"] = self.options.agent_key
 
-            response = self.client.post(self.__data_bundle_url(),
-                                        data=to_json(payload),
-                                        headers=self.report_headers,
-                                        timeout=self.options.timeout,
-                                        verify=self.options.ssl_verify,
-                                        proxies=self.options.endpoint_proxy)
+            response = self.client.post(
+                self.__data_bundle_url(),
+                data=to_json(payload),
+                headers=self.report_headers,
+                timeout=self.options.timeout,
+                verify=self.options.ssl_verify,
+                proxies=self.options.endpoint_proxy,
+            )
 
             if not 200 <= response.status_code < 300:
-                logger.info("report_data_payload: Instana responded with status code %s", response.status_code)
+                logger.info(
+                    "report_data_payload: Instana responded with status code %s",
+                    response.status_code,
+                )
         except Exception as exc:
             logger.debug("report_data_payload: connection error (%s)", type(exc))
         return response
@@ -81,7 +92,9 @@ def _validate_options(self):
         """
         Validate that the options used by this Agent are valid.  e.g. can we report data?
         """
-        return self.options.endpoint_url is not None and self.options.agent_key is not None
+        return (
+            self.options.endpoint_url is not None and self.options.agent_key is not None
+        )
 
     def __data_bundle_url(self):
         """

src/instana/agent/google_cloud_run.py

@@ -5,7 +5,7 @@
 The Instana agent (for GCR) that manages
 monitoring state and reporting that data.
 """
-import time
+
 from instana.options import GCROptions
 from instana.collector.google_cloud_run import GCRCollector
 from instana.log import logger
@@ -15,7 +15,7 @@
 
 
 class GCRAgent(BaseAgent):
-    """ In-process agent for Google Cloud Run """
+    """In-process agent for Google Cloud Run"""
 
     def __init__(self, service, configuration, revision):
         super(GCRAgent, self).__init__()
@@ -28,15 +28,20 @@ def __init__(self, service, configuration, revision):
         # Update log level (if INSTANA_LOG_LEVEL was set)
         self.update_log_level()
 
-        logger.info("Stan is on the AWS Fargate scene.  Starting Instana instrumentation version: %s", VERSION)
+        logger.info(
+            "Stan is on the AWS Fargate scene.  Starting Instana instrumentation version: %s",
+            VERSION,
+        )
 
         if self._validate_options():
             self._can_send = True
             self.collector = GCRCollector(self, service, configuration, revision)
             self.collector.start()
         else:
-            logger.warning("Required INSTANA_AGENT_KEY and/or INSTANA_ENDPOINT_URL environment variables not set.  "
-                           "We will not be able monitor this GCR cluster.")
+            logger.warning(
+                "Required INSTANA_AGENT_KEY and/or INSTANA_ENDPOINT_URL environment variables not set.  "
+                "We will not be able monitor this GCR cluster."
+            )
 
     def can_send(self):
         """
@@ -50,7 +55,7 @@ def get_from_structure(self):
         Retrieves the From data that is reported alongside monitoring data.
         @return: dict()
         """
-        return {'hl': True, 'cp': 'gcp', 'e': self.collector.get_instance_id()}
+        return {"hl": True, "cp": "gcp", "e": self.collector.get_instance_id()}
 
     def report_data_payload(self, payload):
         """
@@ -63,19 +68,25 @@ def report_data_payload(self, payload):
                 self.report_headers = {
                     "Content-Type": "application/json",
                     "X-Instana-Host": "gcp:cloud-run:revision:{revision}".format(
-                        revision=self.collector.revision),
-                    "X-Instana-Key": self.options.agent_key
+                        revision=self.collector.revision
+                    ),
+                    "X-Instana-Key": self.options.agent_key,
                 }
 
-            response = self.client.post(self.__data_bundle_url(),
-                                        data=to_json(payload),
-                                        headers=self.report_headers,
-                                        timeout=self.options.timeout,
-                                        verify=self.options.ssl_verify,
-                                        proxies=self.options.endpoint_proxy)
+            response = self.client.post(
+                self.__data_bundle_url(),
+                data=to_json(payload),
+                headers=self.report_headers,
+                timeout=self.options.timeout,
+                verify=self.options.ssl_verify,
+                proxies=self.options.endpoint_proxy,
+            )
 
             if response.status_code >= 400:
-                logger.info("report_data_payload: Instana responded with status code %s", response.status_code)
+                logger.info(
+                    "report_data_payload: Instana responded with status code %s",
+                    response.status_code,
+                )
         except Exception as exc:
             logger.debug("report_data_payload: connection error (%s)", type(exc))
         return response
@@ -84,7 +95,9 @@ def _validate_options(self):
         """
         Validate that the options used by this Agent are valid.  e.g. can we report data?
         """
-        return self.options.endpoint_url is not None and self.options.agent_key is not None
+        return (
+            self.options.endpoint_url is not None and self.options.agent_key is not None
+        )
 
     def __data_bundle_url(self):
         """

src/instana/collector/utils.py

@@ -6,6 +6,7 @@
 from opentelemetry.trace import SpanKind
 
 from instana.util.ids import hex_id
+
 if TYPE_CHECKING:
     from instana.span.base_span import BaseSpan
 
@@ -25,6 +26,6 @@ def format_span(
         span.p = format_span_id(span.p) if span.p else None
         span.lt = hex_id(span.lt) if hasattr(span, "lt") else None
         if isinstance(span.k, SpanKind):
-            span.k = span.k.value if not span.k is SpanKind.INTERNAL else 3
+            span.k = span.k.value if span.k is not SpanKind.INTERNAL else 3
         spans.append(span)
     return spans