Merge pull request #31 from sourceplusplus/renovate/apache-skywalking-1.x

chore(deps): update dependency apache-skywalking to v1

Author: BFergerson

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install Python 3
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.11
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 python {
-    pip("apache-skywalking:0.8.0")
+    pip("apache-skywalking:1.0.0")
     pip("vertx-eventbus-client:1.0.0")    
 }
 

requirements.txt

@@ -1,5 +1,5 @@
 vertx-eventbus-client==1.0.0
-apache-skywalking==0.8.0
+apache-skywalking==1.0.0
 nopdb==0.2.0
 pyhumps==3.8.0
 PyYAML==6.0

setup.py

@@ -10,7 +10,7 @@
       license='Apache License, Version 2.0',
       packages=setuptools.find_packages(),
       install_requires=['vertx-eventbus-client==1.0.0',
-                        'apache-skywalking==0.8.0',
+                        'apache-skywalking==1.0.0',
                         'nopdb==0.2.0',
                         'pyhumps==3.7.2',
                         'PyYAML==6.0'])

sourceplusplus/SourcePlusPlus.py

@@ -102,13 +102,14 @@ def __init__(self, args: dict = None):
         self.instrument_remote = None
 
     def attach(self):
+        probe_config = self.probe_config
         config.init(
-            collector_address=self.probe_config["skywalking"]["collector"]["backend_service"],
-            service_name=self.probe_config["skywalking"]["agent"]["service_name"],
-            authentication=self.probe_config["skywalking"]["agent"].get("authentication"),
-            log_reporter_active=True,
-            force_tls=self.probe_config["spp"]["ssl_enabled"],
-            log_reporter_formatted=self.probe_config["skywalking"]["plugin"]["toolkit"]["log"]["transmit_formatted"]
+            agent_collector_backend_services=probe_config["skywalking"]["collector"]["backend_service"],
+            agent_name=probe_config["skywalking"]["agent"]["service_name"],
+            agent_authentication=probe_config["skywalking"]["agent"].get("authentication"),
+            agent_log_reporter_active=True,
+            agent_force_tls=probe_config["spp"]["ssl_enabled"],
+            agent_log_reporter_formatted=probe_config["skywalking"]["plugin"]["toolkit"]["log"]["transmit_formatted"]
         )
         agent.start()
 
@@ -141,8 +142,8 @@ def __send_connected(self, eb: EventBus):
             "language": "python",
             "probe_version": __version__,
             "python_version": sys.version,
-            "service": config.service_name,
-            "service_instance": config.service_instance
+            "service": config.agent_name,
+            "service_instance": config.agent_instance_name
         }
 
         # add hardcoded probe meta data (if present)

sourceplusplus/control/ContextReceiver.py

@@ -62,20 +62,20 @@ def apply_log(live_log_id, globals, locals):
     sw_context = get_context()
     log_data = LogData(
         timestamp=round(time.time() * 1000),
-        service=config.service_name,
-        serviceInstance=config.service_instance,
+        service=config.agent_name,
+        serviceInstance=config.agent_instance_name,
         body=LogDataBody(
             type='text',
             text=TextLog(text=live_log.log_format)
         ),
         traceContext=TraceContext(
             traceId=str(sw_context.segment.related_traces[0]),
             traceSegmentId=str(sw_context.segment.segment_id),
-            spanId=sw_context.active_span().sid if sw_context.active_span() else -1
+            spanId=sw_context.active_span.sid if sw_context.active_span else -1
         ),
         tags=log_tags,
     )
-    agent.archive_log(log_data)
+    agent.agent.archive_log(log_data)
 
     if live_log.is_finished():
         try: