Skip to content

dont emit warnings by default #156

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
brettmc merged 1 commit into from
Jan 20, 2025
Merged

dont emit warnings by default #156

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
3 changes: 3 additions & 0 deletions ext/opentelemetry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ STD_PHP_INI_ENTRY_EX("opentelemetry.attr_hooks_enabled", "Off", PHP_INI_ALL,
OnUpdateBool, attr_hooks_enabled,
zend_opentelemetry_globals, opentelemetry_globals,
zend_ini_boolean_displayer_cb)
STD_PHP_INI_ENTRY_EX("opentelemetry.display_warnings", "Off", PHP_INI_ALL,
OnUpdateBool, display_warnings, zend_opentelemetry_globals,
opentelemetry_globals, zend_ini_boolean_displayer_cb)
STD_PHP_INI_ENTRY("opentelemetry.attr_pre_handler_function",
"OpenTelemetry\\API\\Instrumentation\\WithSpanHandler::pre",
PHP_INI_ALL, OnUpdateString, pre_handler_function_fqn,
Expand Down
3 changes: 2 additions & 1 deletion ext/otel_observer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,8 @@ static otel_observer *resolve_observer(zend_execute_data *execute_data) {
}
bool has_withspan_attribute = func_has_withspan_attribute(execute_data);

if (OTEL_G(attr_hooks_enabled) == false && has_withspan_attribute) {
if (OTEL_G(attr_hooks_enabled) == false && has_withspan_attribute &&
OTEL_G(display_warnings) == true) {
php_error_docref(NULL, E_CORE_WARNING,
"OpenTelemetry: WithSpan attribute found but "
"attribute hooks disabled");
Expand Down
1 change: 1 addition & 0 deletions ext/php_opentelemetry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ZEND_BEGIN_MODULE_GLOBALS(opentelemetry)
int disabled; // module disabled? (eg due to conflicting extension loaded)
int allow_stack_extension;
int attr_hooks_enabled; // attribute hooking enabled?
int display_warnings;
char *pre_handler_function_fqn;
char *post_handler_function_fqn;
ZEND_END_MODULE_GLOBALS(opentelemetry)
Expand Down
1 change: 1 addition & 0 deletions ext/tests/with_span/disable.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Check if attribute hooks can be disabled by config
opentelemetry
--INI--
opentelemetry.attr_hooks_enabled = Off
opentelemetry.display_warnings = On
--FILE--
<?php
namespace OpenTelemetry\API\Instrumentation;
Expand Down
Loading