Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Commit

Permalink
v4.2.0
Browse files Browse the repository at this point in the history 
Summer 2021 https://summer.iscas.ac.cn/
Add memcached, yar
Fix memory leak
Fix myselnd
Fix #401 #398
  • Loading branch information
@heyanlong
heyanlong committed Nov 2, 2021
1 parent b941682 commit 53d5c63
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 19 deletions.
6 changes: 3 additions & 3 deletions docs/BUILDING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ To build gRPC from source, you may need to install the following packages from H
Use the `--with-grpc` option to set the path of the gRPC static library

```shell script
curl -Lo v4.1.3.tar.gz https://github.com/SkyAPM/SkyAPM-php-sdk/archive/v4.1.3.tar.gz
tar zxvf v4.1.3.tar.gz
cd SkyAPM-php-sdk-4.1.3
curl -Lo v4.2.0.tar.gz https://github.com/SkyAPM/SkyAPM-php-sdk/archive/v4.2.0.tar.gz
tar zxvf v4.2.0.tar.gz
cd SkyAPM-php-sdk-4.2.0
phpize
./configure --with-grpc="/var/local/git/grpc"
make
Expand Down
38 changes: 26 additions & 12 deletions package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
<date>2021-07-21</date>
<date>2021-11-02</date>
<version>
<release>4.1.3</release>
<api>4.1.3</api>
<release>4.2.0</release>
<api>4.2.0</api>
</version>
<stability>
<release>stable</release>
Expand All @@ -45,15 +45,10 @@
<file role="doc" name="README.md"/>
<file role="src" name="config.m4"/>
<file role="src" name="config.w32"/>
<file role="src" name="docker/Dockerfile.7.0"/>
<file role="src" name="docker/Dockerfile.7.1"/>
<file role="src" name="docker/Dockerfile.7.2"/>
<file role="src" name="docker/Dockerfile.7.3"/>
<file role="src" name="docker/Dockerfile.7.4"/>
<file role="src" name="docker/Dockerfile.8.0"/>
<file role="src" name="docker/Dockerfile"/>
<file role="src" name="docker/entrypoint.sh"/>
<file role="src" name="docker/index.php"/>
<file role="src" name="docker/nginx.conf"/>
<file role="src" name="docker/service.sh"/>
<file role="doc" name="docs/API.md"/>
<file role="doc" name="docs/BUILDING.md"/>
<file role="doc" name="docs/CONFIG.md"/>
Expand All @@ -69,8 +64,10 @@
<file role="src" name="e2e/override.conf"/>
<file role="src" name="e2e/tests.php"/>
<file role="src" name="e2e/tests/functions.php"/>
<file role="src" name="e2e/tests/memcached.php"/>
<file role="src" name="e2e/tests/mysqli.php"/>
<file role="src" name="e2e/tests/redis.php"/>
<file role="src" name="e2e/tests/yar.php"/>
<file role="src" name="php.ini"/>
<file role="src" name="php_skywalking.h"/>
<file role="src" name="scripts/package.py"/>
Expand Down Expand Up @@ -102,8 +99,6 @@
<file role="src" name="src/sky_core_span_log.h"/>
<file role="src" name="src/sky_execute.cc"/>
<file role="src" name="src/sky_execute.h"/>
<file role="src" name="src/sky_grpc.cc"/>
<file role="src" name="src/sky_grpc.h"/>
<file role="src" name="src/sky_log.cc"/>
<file role="src" name="src/sky_log.h"/>
<file role="src" name="src/sky_module.cc"/>
Expand All @@ -114,8 +109,12 @@
<file role="src" name="src/sky_plugin_curl.h"/>
<file role="src" name="src/sky_plugin_error.cc"/>
<file role="src" name="src/sky_plugin_error.h"/>
<file role="src" name="src/sky_plugin_grpc.cc"/>
<file role="src" name="src/sky_plugin_grpc.h"/>
<file role="src" name="src/sky_plugin_hyperf_guzzle.cc"/>
<file role="src" name="src/sky_plugin_hyperf_guzzle.h"/>
<file role="src" name="src/sky_plugin_memcached.cc"/>
<file role="src" name="src/sky_plugin_memcached.h"/>
<file role="src" name="src/sky_plugin_mysqli.cc"/>
<file role="src" name="src/sky_plugin_mysqli.h"/>
<file role="src" name="src/sky_plugin_predis.cc"/>
Expand All @@ -126,6 +125,10 @@
<file role="src" name="src/sky_plugin_redis.h"/>
<file role="src" name="src/sky_plugin_swoole_curl.cc"/>
<file role="src" name="src/sky_plugin_swoole_curl.h"/>
<file role="src" name="src/sky_plugin_yar.cc"/>
<file role="src" name="src/sky_plugin_yar.h"/>
<file role="src" name="src/sky_rate_limit.cc"/>
<file role="src" name="src/sky_rate_limit.h"/>
<file role="src" name="src/sky_shm.cc"/>
<file role="src" name="src/sky_shm.h"/>
<file role="src" name="src/sky_utils.cc"/>
Expand All @@ -150,6 +153,17 @@
<providesextension>skywalking</providesextension>
<extsrcrelease/>
<changelog>
<release>
<version>
<release>4.2.0</release>
<api>4.2.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<notes>Fix bugs</notes>
</release>
<release>
<version>
<release>4.1.3</release>
Expand Down
2 changes: 1 addition & 1 deletion php_skywalking.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ SKY_BEGIN_EXTERN_C()
extern zend_module_entry skywalking_module_entry;
#define phpext_skywalking_ptr &skywalking_module_entry

#define PHP_SKYWALKING_VERSION "4.1.3"
#define PHP_SKYWALKING_VERSION "4.2.0"


#define SKY_STRCMP(s1, s2) ((s1) != nullptr && strcmp(s1, s2) == 0)
Expand Down
17 changes: 16 additions & 1 deletion scripts/package.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import xml.dom.minidom
import time, os

version = '4.1.3'
version = '4.2.0'

git = os.popen('git ls-files')
res = git.read()
Expand Down Expand Up @@ -98,6 +98,21 @@
{'key': 'providesextension', 'value': 'skywalking'},
{'key': 'extsrcrelease'},
{'key': 'changelog', 'child': [
{'key': 'release', 'child': [
{'key': 'version', 'child': [
{'key': 'release', 'value': '4.2.0'},
{'key': 'api', 'value': '4.2.0'}
]
},
{'key': 'stability', 'child': [
{'key': 'release', 'value': 'stable'},
{'key': 'api', 'value': 'stable'}
]
},
{'key': 'notes', 'value': 'Fix bugs'}
]
},

{'key': 'release', 'child': [
{'key': 'version', 'child': [
{'key': 'release', 'value': '4.1.3'},
Expand Down
2 changes: 1 addition & 1 deletion scripts/version.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
#

VERSION=4.1.3
VERSION=4.2.0
OS=`uname`

echo "OS: $OS"
Expand Down
6 changes: 5 additions & 1 deletion src/manager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ void Manager::login(const ManagerOptions &options, struct service_info *info) {
std::string instance;
if (!ips.empty()) {
// todo port
instance = generateUUID() + "@" + ips[0];
if (!options.instance_name.empty()) {
instance = generateUUID();
} else {
instance = generateUUID() + "@" + ips[0];
}
}

properties.set_service(options.code);
Expand Down

0 comments on commit 53d5c63

Please sign in to comment.