Skip to content

Commit ee72490

Browse files
beniwohlibeniwohli
committed
Merge branch 'master' into transaction-ignore-urls
2 parents d41d627 + d16afc7 commit ee72490

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+666
-228
lines changed

‎.ci/.jenkins_exclude.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ exclude:
111111
# pymssql
112112
- PYTHON_VERSION: pypy-2 # currently fails with error on pypy2
113113
FRAMEWORK: pymssql-newest
114+
- PYTHON_VERSION: pypy-3 # currently fails with error on pypy3
115+
FRAMEWORK: pymssql-newest
114116
- PYTHON_VERSION: python-3.6 # currently fails with error on python 3.6 due to cython issues
115117
FRAMEWORK: pymssql-newest
116118
- PYTHON_VERSION: python-3.7 # currently fails with error on python 3.7 due to cython issues

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ coverage.xml
3030
tests/python-agent-junit.xml
3131
*.code-workspace
3232
.pytest_cache/
33-
tests/bdd/features/*.feature
3433
.python-version

‎CHANGELOG.asciidoc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ endif::[]
1818
===== Bug fixes
1919
////
2020
21-
//=== Unreleased
21+
=== Unreleased
2222
2323
// Unreleased changes go here
2424
// When the next release happens, nest these changes under the "Python Agent version 5.x" heading
2525
26+
[float]
27+
===== Bug fixes
28+
* Fixed an issue with metrics collection raising RuntimeErrors {pull}802[#802]
29+
2630
[[release-notes-5.x]]
2731
=== Python Agent version 5.x
2832

‎Jenkinsfile‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ pipeline {
4343
booleanParam(name: 'Run_As_Master_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on master branch.')
4444
booleanParam(name: 'bench_ci', defaultValue: true, description: 'Enable benchmarks.')
4545
booleanParam(name: 'tests_ci', defaultValue: true, description: 'Enable tests.')
46-
// temporarily disable building packages until https://github.com/pypa/manylinux/issues/512 is fixed
47-
booleanParam(name: 'package_ci', defaultValue: false, description: 'Enable building packages.')
46+
booleanParam(name: 'package_ci', defaultValue: true, description: 'Enable building packages.')
4847
}
4948
stages {
5049
stage('Initializing'){
@@ -62,14 +61,23 @@ pipeline {
6261
deleteDir()
6362
gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: true)
6463
stash allowEmpty: true, name: 'source', useDefaultExcludes: false
64+
script {
65+
dir("${BASE_DIR}"){
66+
// Skip all the stages except docs for PR's with asciidoc and md changes only
67+
env.ONLY_DOCS = isGitRegionMatch(patterns: [ '.*\\.(asciidoc|md)' ], shouldMatchAll: true)
68+
}
69+
}
6570
}
6671
}
6772
stage('Sanity checks') {
6873
when {
6974
beforeAgent true
70-
anyOf {
71-
not { changeRequest() }
72-
expression { return params.Run_As_Master_Branch }
75+
allOf {
76+
expression { return env.ONLY_DOCS == "false" }
77+
anyOf {
78+
not { changeRequest() }
79+
expression { return params.Run_As_Master_Branch }
80+
}
7381
}
7482
}
7583
steps {
@@ -96,7 +104,10 @@ pipeline {
96104
options { skipDefaultCheckout() }
97105
when {
98106
beforeAgent true
99-
expression { return params.tests_ci }
107+
allOf {
108+
expression { return env.ONLY_DOCS == "false" }
109+
expression { return params.tests_ci }
110+
}
100111
}
101112
steps {
102113
withGithubNotify(context: 'Test', tab: 'tests') {
@@ -140,7 +151,10 @@ pipeline {
140151
}
141152
when {
142153
beforeAgent true
143-
expression { return params.package_ci }
154+
allOf {
155+
expression { return env.ONLY_DOCS == "false" }
156+
expression { return params.package_ci }
157+
}
144158
}
145159
steps {
146160
withGithubNotify(context: 'Building packages') {
@@ -159,9 +173,12 @@ pipeline {
159173
agent none
160174
when {
161175
beforeAgent true
162-
anyOf {
163-
changeRequest()
164-
expression { return !params.Run_As_Master_Branch }
176+
allOf {
177+
expression { return env.ONLY_DOCS == "false" }
178+
anyOf {
179+
changeRequest()
180+
expression { return !params.Run_As_Master_Branch }
181+
}
165182
}
166183
}
167184
steps {

‎Makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,4 @@ docs:
2626
update-json-schema:
2727
bash ./tests/scripts/download_json_schema.sh
2828

29-
update-gherkin-features:
30-
bash ./tests/scripts/download_gherkin_features.sh
31-
3229
.PHONY: isort flake8 test coverage docs update-json-schema

‎docs/api.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ elasticapm.set_transaction_name('myapp.billing_process')
219219
[[api-set-transaction-result]]
220220
==== `elasticapm.set_transaction_result()`
221221

222-
Set the name of the current transaction.
222+
Set the result of the current transaction.
223223
For supported frameworks, the transaction result is determined automatically,
224224
and can be overridden using this function. Example:
225225

0 commit comments

Comments
 (0)