Comment out unwanted or unused options (#74)

elastic · Sep 2, 2024 · 71486c0 · 71486c0
1 parent 28244d9
commit 71486c0
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 209 deletions.
diff --git a/packaging/configs/elastic-otel-custom-template.ini b/packaging/configs/elastic-otel-custom-template.ini
@@ -5,15 +5,5 @@
 
 [elastic]
 ;elastic_otel.enabled = true
-;elastic_otel.api_key = "REPLACE_WITH_API_KEY"
-;elastic_otel.environment = "production"
 ;elastic_otel.log_level = "INFO"
 ;elastic_otel.log_level_stderr = "INFO"
-;elastic_otel.secret_token = "REPLACE_WITH_SECRET_TOKEN"
-;elastic_otel.server_timeout = "30s"
-;elastic_otel.server_url = "http://localhost:8200"
-;elastic_otel.service_name = "REPLACE_WITH_SERVICE_NAME"
-;elastic_otel.service_version = "REPLACE_WITH_OUTPUT_FROM_git rev-parse HEAD"
-;elastic_otel.transaction_max_spans = 500
-;elastic_otel.transaction_sample_rate = 1.0
-;elastic_otel.verify_server_cert = true
diff --git a/packaging/scripts/post-install.sh b/packaging/scripts/post-install.sh
@@ -184,11 +184,6 @@ function agent_extension_not_supported() {
 ################################################################################
 #### Function get_extension_file ###############################################
 function get_extension_file() {
-    PHP_API=$(php_api)
-    ## If alpine then add another suffix
-#    if grep -q -i alpine /etc/os-release; then
-#        SUFFIX=-alpine
-#    fi
     echo "${EXTENSION_DIR}/elastic_otel_php_loader.so"
 }
 

diff --git a/prod/native/extension/code/ModuleIniEntries.cpp b/prod/native/extension/code/ModuleIniEntries.cpp
@@ -48,50 +48,50 @@ extern elasticapm::php::ConfigurationManager configManager;
 #define ELASTIC_OTEL_NOT_RELOADABLE_INI_ENTRY( optName ) ELASTIC_OTEL_INI_ENTRY_IMPL( optName, PHP_INI_PERDIR )
 
 PHP_INI_BEGIN() // expands to: static const zend_ini_entry_def ini_entries[] = {
-    #ifdef PHP_WIN32
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_ALLOW_ABORT_DIALOG) )
-    #endif
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_API_KEY) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_BOOTSTRAP_PHP_PART_FILE) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_BREAKDOWN_METRICS) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_CAPTURE_ERRORS) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_DEV_INTERNAL) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_DISABLE_INSTRUMENTATIONS) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_DISABLE_SEND) )
-    ELASTIC_OTEL_NOT_RELOADABLE_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_ENABLED) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_GLOBAL_LABELS) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_ENVIRONMENT) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_HOSTNAME) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_FILE) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_LEVEL) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_LEVEL_FILE) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_LEVEL_STDERR) )
-    #ifndef PHP_WIN32
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_LEVEL_SYSLOG) )
-    #endif
-    #ifdef PHP_WIN32
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_LEVEL_WIN_SYS_DEBUG) )
-    #endif
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_NON_KEYWORD_STRING_MAX_LENGTH) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SANITIZE_FIELD_NAMES) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SECRET_TOKEN) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SERVER_TIMEOUT) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SERVER_URL) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SERVICE_NAME) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SERVICE_NODE_NAME) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SERVICE_VERSION) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SPAN_COMPRESSION_ENABLED) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SPAN_COMPRESSION_EXACT_MATCH_MAX_DURATION) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SPAN_COMPRESSION_SAME_KIND_MAX_DURATION) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SPAN_STACK_TRACE_MIN_DURATION) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_STACK_TRACE_LIMIT) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_TRANSACTION_IGNORE_URLS) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_TRANSACTION_MAX_SPANS) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_TRANSACTION_SAMPLE_RATE) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_URL_GROUPS) )
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_VERIFY_SERVER_CERT) )
-
-    ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_DEBUG_DIAGNOSTICS_FILE) )
+// #ifdef PHP_WIN32
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_ALLOW_ABORT_DIALOG) )
+// #endif
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_API_KEY) )
+ELASTIC_OTEL_INI_ENTRY(EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_BOOTSTRAP_PHP_PART_FILE))
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_BREAKDOWN_METRICS) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_CAPTURE_ERRORS) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_DEV_INTERNAL) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_DISABLE_INSTRUMENTATIONS) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_DISABLE_SEND) )
+ELASTIC_OTEL_NOT_RELOADABLE_INI_ENTRY(EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_ENABLED))
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_GLOBAL_LABELS) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_ENVIRONMENT) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_HOSTNAME) )
+ELASTIC_OTEL_INI_ENTRY(EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_FILE))
+ELASTIC_OTEL_INI_ENTRY(EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_LEVEL))
+ELASTIC_OTEL_INI_ENTRY(EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_LEVEL_FILE))
+ELASTIC_OTEL_INI_ENTRY(EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_LEVEL_STDERR))
+#ifndef PHP_WIN32
+ELASTIC_OTEL_INI_ENTRY(EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_LEVEL_SYSLOG))
+#endif
+#ifdef PHP_WIN32
+ELASTIC_OTEL_INI_ENTRY(EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_LOG_LEVEL_WIN_SYS_DEBUG))
+#endif
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_NON_KEYWORD_STRING_MAX_LENGTH) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SANITIZE_FIELD_NAMES) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SECRET_TOKEN) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SERVER_TIMEOUT) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SERVER_URL) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SERVICE_NAME) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SERVICE_NODE_NAME) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SERVICE_VERSION) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SPAN_COMPRESSION_ENABLED) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SPAN_COMPRESSION_EXACT_MATCH_MAX_DURATION) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SPAN_COMPRESSION_SAME_KIND_MAX_DURATION) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_SPAN_STACK_TRACE_MIN_DURATION) )
+// ELASTIC_OTEL_INI_ENTRY(EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_STACK_TRACE_LIMIT))
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_TRANSACTION_IGNORE_URLS) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_TRANSACTION_MAX_SPANS) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_TRANSACTION_SAMPLE_RATE) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_URL_GROUPS) )
+// ELASTIC_OTEL_INI_ENTRY( EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_VERIFY_SERVER_CERT) )
+
+ELASTIC_OTEL_INI_ENTRY(EL_STRINGIFY(ELASTIC_OTEL_CFG_OPT_NAME_DEBUG_DIAGNOSTICS_FILE))
 PHP_INI_END()
 
 namespace elasticapm::php {

diff --git a/prod/native/extension/phpt/tests/config_defaults.phpt b/prod/native/extension/phpt/tests/config_defaults.phpt
@@ -73,32 +73,32 @@ if (elasticApmIsOsWindows()) {
 
 }
 
-//////////////////////////////////////////////
-///////////////  secret_token
+// //////////////////////////////////////////////
+// ///////////////  secret_token
 
-elasticApmAssertSame("getenv('ELASTIC_OTEL_SECRET_TOKEN')", getenv('ELASTIC_OTEL_SECRET_TOKEN'), false);
+// elasticApmAssertSame("getenv('ELASTIC_OTEL_SECRET_TOKEN')", getenv('ELASTIC_OTEL_SECRET_TOKEN'), false);
 
-elasticApmAssertEqual("ini_get('elastic_otel.secret_token')", ini_get('elastic_otel.secret_token'), false);
+// elasticApmAssertEqual("ini_get('elastic_otel.secret_token')", ini_get('elastic_otel.secret_token'), false);
 
-elasticApmAssertSame("elastic_otel_get_config_option_by_name('secret_token')", elastic_otel_get_config_option_by_name('secret_token'), "");
+// elasticApmAssertSame("elastic_otel_get_config_option_by_name('secret_token')", elastic_otel_get_config_option_by_name('secret_token'), "");
 
-//////////////////////////////////////////////
-///////////////  server_url
+// //////////////////////////////////////////////
+// ///////////////  server_url
 
-elasticApmAssertSame("getenv('ELASTIC_OTEL_SERVER_URL')", getenv('ELASTIC_OTEL_SERVER_URL'), false);
+// elasticApmAssertSame("getenv('ELASTIC_OTEL_SERVER_URL')", getenv('ELASTIC_OTEL_SERVER_URL'), false);
 
-elasticApmAssertEqual("ini_get('elastic_otel.server_url')", ini_get('elastic_otel.server_url'), false);
+// elasticApmAssertEqual("ini_get('elastic_otel.server_url')", ini_get('elastic_otel.server_url'), false);
 
-elasticApmAssertSame("elastic_otel_get_config_option_by_name('server_url')", elastic_otel_get_config_option_by_name('server_url'), 'http://localhost:8200');
+// elasticApmAssertSame("elastic_otel_get_config_option_by_name('server_url')", elastic_otel_get_config_option_by_name('server_url'), 'http://localhost:8200');
 
-//////////////////////////////////////////////
-///////////////  service_name
+// //////////////////////////////////////////////
+// ///////////////  service_name
 
-elasticApmAssertSame("getenv('ELASTIC_OTEL_SERVICE_NAME')", getenv('ELASTIC_OTEL_SERVICE_NAME'), false);
+// elasticApmAssertSame("getenv('ELASTIC_OTEL_SERVICE_NAME')", getenv('ELASTIC_OTEL_SERVICE_NAME'), false);
 
-elasticApmAssertEqual("ini_get('elastic_otel.service_name')", ini_get('elastic_otel.service_name'), false);
+// elasticApmAssertEqual("ini_get('elastic_otel.service_name')", ini_get('elastic_otel.service_name'), false);
 
-elasticApmAssertSame("elastic_otel_get_config_option_by_name('service_name')", elastic_otel_get_config_option_by_name('service_name'), "");
+// elasticApmAssertSame("elastic_otel_get_config_option_by_name('service_name')", elastic_otel_get_config_option_by_name('service_name'), "");
 
 echo 'Test completed'
 ?>

diff --git a/prod/native/extension/phpt/tests/config_invalid_ini_value_always_false_not_env_var.phpt b/prod/native/extension/phpt/tests/config_invalid_ini_value_always_false_not_env_var.phpt
@@ -6,16 +6,16 @@ ELASTIC_OTEL_VERIFY_SERVER_CERT=true
 --INI--
 extension=/elastic/elastic_otel_php.so
 elastic_otel.bootstrap_php_part_file={PWD}/includes/bootstrap_mock.inc
-elastic_otel.verify_server_cert=not a valid bool
+elastic_otel.enabled=not a valid bool
 --FILE--
 <?php
 declare(strict_types=1);
 require __DIR__ . '/includes/tests_util.inc';
 
 // according to ini parser in PHP everything except "yes, true, on" values are returned as return atoi(string) !=0 - so it always returns false
 
-var_dump(elastic_otel_get_config_option_by_name('verify_server_cert'));
-var_dump(ini_get('elastic_otel.verify_server_cert'));
+var_dump(elastic_otel_get_config_option_by_name('enabled'));
+var_dump(ini_get('elastic_otel.enabled'));
 
 echo 'Test completed'
 ?>

diff --git a/prod/native/extension/phpt/tests/config_setting_to_invalid_values_using_env_vars.phpt b/prod/native/extension/phpt/tests/config_setting_to_invalid_values_using_env_vars.phpt
@@ -23,32 +23,11 @@ var_dump(getenv('ELASTIC_OTEL_ENABLED'));
 var_dump(elastic_otel_is_enabled());
 var_dump(elastic_otel_get_config_option_by_name('enabled'));
 
-echo "secret_token\n";
-var_dump(getenv('ELASTIC_OTEL_SECRET_TOKEN'));
-var_dump(elastic_otel_get_config_option_by_name('secret_token'));
-
-echo "server_url\n";
-var_dump(getenv('ELASTIC_OTEL_SERVER_URL'));
-var_dump(elastic_otel_get_config_option_by_name('server_url'));
-
-echo "service_name\n";
-var_dump(getenv('ELASTIC_OTEL_SERVICE_NAME'));
-var_dump(elastic_otel_get_config_option_by_name('service_name'));
-
 echo 'Test completed'
 ?>
 --EXPECT--
 enabled
 string(23) "not_valid_boolean_value"
 bool(false)
 bool(false)
-secret_token
-string(6) "\|<>|/"
-string(6) "\|<>|/"
-server_url
-string(6) "<\/\/>"
-string(6) "<\/\/>"
-service_name
-string(6) "/\><\/"
-string(6) "/\><\/"
 Test completed
diff --git a/prod/native/extension/phpt/tests/config_setting_to_invalid_values_using_ini.phpt b/prod/native/extension/phpt/tests/config_setting_to_invalid_values_using_ini.phpt
@@ -21,35 +21,11 @@ var_dump(ini_get('elastic_otel.enabled'));
 var_dump(elastic_otel_get_config_option_by_name('enabled'));
 var_dump(elastic_otel_is_enabled());
 
-
-echo "secret_token\n";
-var_dump(ini_get('elastic_otel.secret_token'));
-var_dump(elastic_otel_get_config_option_by_name('secret_token'));
-
-echo "server_url\n";
-
-var_dump(ini_get('elastic_otel.server_url'));
-var_dump(elastic_otel_get_config_option_by_name('server_url'));
-
-echo "service_name\n";
-
-var_dump(ini_get('elastic_otel.service_name'));
-var_dump(elastic_otel_get_config_option_by_name('service_name'));
-
 echo 'Test completed'
 ?>
 --EXPECT--
 enabled
 string(23) "not valid boolean value"
 bool(false)
 bool(false)
-secret_token
-string(6) "\|<>|/"
-string(6) "\|<>|/"
-server_url
-string(6) "<\/\/>"
-string(6) "<\/\/>"
-service_name
-string(6) "/\><\/"
-string(6) "/\><\/"
 Test completed
diff --git a/prod/native/extension/phpt/tests/config_setting_to_non-defaults_using_env_vars.phpt b/prod/native/extension/phpt/tests/config_setting_to_non-defaults_using_env_vars.phpt
@@ -67,27 +67,6 @@ if (elasticApmIsOsWindows()) {
     elasticApmAssertSame("elastic_otel_get_config_option_by_name('log_level_win_sys_debug')", elastic_otel_get_config_option_by_name('log_level_win_sys_debug'), ELASTIC_OTEL_LOG_LEVEL_CRITICAL);
 }
 
-//////////////////////////////////////////////
-///////////////  secret_token
-
-elasticApmAssertSame("getenv('ELASTIC_OTEL_SECRET_TOKEN')", getenv('ELASTIC_OTEL_SECRET_TOKEN'), 'non-default_secret_token_123');
-
-elasticApmAssertSame("elastic_otel_get_config_option_by_name('secret_token')", elastic_otel_get_config_option_by_name('secret_token'), 'non-default_secret_token_123');
-
-//////////////////////////////////////////////
-///////////////  server_url
-
-elasticApmAssertSame("getenv('ELASTIC_OTEL_SERVER_URL')", getenv('ELASTIC_OTEL_SERVER_URL'), 'https://non-default_server_url:4321/some/path');
-
-elasticApmAssertSame("elastic_otel_get_config_option_by_name('server_url')", elastic_otel_get_config_option_by_name('server_url'), 'https://non-default_server_url:4321/some/path');
-
-//////////////////////////////////////////////
-///////////////  service_name
-
-elasticApmAssertSame("getenv('ELASTIC_OTEL_SERVICE_NAME')", getenv('ELASTIC_OTEL_SERVICE_NAME'), 'Non-default Service Name');
-
-elasticApmAssertSame("elastic_otel_get_config_option_by_name('service_name')", elastic_otel_get_config_option_by_name('service_name'), 'Non-default Service Name');
-
 echo 'Test completed'
 ?>
 --EXPECT--

diff --git a/prod/native/extension/phpt/tests/config_setting_to_non-defaults_using_ini.phpt b/prod/native/extension/phpt/tests/config_setting_to_non-defaults_using_ini.phpt
@@ -66,27 +66,6 @@ if (elasticApmIsOsWindows()) {
     elasticApmAssertSame("elastic_otel_get_config_option_by_name('log_level_win_sys_debug')", elastic_otel_get_config_option_by_name('log_level_win_sys_debug'), ELASTIC_OTEL_LOG_LEVEL_CRITICAL);
 }
 
-//////////////////////////////////////////////
-///////////////  secret_token
-
-elasticApmAssertSame("ini_get('elastic_otel.secret_token')", ini_get('elastic_otel.secret_token'), 'non-default_secret_token_123');
-
-elasticApmAssertSame("elastic_otel_get_config_option_by_name('secret_token')", elastic_otel_get_config_option_by_name('secret_token'), 'non-default_secret_token_123');
-
-//////////////////////////////////////////////
-///////////////  server_url
-
-elasticApmAssertSame("ini_get('elastic_otel.server_url')", ini_get('elastic_otel.server_url'), 'https://non-default_server_url:4321/some/path');
-
-elasticApmAssertSame("elastic_otel_get_config_option_by_name('server_url')", elastic_otel_get_config_option_by_name('server_url'), 'https://non-default_server_url:4321/some/path');
-
-//////////////////////////////////////////////
-///////////////  service_name
-
-elasticApmAssertSame("ini_get('elastic_otel.service_name')", ini_get('elastic_otel.service_name'), 'Non-default Service Name');
-
-elasticApmAssertSame("elastic_otel_get_config_option_by_name('service_name')", elastic_otel_get_config_option_by_name('service_name'), 'Non-default Service Name');
-
 echo 'Test completed'
 ?>
 --EXPECT--