Merge branch 'master' into live-meter

Author: BFergerson

.github/workflows/e2e.yml

@@ -24,9 +24,9 @@ jobs:
       - uses: actions/checkout@v2
       - run: |
           PROBE_VERSION="$(python setup.py --version)"
-          echo "PROBE_VERSION=$PROBE_VERSION" >> $GITHUB_ENV
+          echo "SPP_PROBE_VERSION=$PROBE_VERSION" >> $GITHUB_ENV
       - run: python setup.py sdist
-      - run: cp dist/sourceplusplus-${{ env.PROBE_VERSION }}.tar.gz e2e && ls && pwd
+      - run: cp dist/sourceplusplus-${{ env.SPP_PROBE_VERSION }}.tar.gz e2e && ls && pwd
       - run: cd e2e && docker-compose up -d
       - name: Docker IPs
         run: docker inspect --format='{{.Name}} - {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aq)
@@ -90,3 +90,25 @@ jobs:
       - name: Docker logs
         run: cd e2e && docker-compose logs -t --tail="all"
         if: ${{ always() }}
+
+      - name: Remove Old Release Drafts
+        if: github.ref == 'refs/heads/master'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          curl -H "Authorization: Bearer $GITHUB_TOKEN" https://api.github.com/repos/$GITHUB_REPOSITORY/releases \
+            | tr '\r\n' ' ' \
+            | jq '.[] | select(.draft == true) | .id' \
+            | xargs -I '{}' \
+          curl -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" https://api.github.com/repos/$GITHUB_REPOSITORY/releases/{}
+
+      - name: Create Release Draft
+        if: github.ref == 'refs/heads/master'
+        id: createDraft
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.SPP_PROBE_VERSION }}
+          release_name: v${{ env.SPP_PROBE_VERSION }}
+          draft: true

README.md

@@ -11,3 +11,9 @@ This project provides Python support to the [Source++](https://github.com/source
 # Usage
 
 - `pip install sourceplusplus`
+
+## Attach
+
+```sh
+SourcePlusPlus().attach()
+```

build.gradle.kts

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

e2e/Dockerfile

@@ -4,14 +4,11 @@ WORKDIR /usr/local/bin
 
 RUN pip install Flask
 RUN pip install PyYAML
+RUN pip install vertx-eventbus-client
 
-COPY vertx-eventbus-client-1.0.0.dev0.tar.gz .
+COPY sourceplusplus-0.1.2.tar.gz .
 
-RUN pip install vertx-eventbus-client-1.0.0.dev0.tar.gz
-
-COPY sourceplusplus-0.1.0.tar.gz .
-
-RUN pip install sourceplusplus-0.1.0.tar.gz
+RUN pip install sourceplusplus-0.1.2.tar.gz
 
 COPY E2ETest.py .
 

e2e/vertx-eventbus-client-1.0.0.dev0.tar.gz

@@ -1,3 +1,4 @@
+vertx-eventbus-client~=1.0.0
 apache-skywalking~=0.7.0
 nopdb~=0.1.0
 pyhumps~=3.0.2

requirements.txt

@@ -2,14 +2,15 @@
 from setuptools import setup
 
 setup(name='sourceplusplus',
-      version='0.1.0',
+      version='0.1.2',
       description='Source++ Python Probe',
       url='https://github.com/sourceplusplus/probe-python',
       author='Source++',
       author_email='hello@sourceplusplus.com',
       license='Apache License, Version 2.0',
       packages=setuptools.find_packages(),
-      install_requires=['apache-skywalking>=0.7.0',
+      install_requires=['vertx-eventbus-client>=1.0.0',
+                        'apache-skywalking>=0.7.0',
                         'nopdb>=0.1.0',
                         'pyhumps>=3.0.2',
                         'PyYAML>=6.0'])

setup.py

@@ -1,7 +1,7 @@
-__version__ = '0.1.0'
+__version__ = '0.1.2'
 __name__ = 'Source++'
 agent_name = 'Source++ Python Probe'
 
 __version_major__ = '0'
 __version_minor__ = '1'
-__version_micro__ = '0'
+__version_micro__ = '2'