Skip to content

Support changing the tideways collect mode and sample rate #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sroze merged 1 commit into from
Feb 13, 2018
Merged

Support changing the tideways collect mode and sample rate #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions php/apache/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ TIDEWAYS_FRAMEWORK | What framework (if any) is being used in the image? | strin
TIDEWAYS_API_KEY | Your Tideways API key | string | empty
TIDEWAYS_CONNECTION | The location of a Tideways daemon to send logs/instrumentation to. We recommend deploying https://github.com/continuouspipe/dockerfiles/tree/master/tideways to handle this | protocol://domain_or_ip:port | tcp://tideways:9135
TIDEWAYS_SERVICE | The service that your application provides (optional) | string | empty
TIDEWAYS_COLLECT | The collect mode for Tideways (see [the Tideways documentation](https://tideways.io/profiler/article/43-sampling))(optional) | DISABLED/BASIC/TRACING/PROFILING/FULL | TRACING
TIDEWAYS_SAMPLE_RATE | The sample rate for Tideways (see [the Tideways documentation](https://tideways.io/profiler/article/43-sampling))(optional) | integer | 25
XDEBUG_REMOTE_ENABLED | If XDebug is enabled for debugging purposes. We recommend disabling Tideways and only using XDebug in development. | true/false | false
XDEBUG_REMOTE_HOST | The host to connect to. We recommend deploying https://github.com/continuouspipe/dockerfiles/tree/master/ssh-forward to handle this | A domain or IP address | sshforward
XDEBUG_REMOTE_PORT | The port to connect to. | 1-65535 | 9000
Expand Down
2 changes: 2 additions & 0 deletions php/nginx/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ TIDEWAYS_FRAMEWORK | What framework (if any) is being used in the image? | strin
TIDEWAYS_API_KEY | Your Tideways API key | string | empty
TIDEWAYS_CONNECTION | The location of a Tideways daemon to send logs/instrumentation to. We recommend deploying https://github.com/continuouspipe/dockerfiles/tree/master/tideways to handle this | protocol://domain_or_ip:port | tcp://tideways:9135
TIDEWAYS_SERVICE | The service that your application provides (optional) | string | empty
TIDEWAYS_COLLECT | The collect mode for Tideways (see [the Tideways documentation](https://tideways.io/profiler/article/43-sampling))(optional) | DISABLED/BASIC/TRACING/PROFILING/FULL | TRACING
TIDEWAYS_SAMPLE_RATE | The sample rate for Tideways (see [the Tideways documentation](https://tideways.io/profiler/article/43-sampling))(optional) | integer | 25
XDEBUG_REMOTE_ENABLED | If XDebug is enabled for debugging purposes. We recommend disabling Tideways and only using XDebug in development. | true/false | false
XDEBUG_REMOTE_HOST | The host to connect to. We recommend deploying https://github.com/continuouspipe/dockerfiles/tree/master/ssh-forward to handle this | A domain or IP address | sshforward
XDEBUG_REMOTE_PORT | The port to connect to. | 1-65535 | 9000
Expand Down
6 changes: 5 additions & 1 deletion php/shared/etc/confd/templates/tideways/tideways.ini.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ tideways.connection = {{ getenv "TIDEWAYS_CONNECTION" }}

; Configure the profiling sample rate for this PHP server globally. The given
; number is an integer representing percent between 0 and 100
tideways.sample_rate=25
tideways.sample_rate={{getenv "TIDEWAYS_SAMPLE_RATE"}}

{{if getenv "TIDEWAYS_COLLECT"}}
tideways.collect={{getenv "TIDEWAYS_COLLECT"}}
{{end}}

; Automatically detect transactions and exceptions of a given framework The
; following frameworks are currently supported:
Expand Down
2 changes: 2 additions & 0 deletions php/shared/usr/local/share/env/40-stack
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ export TIDEWAYS_FRAMEWORK=${TIDEWAYS_FRAMEWORK:-}
export TIDEWAYS_API_KEY=${TIDEWAYS_API_KEY:-}
export TIDEWAYS_CONNECTION=${TIDEWAYS_CONNECTION:-tcp://tideways:9135}
export TIDEWAYS_SERVICE=${TIDEWAYS_SERVICE:-}
export TIDEWAYS_SAMPLE_RATE=${TIDEWAYS_SAMPLE_RATE:-25}
export TIDEWAYS_COLLECT=${TIDEWAYS_COLLECT:-TRACING}

XDEBUG_REMOTE_ENABLED="$(convert_to_boolean_string "${XDEBUG_REMOTE_ENABLED:-false}")"
export XDEBUG_REMOTE_ENABLED
Expand Down