diff --git a/components-rs/common.h b/components-rs/common.h index e53c4ef311..cc3e8b041e 100644 --- a/components-rs/common.h +++ b/components-rs/common.h @@ -264,16 +264,19 @@ typedef struct _zend_string _zend_string; #define ddog_MultiTargetFetcher_DEFAULT_CLIENTS_LIMIT 100 -typedef enum ddog_ConfigurationOrigin { - DDOG_CONFIGURATION_ORIGIN_ENV_VAR, - DDOG_CONFIGURATION_ORIGIN_CODE, - DDOG_CONFIGURATION_ORIGIN_DD_CONFIG, - DDOG_CONFIGURATION_ORIGIN_REMOTE_CONFIG, - DDOG_CONFIGURATION_ORIGIN_DEFAULT, - DDOG_CONFIGURATION_ORIGIN_LOCAL_STABLE_CONFIG, - DDOG_CONFIGURATION_ORIGIN_FLEET_STABLE_CONFIG, - DDOG_CONFIGURATION_ORIGIN_CALCULATED, -} ddog_ConfigurationOrigin; +typedef enum ddog_Log { + DDOG_LOG_ERROR = 1, + DDOG_LOG_WARN = 2, + DDOG_LOG_INFO = 3, + DDOG_LOG_DEBUG = 4, + DDOG_LOG_TRACE = 5, + DDOG_LOG_DEPRECATED = (3 | ddog_LOG_ONCE), + DDOG_LOG_STARTUP = (3 | (2 << 4)), + DDOG_LOG_STARTUP_WARN = (1 | (2 << 4)), + DDOG_LOG_SPAN = (4 | (3 << 4)), + DDOG_LOG_SPAN_TRACE = (5 | (3 << 4)), + DDOG_LOG_HOOK_TRACE = (5 | (4 << 4)), +} ddog_Log; typedef enum ddog_DynamicConfigUpdateMode { DDOG_DYNAMIC_CONFIG_UPDATE_MODE_READ, @@ -282,30 +285,16 @@ typedef enum ddog_DynamicConfigUpdateMode { DDOG_DYNAMIC_CONFIG_UPDATE_MODE_RESTORE, } ddog_DynamicConfigUpdateMode; -typedef enum ddog_EvaluateAt { - DDOG_EVALUATE_AT_ENTRY, - DDOG_EVALUATE_AT_EXIT, -} ddog_EvaluateAt; - typedef enum ddog_InBodyLocation { DDOG_IN_BODY_LOCATION_NONE, DDOG_IN_BODY_LOCATION_START, DDOG_IN_BODY_LOCATION_END, } ddog_InBodyLocation; -typedef enum ddog_Log { - DDOG_LOG_ERROR = 1, - DDOG_LOG_WARN = 2, - DDOG_LOG_INFO = 3, - DDOG_LOG_DEBUG = 4, - DDOG_LOG_TRACE = 5, - DDOG_LOG_DEPRECATED = (3 | ddog_LOG_ONCE), - DDOG_LOG_STARTUP = (3 | (2 << 4)), - DDOG_LOG_STARTUP_WARN = (1 | (2 << 4)), - DDOG_LOG_SPAN = (4 | (3 << 4)), - DDOG_LOG_SPAN_TRACE = (5 | (3 << 4)), - DDOG_LOG_HOOK_TRACE = (5 | (4 << 4)), -} ddog_Log; +typedef enum ddog_EvaluateAt { + DDOG_EVALUATE_AT_ENTRY, + DDOG_EVALUATE_AT_EXIT, +} ddog_EvaluateAt; typedef enum ddog_MetricKind { DDOG_METRIC_KIND_COUNT, @@ -314,6 +303,37 @@ typedef enum ddog_MetricKind { DDOG_METRIC_KIND_DISTRIBUTION, } ddog_MetricKind; +typedef enum ddog_SpanProbeTarget { + DDOG_SPAN_PROBE_TARGET_ACTIVE, + DDOG_SPAN_PROBE_TARGET_ROOT, +} ddog_SpanProbeTarget; + +typedef enum ddog_ProbeStatus { + DDOG_PROBE_STATUS_RECEIVED, + DDOG_PROBE_STATUS_INSTALLED, + DDOG_PROBE_STATUS_EMITTING, + DDOG_PROBE_STATUS_ERROR, + DDOG_PROBE_STATUS_BLOCKED, + DDOG_PROBE_STATUS_WARNING, +} ddog_ProbeStatus; + +typedef enum ddog_ConfigurationOrigin { + DDOG_CONFIGURATION_ORIGIN_ENV_VAR, + DDOG_CONFIGURATION_ORIGIN_CODE, + DDOG_CONFIGURATION_ORIGIN_DD_CONFIG, + DDOG_CONFIGURATION_ORIGIN_REMOTE_CONFIG, + DDOG_CONFIGURATION_ORIGIN_DEFAULT, + DDOG_CONFIGURATION_ORIGIN_LOCAL_STABLE_CONFIG, + DDOG_CONFIGURATION_ORIGIN_FLEET_STABLE_CONFIG, + DDOG_CONFIGURATION_ORIGIN_CALCULATED, +} ddog_ConfigurationOrigin; + +typedef enum ddog_MetricType { + DDOG_METRIC_TYPE_GAUGE, + DDOG_METRIC_TYPE_COUNT, + DDOG_METRIC_TYPE_DISTRIBUTION, +} ddog_MetricType; + typedef enum ddog_MetricNamespace { DDOG_METRIC_NAMESPACE_TRACERS, DDOG_METRIC_NAMESPACE_PROFILERS, @@ -328,20 +348,17 @@ typedef enum ddog_MetricNamespace { DDOG_METRIC_NAMESPACE_SIDECAR, } ddog_MetricNamespace; -typedef enum ddog_MetricType { - DDOG_METRIC_TYPE_GAUGE, - DDOG_METRIC_TYPE_COUNT, - DDOG_METRIC_TYPE_DISTRIBUTION, -} ddog_MetricType; - -typedef enum ddog_ProbeStatus { - DDOG_PROBE_STATUS_RECEIVED, - DDOG_PROBE_STATUS_INSTALLED, - DDOG_PROBE_STATUS_EMITTING, - DDOG_PROBE_STATUS_ERROR, - DDOG_PROBE_STATUS_BLOCKED, - DDOG_PROBE_STATUS_WARNING, -} ddog_ProbeStatus; +typedef enum ddog_RemoteConfigProduct { + DDOG_REMOTE_CONFIG_PRODUCT_AGENT_CONFIG, + DDOG_REMOTE_CONFIG_PRODUCT_AGENT_TASK, + DDOG_REMOTE_CONFIG_PRODUCT_APM_TRACING, + DDOG_REMOTE_CONFIG_PRODUCT_ASM, + DDOG_REMOTE_CONFIG_PRODUCT_ASM_DATA, + DDOG_REMOTE_CONFIG_PRODUCT_ASM_DD, + DDOG_REMOTE_CONFIG_PRODUCT_ASM_FEATURES, + DDOG_REMOTE_CONFIG_PRODUCT_FFE_FLAGS, + DDOG_REMOTE_CONFIG_PRODUCT_LIVE_DEBUGGER, +} ddog_RemoteConfigProduct; typedef enum ddog_RemoteConfigCapabilities { DDOG_REMOTE_CONFIG_CAPABILITIES_ASM_ACTIVATION = 1, @@ -390,23 +407,6 @@ typedef enum ddog_RemoteConfigCapabilities { DDOG_REMOTE_CONFIG_CAPABILITIES_FFE_FLAG_CONFIGURATION_RULES = 46, } ddog_RemoteConfigCapabilities; -typedef enum ddog_RemoteConfigProduct { - DDOG_REMOTE_CONFIG_PRODUCT_AGENT_CONFIG, - DDOG_REMOTE_CONFIG_PRODUCT_AGENT_TASK, - DDOG_REMOTE_CONFIG_PRODUCT_APM_TRACING, - DDOG_REMOTE_CONFIG_PRODUCT_ASM, - DDOG_REMOTE_CONFIG_PRODUCT_ASM_DATA, - DDOG_REMOTE_CONFIG_PRODUCT_ASM_DD, - DDOG_REMOTE_CONFIG_PRODUCT_ASM_FEATURES, - DDOG_REMOTE_CONFIG_PRODUCT_FFE_FLAGS, - DDOG_REMOTE_CONFIG_PRODUCT_LIVE_DEBUGGER, -} ddog_RemoteConfigProduct; - -typedef enum ddog_SpanProbeTarget { - DDOG_SPAN_PROBE_TARGET_ACTIVE, - DDOG_SPAN_PROBE_TARGET_ROOT, -} ddog_SpanProbeTarget; - typedef struct ddog_DebuggerPayload ddog_DebuggerPayload; typedef struct ddog_DslString ddog_DslString; @@ -777,18 +777,18 @@ typedef struct ddog_DebuggerValue ddog_DebuggerValue; #define ddog_EVALUATOR_RESULT_REDACTED (const void*)-2 -typedef enum ddog_DebuggerType { - DDOG_DEBUGGER_TYPE_DIAGNOSTICS, - DDOG_DEBUGGER_TYPE_SNAPSHOTS, - DDOG_DEBUGGER_TYPE_LOGS, -} ddog_DebuggerType; - typedef enum ddog_FieldType { DDOG_FIELD_TYPE_STATIC, DDOG_FIELD_TYPE_ARG, DDOG_FIELD_TYPE_LOCAL, } ddog_FieldType; +typedef enum ddog_DebuggerType { + DDOG_DEBUGGER_TYPE_DIAGNOSTICS, + DDOG_DEBUGGER_TYPE_SNAPSHOTS, + DDOG_DEBUGGER_TYPE_LOGS, +} ddog_DebuggerType; + typedef struct ddog_Entry ddog_Entry; typedef struct ddog_HashMap_CowStr__Value ddog_HashMap_CowStr__Value; @@ -917,16 +917,6 @@ typedef struct ddog_OwnedCharSlice { void (*free)(ddog_CharSlice); } ddog_OwnedCharSlice; -typedef enum ddog_LogLevel { - DDOG_LOG_LEVEL_ERROR, - DDOG_LOG_LEVEL_WARN, - DDOG_LOG_LEVEL_DEBUG, -} ddog_LogLevel; - -typedef enum ddog_TelemetryWorkerBuilderBoolProperty { - DDOG_TELEMETRY_WORKER_BUILDER_BOOL_PROPERTY_CONFIG_TELEMETRY_DEBUG_LOGGING_ENABLED, -} ddog_TelemetryWorkerBuilderBoolProperty; - typedef enum ddog_TelemetryWorkerBuilderEndpointProperty { DDOG_TELEMETRY_WORKER_BUILDER_ENDPOINT_PROPERTY_CONFIG_ENDPOINT, } ddog_TelemetryWorkerBuilderEndpointProperty; @@ -945,6 +935,16 @@ typedef enum ddog_TelemetryWorkerBuilderStrProperty { DDOG_TELEMETRY_WORKER_BUILDER_STR_PROPERTY_RUNTIME_ID, } ddog_TelemetryWorkerBuilderStrProperty; +typedef enum ddog_TelemetryWorkerBuilderBoolProperty { + DDOG_TELEMETRY_WORKER_BUILDER_BOOL_PROPERTY_CONFIG_TELEMETRY_DEBUG_LOGGING_ENABLED, +} ddog_TelemetryWorkerBuilderBoolProperty; + +typedef enum ddog_LogLevel { + DDOG_LOG_LEVEL_ERROR, + DDOG_LOG_LEVEL_WARN, + DDOG_LOG_LEVEL_DEBUG, +} ddog_LogLevel; + typedef struct ddog_TelemetryWorkerBuilder ddog_TelemetryWorkerBuilder; /** @@ -998,12 +998,6 @@ typedef struct ddog_AttributeAnyValueBytes ddog_AttributeAnyValueBytes; typedef struct ddog_AttributeArrayValueBytes ddog_AttributeArrayValueBytes; -typedef enum ddog_DynamicInstrumentationConfigState { - DDOG_DYNAMIC_INSTRUMENTATION_CONFIG_STATE_ENABLED, - DDOG_DYNAMIC_INSTRUMENTATION_CONFIG_STATE_DISABLED, - DDOG_DYNAMIC_INSTRUMENTATION_CONFIG_STATE_NOT_SET, -} ddog_DynamicInstrumentationConfigState; - typedef enum ddog_Method { DDOG_METHOD_GET = 0, DDOG_METHOD_POST = 1, @@ -1017,6 +1011,12 @@ typedef enum ddog_Method { DDOG_METHOD_OTHER = 9, } ddog_Method; +typedef enum ddog_DynamicInstrumentationConfigState { + DDOG_DYNAMIC_INSTRUMENTATION_CONFIG_STATE_ENABLED, + DDOG_DYNAMIC_INSTRUMENTATION_CONFIG_STATE_DISABLED, + DDOG_DYNAMIC_INSTRUMENTATION_CONFIG_STATE_NOT_SET, +} ddog_DynamicInstrumentationConfigState; + typedef struct ddog_AgentInfoReader ddog_AgentInfoReader; typedef struct ddog_AgentRemoteConfigReader ddog_AgentRemoteConfigReader; @@ -1096,37 +1096,28 @@ typedef struct ddog_SenderParameters { ddog_CharSlice url; } ddog_SenderParameters; -typedef enum ddog_crasht_BuildIdType { - DDOG_CRASHT_BUILD_ID_TYPE_GNU, - DDOG_CRASHT_BUILD_ID_TYPE_GO, - DDOG_CRASHT_BUILD_ID_TYPE_PDB, - DDOG_CRASHT_BUILD_ID_TYPE_SHA1, -} ddog_crasht_BuildIdType; - /** - * Result type for runtime callback registration + * Stacktrace collection occurs in the context of a crashing process. + * If the stack is sufficiently corruputed, it is possible (but unlikely), + * for stack trace collection itself to crash. + * We recommend fully enabling stacktrace collection, but having an environment + * variable to allow downgrading the collector. */ -typedef enum ddog_crasht_CallbackResult { - DDOG_CRASHT_CALLBACK_RESULT_OK, - DDOG_CRASHT_CALLBACK_RESULT_ERROR, -} ddog_crasht_CallbackResult; - -typedef enum ddog_crasht_DemangleOptions { - DDOG_CRASHT_DEMANGLE_OPTIONS_COMPLETE, - DDOG_CRASHT_DEMANGLE_OPTIONS_NAME_ONLY, -} ddog_crasht_DemangleOptions; - -typedef enum ddog_crasht_ErrorKind { - DDOG_CRASHT_ERROR_KIND_PANIC, - DDOG_CRASHT_ERROR_KIND_UNHANDLED_EXCEPTION, - DDOG_CRASHT_ERROR_KIND_UNIX_SIGNAL, -} ddog_crasht_ErrorKind; - -typedef enum ddog_crasht_FileType { - DDOG_CRASHT_FILE_TYPE_APK, - DDOG_CRASHT_FILE_TYPE_ELF, - DDOG_CRASHT_FILE_TYPE_PE, -} ddog_crasht_FileType; +typedef enum ddog_crasht_StacktraceCollection { + /** + * Stacktrace collection occurs in the + */ + DDOG_CRASHT_STACKTRACE_COLLECTION_DISABLED, + DDOG_CRASHT_STACKTRACE_COLLECTION_WITHOUT_SYMBOLS, + /** + * This option uses `backtrace::resolve_frame_unsynchronized()` to gather symbol information + * and also unwind inlined functions. Enabling this feature will not only provide symbolic + * details, but may also yield additional or less stack frames compared to other + * configurations. + */ + DDOG_CRASHT_STACKTRACE_COLLECTION_ENABLED_WITH_INPROCESS_SYMBOLS, + DDOG_CRASHT_STACKTRACE_COLLECTION_ENABLED_WITH_SYMBOLS_IN_RECEIVER, +} ddog_crasht_StacktraceCollection; /** * This enum represents operations a the tracked library might be engaged in. @@ -1151,6 +1142,12 @@ typedef enum ddog_crasht_OpTypes { DDOG_CRASHT_OP_TYPES_SIZE, } ddog_crasht_OpTypes; +typedef enum ddog_crasht_ErrorKind { + DDOG_CRASHT_ERROR_KIND_PANIC, + DDOG_CRASHT_ERROR_KIND_UNHANDLED_EXCEPTION, + DDOG_CRASHT_ERROR_KIND_UNIX_SIGNAL, +} ddog_crasht_ErrorKind; + /** * See https://man7.org/linux/man-pages/man2/sigaction.2.html * MUST REMAIN IN SYNC WITH THE ENUM IN emit_sigcodes.c @@ -1223,28 +1220,31 @@ typedef enum ddog_crasht_SignalNames { DDOG_CRASHT_SIGNAL_NAMES_UNKNOWN, } ddog_crasht_SignalNames; +typedef enum ddog_crasht_BuildIdType { + DDOG_CRASHT_BUILD_ID_TYPE_GNU, + DDOG_CRASHT_BUILD_ID_TYPE_GO, + DDOG_CRASHT_BUILD_ID_TYPE_PDB, + DDOG_CRASHT_BUILD_ID_TYPE_SHA1, +} ddog_crasht_BuildIdType; + +typedef enum ddog_crasht_FileType { + DDOG_CRASHT_FILE_TYPE_APK, + DDOG_CRASHT_FILE_TYPE_ELF, + DDOG_CRASHT_FILE_TYPE_PE, +} ddog_crasht_FileType; + +typedef enum ddog_crasht_DemangleOptions { + DDOG_CRASHT_DEMANGLE_OPTIONS_COMPLETE, + DDOG_CRASHT_DEMANGLE_OPTIONS_NAME_ONLY, +} ddog_crasht_DemangleOptions; + /** - * Stacktrace collection occurs in the context of a crashing process. - * If the stack is sufficiently corruputed, it is possible (but unlikely), - * for stack trace collection itself to crash. - * We recommend fully enabling stacktrace collection, but having an environment - * variable to allow downgrading the collector. + * Result type for runtime callback registration */ -typedef enum ddog_crasht_StacktraceCollection { - /** - * Stacktrace collection occurs in the - */ - DDOG_CRASHT_STACKTRACE_COLLECTION_DISABLED, - DDOG_CRASHT_STACKTRACE_COLLECTION_WITHOUT_SYMBOLS, - /** - * This option uses `backtrace::resolve_frame_unsynchronized()` to gather symbol information - * and also unwind inlined functions. Enabling this feature will not only provide symbolic - * details, but may also yield additional or less stack frames compared to other - * configurations. - */ - DDOG_CRASHT_STACKTRACE_COLLECTION_ENABLED_WITH_INPROCESS_SYMBOLS, - DDOG_CRASHT_STACKTRACE_COLLECTION_ENABLED_WITH_SYMBOLS_IN_RECEIVER, -} ddog_crasht_StacktraceCollection; +typedef enum ddog_crasht_CallbackResult { + DDOG_CRASHT_CALLBACK_RESULT_OK, + DDOG_CRASHT_CALLBACK_RESULT_ERROR, +} ddog_crasht_CallbackResult; typedef struct ddog_crasht_CrashInfo ddog_crasht_CrashInfo; diff --git a/components-rs/sidecar.h b/components-rs/sidecar.h index 2d694f9150..f3a586449f 100644 --- a/components-rs/sidecar.h +++ b/components-rs/sidecar.h @@ -92,6 +92,16 @@ void ddog_sidecar_transport_drop(struct ddog_SidecarTransport*); */ ddog_MaybeError ddog_sidecar_connect(struct ddog_SidecarTransport **connection); +ddog_MaybeError ddog_sidecar_connect_master(int32_t pid); + +ddog_MaybeError ddog_sidecar_connect_worker(int32_t pid, struct ddog_SidecarTransport **connection); + +ddog_MaybeError ddog_sidecar_shutdown_master_listener(void); + +bool ddog_sidecar_is_master_listener_active(int32_t pid); + +ddog_MaybeError ddog_sidecar_clear_inherited_listener(void); + ddog_MaybeError ddog_sidecar_ping(struct ddog_SidecarTransport **transport); ddog_MaybeError ddog_sidecar_flush_traces(struct ddog_SidecarTransport **transport); diff --git a/ext/coms.c b/ext/coms.c index d79e7ea408..1b0185aba4 100644 --- a/ext/coms.c +++ b/ext/coms.c @@ -1500,6 +1500,11 @@ bool ddtrace_coms_flush_shutdown_writer_synchronous(void) { bool ddtrace_coms_synchronous_flush(uint32_t timeout) { struct _writer_loop_data_t *writer = _dd_get_writer(); + + if (!writer->thread) { + return false; + } + uint32_t previous_writer_cycle = atomic_load(&writer->writer_cycle); uint32_t previous_processed_stacks_total = atomic_load(&writer->flush_processed_stacks_total); int64_t old_flush_interval = atomic_load(&writer->flush_interval); diff --git a/ext/configuration.c b/ext/configuration.c index 5e6e0bfca7..71fa4c0951 100644 --- a/ext/configuration.c +++ b/ext/configuration.c @@ -96,6 +96,21 @@ static bool dd_parse_sampling_rules_format(zai_str value, zval *decoded_value, b return true; } +static bool dd_parse_sidecar_connection_mode(zai_str value, zval *decoded_value, bool persistent) { + UNUSED(persistent); + if (zai_str_eq_ci_cstr(value, "auto")) { + ZVAL_LONG(decoded_value, DD_TRACE_SIDECAR_CONNECTION_MODE_AUTO); + } else if (zai_str_eq_ci_cstr(value, "subprocess")) { + ZVAL_LONG(decoded_value, DD_TRACE_SIDECAR_CONNECTION_MODE_SUBPROCESS); + } else if (zai_str_eq_ci_cstr(value, "thread")) { + ZVAL_LONG(decoded_value, DD_TRACE_SIDECAR_CONNECTION_MODE_THREAD); + } else { + return false; + } + + return true; +} + static bool dd_parse_tags(zai_str value, zval *decoded_value, bool persistent) { ZVAL_ARR(decoded_value, pemalloc(sizeof(HashTable), persistent)); zend_hash_init(Z_ARR_P(decoded_value), 8, NULL, persistent ? ZVAL_INTERNAL_PTR_DTOR : ZVAL_PTR_DTOR, persistent); diff --git a/ext/configuration.h b/ext/configuration.h index 8984674f68..c4d8b11699 100644 --- a/ext/configuration.h +++ b/ext/configuration.h @@ -30,6 +30,12 @@ enum ddtrace_sampling_rules_format { DD_TRACE_SAMPLING_RULES_FORMAT_GLOB }; +enum ddtrace_sidecar_connection_mode { + DD_TRACE_SIDECAR_CONNECTION_MODE_AUTO = 0, // Default: try subprocess, fallback to thread + DD_TRACE_SIDECAR_CONNECTION_MODE_SUBPROCESS = 1, // Force subprocess only + DD_TRACE_SIDECAR_CONNECTION_MODE_THREAD = 2, // Force thread only +}; + /* From the curl docs on CONNECT_TIMEOUT_MS: * If libcurl is built to use the standard system name resolver, that * portion of the transfer will still use full-second resolution for @@ -225,6 +231,7 @@ enum ddtrace_sampling_rules_format { CONFIG(STRING, DD_TRACE_AGENT_TEST_SESSION_TOKEN, "", .ini_change = ddtrace_alter_test_session_token) \ CONFIG(BOOL, DD_TRACE_PROPAGATE_USER_ID_DEFAULT, "false") \ CONFIG(CUSTOM(INT), DD_DBM_PROPAGATION_MODE, "disabled", .parser = dd_parse_dbm_mode) \ + CONFIG(CUSTOM(INT), DD_TRACE_SIDECAR_CONNECTION_MODE, "auto", .parser = dd_parse_sidecar_connection_mode) \ CONFIG(SET, DD_TRACE_WORDPRESS_ADDITIONAL_ACTIONS, "") \ CONFIG(BOOL, DD_TRACE_WORDPRESS_CALLBACKS, "true") \ CONFIG(BOOL, DD_INTEGRATION_METRICS_ENABLED, "true", \ diff --git a/ext/ddtrace.c b/ext/ddtrace.c index e636e10468..525ccd275f 100644 --- a/ext/ddtrace.c +++ b/ext/ddtrace.c @@ -454,10 +454,7 @@ static void dd_activate_once(void) { } // if we're to enable appsec, we need to enable sidecar - bool enable_sidecar = ddtrace_sidecar_maybe_enable_appsec(&appsec_activation, &appsec_config); - if (!enable_sidecar) { - enable_sidecar = get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED() || get_global_DD_TRACE_SIDECAR_TRACE_SENDER(); - } + bool enable_sidecar = ddtrace_sidecar_should_enable(&appsec_activation, &appsec_config); if (enable_sidecar) #endif @@ -1530,6 +1527,7 @@ static PHP_MINIT_FUNCTION(ddtrace) { #endif ddshared_minit(); ddtrace_autoload_minit(); + ddtrace_sidecar_minit(); dd_register_span_data_ce(); dd_register_fatal_error_ce(); @@ -2661,6 +2659,8 @@ void dd_internal_handle_fork(void) { ddtrace_coms_clean_background_sender_after_fork(); } #endif + + ddtrace_sidecar_handle_fork(); if (DDTRACE_G(agent_config_reader)) { ddog_agent_remote_config_reader_drop(DDTRACE_G(agent_config_reader)); DDTRACE_G(agent_config_reader) = NULL; @@ -2675,7 +2675,6 @@ void dd_internal_handle_fork(void) { } ddtrace_seed_prng(); ddtrace_generate_runtime_id(); - ddtrace_reset_sidecar(); if (!get_DD_TRACE_FORKED_PROCESS()) { ddtrace_disable_tracing_in_current_request(); } diff --git a/ext/sidecar.c b/ext/sidecar.c index 73b653fd7c..89de0b5600 100644 --- a/ext/sidecar.c +++ b/ext/sidecar.c @@ -1,3 +1,5 @@ +#include +#include
#include "ddtrace.h" #include "auto_flush.h" #include "compat_string.h" @@ -27,6 +29,10 @@ ddog_Endpoint *dogstatsd_endpoint; // always set when ddtrace_endpoint is set struct ddog_InstanceId *ddtrace_sidecar_instance_id; static uint8_t dd_sidecar_formatted_session_id[36]; +// Connection mode tracking +dd_sidecar_active_mode_t ddtrace_sidecar_active_mode = DD_SIDECAR_CONNECTION_NONE; +int32_t ddtrace_sidecar_master_pid = 0; + static inline void dd_set_endpoint_test_token(ddog_Endpoint *endpoint) { if (zai_config_is_initialized()) { if (ZSTR_LEN(get_DD_TRACE_AGENT_TEST_SESSION_TOKEN())) { @@ -133,6 +139,10 @@ void ddtrace_sidecar_update_process_tags(void) { ddog_sidecar_session_set_process_tags(&ddtrace_sidecar, session_id, dd_zend_string_to_CharSlice(process_tags)); } +static ddog_SidecarTransport *dd_sidecar_connection_factory_ex(bool is_fork); +static ddog_SidecarTransport *dd_sidecar_connection_factory_thread(void); +static void ddtrace_sidecar_setup_thread_mode(bool appsec_activation, bool appsec_config); + static void dd_sidecar_on_reconnect(ddog_SidecarTransport *transport) { if (!ddtrace_endpoint || !dogstatsd_endpoint) { return; @@ -188,8 +198,7 @@ static void dd_sidecar_on_reconnect(ddog_SidecarTransport *transport) { } -static ddog_SidecarTransport *dd_sidecar_connection_factory_ex(bool is_fork) { - // Should not happen, unless the agent url is malformed +static ddog_SidecarTransport *dd_sidecar_connect(bool as_worker, bool is_fork) { if (!ddtrace_endpoint) { return NULL; } @@ -198,19 +207,36 @@ static ddog_SidecarTransport *dd_sidecar_connection_factory_ex(bool is_fork) { dd_set_endpoint_test_token(dogstatsd_endpoint); #ifdef _WIN32 - DDOG_PHP_FUNCTION = (const uint8_t *)zend_hash_func; -#endif - + char logpath[MAX_PATH]; + if (!as_worker) { + DDOG_PHP_FUNCTION = (const uint8_t *)zend_hash_func; + } +#else char logpath[MAXPATHLEN]; +#endif int error_fd = atomic_load(&ddtrace_error_log_fd); if (error_fd == -1 || ddtrace_get_fd_path(error_fd, logpath) < 0) { *logpath = 0; } ddog_SidecarTransport *sidecar_transport; - if (!ddtrace_ffi_try("Failed connecting to the sidecar", ddog_sidecar_connect_php(&sidecar_transport, logpath, dd_zend_string_to_CharSlice(get_global_DD_TRACE_LOG_LEVEL()), get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED(), dd_sidecar_on_reconnect, ddtrace_endpoint))) { - dd_free_endpoints(); - return NULL; + if (as_worker) { + if (!ddtrace_ffi_try("Failed connecting to sidecar as worker", + ddog_sidecar_connect_worker((int32_t)ddtrace_sidecar_master_pid, &sidecar_transport))) { + dd_free_endpoints(); + return NULL; + } + ddtrace_sidecar_active_mode = DD_SIDECAR_CONNECTION_THREAD; + } else { + if (!ddtrace_ffi_try("Failed connecting to sidecar (subprocess mode)", + ddog_sidecar_connect_php(&sidecar_transport, logpath, + dd_zend_string_to_CharSlice(get_global_DD_TRACE_LOG_LEVEL()), + get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED(), + dd_sidecar_on_reconnect, + ddtrace_endpoint))) { + return NULL; + } + ddtrace_sidecar_active_mode = DD_SIDECAR_CONNECTION_SUBPROCESS; } dd_sidecar_post_connect(&sidecar_transport, is_fork, logpath); @@ -218,8 +244,104 @@ static ddog_SidecarTransport *dd_sidecar_connection_factory_ex(bool is_fork) { return sidecar_transport; } -ddog_SidecarTransport *dd_sidecar_connection_factory(void) { - return dd_sidecar_connection_factory_ex(false); +static void ddtrace_sidecar_setup_thread_mode(bool appsec_activation, bool appsec_config) { +#ifdef _WIN32 + int32_t current_pid = (int32_t)GetCurrentProcessId(); +#else + int32_t current_pid = (int32_t)getpid(); +#endif + bool is_child_process = (ddtrace_sidecar_master_pid != 0 && current_pid != ddtrace_sidecar_master_pid); + + bool listener_available = ddog_sidecar_is_master_listener_active(ddtrace_sidecar_master_pid); + + if (is_child_process || listener_available) { + ddtrace_sidecar = dd_sidecar_connect(true, false); + if (!ddtrace_sidecar) { + LOG(WARN, "Failed to connect worker to sidecar (PID=%d, master=%d)", + (int32_t)current_pid, ddtrace_sidecar_master_pid); + return; + } + + if (is_child_process) { + LOG(INFO, "Worker connected to sidecar master listener (worker PID=%d, master PID=%d)", + (int32_t)current_pid, ddtrace_sidecar_master_pid); + } + return; + } + + if (!ddtrace_ffi_try("Failed starting sidecar master listener", ddog_sidecar_connect_master((int32_t)ddtrace_sidecar_master_pid))) { + LOG(WARN, "Failed to start sidecar master listener"); + if (ddtrace_endpoint) { + dd_free_endpoints(); + } + return; + } + + LOG(INFO, "Started sidecar master listener thread (PID=%d)", ddtrace_sidecar_master_pid); + + ddtrace_sidecar = dd_sidecar_connect(true, false); + if (!ddtrace_sidecar) { + LOG(WARN, "Failed to connect master process to sidecar"); + return; + } + + if (get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED()) { + ddtrace_telemetry_first_init(); + } +} + +ddog_SidecarTransport *ddtrace_sidecar_connect(bool is_fork) { + if (ddtrace_sidecar_active_mode == DD_SIDECAR_CONNECTION_SUBPROCESS) { + return dd_sidecar_connect(false, is_fork); + } else if (ddtrace_sidecar_active_mode == DD_SIDECAR_CONNECTION_THREAD) { + return dd_sidecar_connect(true, is_fork); + } + + zend_long mode = get_global_DD_TRACE_SIDECAR_CONNECTION_MODE(); + ddog_SidecarTransport *transport = NULL; + + switch (mode) { + case DD_TRACE_SIDECAR_CONNECTION_MODE_SUBPROCESS: + // Force subprocess only + transport = dd_sidecar_connect(false, is_fork); + if (!transport) { + LOG(ERROR, "Subprocess connection failed (mode=subprocess, no fallback)"); + } + break; + + case DD_TRACE_SIDECAR_CONNECTION_MODE_THREAD: + // Force thread only + transport = dd_sidecar_connect(true, is_fork); + if (!transport) { + LOG(ERROR, "Thread connection failed (mode=thread, no fallback)"); + } + break; + + case DD_TRACE_SIDECAR_CONNECTION_MODE_AUTO: + default: + // Try subprocess first, fallback to thread if needed + transport = dd_sidecar_connect(false, is_fork); + + if (!transport) { + if (ddtrace_endpoint) { + LOG(WARN, "Subprocess connection failed, falling back to thread mode"); + transport = dd_sidecar_connect(true, is_fork); + + if (transport) { + LOG(INFO, "Connected to sidecar via thread (fallback)"); + } else { + LOG(ERROR, "Both subprocess and thread connections failed, sidecar unavailable"); + } + } + } + break; + } + + return transport; +} + +static ddog_SidecarTransport *ddtrace_sidecar_connect_callback(void) { + return ddtrace_sidecar_connect(false); } bool ddtrace_sidecar_maybe_enable_appsec(bool *appsec_activation, bool *appsec_config) { @@ -246,27 +368,123 @@ bool ddtrace_sidecar_maybe_enable_appsec(bool *appsec_activation, bool *appsec_c #endif } +bool ddtrace_sidecar_should_enable(bool *appsec_activation, bool *appsec_config) { + bool enable_sidecar = ddtrace_sidecar_maybe_enable_appsec(appsec_activation, appsec_config); + if (!enable_sidecar) { + enable_sidecar = get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED() || + get_global_DD_TRACE_SIDECAR_TRACE_SENDER(); + } + return enable_sidecar; +} + void ddtrace_sidecar_setup(bool appsec_activation, bool appsec_config) { ddtrace_set_non_resettable_sidecar_globals(); ddtrace_set_resettable_sidecar_globals(); ddog_init_remote_config(get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED(), appsec_activation, appsec_config); - ddtrace_sidecar = dd_sidecar_connection_factory(); - if (!ddtrace_sidecar) { // Something went wrong + zend_long mode = get_global_DD_TRACE_SIDECAR_CONNECTION_MODE(); + + if (mode == DD_TRACE_SIDECAR_CONNECTION_MODE_THREAD) { + ddtrace_sidecar_setup_thread_mode(appsec_activation, appsec_config); + return; + } + + ddtrace_sidecar = dd_sidecar_connect(false, false); + + if (!ddtrace_sidecar) { + if (mode == DD_TRACE_SIDECAR_CONNECTION_MODE_AUTO && ddtrace_endpoint) { + LOG(WARN, "Subprocess connection failed, falling back to thread mode"); + ddtrace_sidecar_setup_thread_mode(appsec_activation, appsec_config); + return; + } + if (ddtrace_endpoint) { dd_free_endpoints(); } + } else if (get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED()) { + ddtrace_telemetry_first_init(); } +} - if (get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED()) { - ddtrace_telemetry_first_init(); +void ddtrace_sidecar_minit(void) { +#ifdef _WIN32 + ddtrace_sidecar_master_pid = (int32_t)GetCurrentProcessId(); +#else + ddtrace_sidecar_master_pid = (int32_t)getpid(); +#endif + + zend_long mode = get_global_DD_TRACE_SIDECAR_CONNECTION_MODE(); + + if (mode == DD_TRACE_SIDECAR_CONNECTION_MODE_THREAD) { + ddtrace_ffi_try("Starting sidecar master listener in MINIT", + ddog_sidecar_connect_master(ddtrace_sidecar_master_pid)); } } +void ddtrace_sidecar_handle_fork(void) { +#ifndef _WIN32 + bool appsec_activation = false; + bool appsec_config = false; + bool enable_sidecar = ddtrace_sidecar_should_enable(&appsec_activation, &appsec_config); + + if (!enable_sidecar) { + return; + } + + ddtrace_force_new_instance_id(); + + if (ddtrace_sidecar) { + ddog_sidecar_transport_drop(ddtrace_sidecar); + ddtrace_sidecar = NULL; + } + + if (ddtrace_sidecar_active_mode == DD_SIDECAR_CONNECTION_THREAD) { + ddtrace_ffi_try("Failed clearing inherited listener state", + ddog_sidecar_clear_inherited_listener()); + + // Try to connect as a worker to parent's listener + ddtrace_sidecar = dd_sidecar_connect(true, true); + if (ddtrace_sidecar) { + LOG(INFO, "Child process reconnected to parent's sidecar listener after fork (child PID=%d, parent=%d)", + (int32_t)getpid(), ddtrace_sidecar_master_pid); + return; + } + + // Parent's listener not available, fall back to starting a new master in this process + LOG(INFO, "Parent's sidecar listener not available after fork (child PID=%d, parent=%d), starting new master", + (int32_t)getpid(), ddtrace_sidecar_master_pid); + + ddtrace_sidecar_master_pid = (int32_t)getpid(); + if (!ddtrace_ffi_try("Failed starting sidecar master listener in child process", + ddog_sidecar_connect_master((int32_t)ddtrace_sidecar_master_pid))) { + if (ddtrace_endpoint) { + dd_free_endpoints(); + } + return; + } + + ddtrace_sidecar = dd_sidecar_connect(true, false); + if (!ddtrace_sidecar) { + LOG(WARN, "Failed to connect to new sidecar master in child process (PID=%d)", + (int32_t)getpid()); + } + } else if (ddtrace_sidecar_active_mode == DD_SIDECAR_CONNECTION_SUBPROCESS) { + ddtrace_sidecar = ddtrace_sidecar_connect(true); + if (!ddtrace_sidecar) { + if (ddtrace_endpoint) { + dd_free_endpoints(); + } + } else { + ddtrace_sidecar_submit_root_span_data(); + } + } +#endif +} + void ddtrace_sidecar_ensure_active(void) { if (ddtrace_sidecar) { - ddtrace_sidecar_reconnect(&ddtrace_sidecar, dd_sidecar_connection_factory); + ddtrace_sidecar_reconnect(&ddtrace_sidecar, ddtrace_sidecar_connect_callback); } } @@ -291,8 +509,31 @@ void ddtrace_sidecar_finalize(bool clear_id) { } void ddtrace_sidecar_shutdown(void) { + // Shutdown master listener if this is the master process and thread mode is active +#ifdef _WIN32 + int32_t current_pid = (int32_t)GetCurrentProcessId(); +#else + int32_t current_pid = (int32_t)getpid(); +#endif + if (ddtrace_sidecar_active_mode == DD_SIDECAR_CONNECTION_THREAD && + ddtrace_sidecar_master_pid != 0 && + current_pid == ddtrace_sidecar_master_pid) { + + // Close worker connection first to avoid deadlock + if (ddtrace_sidecar) { + ddog_sidecar_transport_drop(ddtrace_sidecar); + ddtrace_sidecar = NULL; + } + + // Then shutdown listener thread + ddtrace_ffi_try("Failed shutting down master listener", + ddog_sidecar_shutdown_master_listener()); + } + + // Standard cleanup if (ddtrace_sidecar_instance_id) { ddog_sidecar_instanceId_drop(ddtrace_sidecar_instance_id); + ddtrace_sidecar_instance_id = NULL; } if (ddtrace_endpoint) { @@ -301,7 +542,11 @@ void ddtrace_sidecar_shutdown(void) { if (ddtrace_sidecar) { ddog_sidecar_transport_drop(ddtrace_sidecar); + ddtrace_sidecar = NULL; } + + // Reset mode + ddtrace_sidecar_active_mode = DD_SIDECAR_CONNECTION_NONE; } void ddtrace_force_new_instance_id(void) { @@ -311,22 +556,6 @@ void ddtrace_force_new_instance_id(void) { } } -void ddtrace_reset_sidecar(void) { - ddtrace_force_new_instance_id(); - - if (ddtrace_sidecar) { - ddog_sidecar_transport_drop(ddtrace_sidecar); - ddtrace_sidecar = dd_sidecar_connection_factory_ex(true); - if (!ddtrace_sidecar) { // Something went wrong - if (ddtrace_endpoint) { - dd_free_endpoints(); - } - } else { - ddtrace_sidecar_submit_root_span_data(); - } - } -} - ddog_Endpoint *ddtrace_sidecar_agent_endpoint(void) { ddog_Endpoint *agent_endpoint; diff --git a/ext/sidecar.h b/ext/sidecar.h index 5fa16bd279..b18bea433e 100644 --- a/ext/sidecar.h +++ b/ext/sidecar.h @@ -7,9 +7,18 @@ #include "ddtrace.h" #include "zend_string.h" +// Connection mode tracking +typedef enum { + DD_SIDECAR_CONNECTION_NONE = 0, + DD_SIDECAR_CONNECTION_SUBPROCESS = 1, + DD_SIDECAR_CONNECTION_THREAD = 2 +} dd_sidecar_active_mode_t; + extern ddog_SidecarTransport *ddtrace_sidecar; extern ddog_Endpoint *ddtrace_endpoint; extern struct ddog_InstanceId *ddtrace_sidecar_instance_id; +extern dd_sidecar_active_mode_t ddtrace_sidecar_active_mode; +extern int32_t ddtrace_sidecar_master_pid; DDTRACE_PUBLIC const uint8_t *ddtrace_get_formatted_session_id(void); struct telemetry_rc_info { @@ -20,13 +29,19 @@ struct telemetry_rc_info { }; DDTRACE_PUBLIC struct telemetry_rc_info ddtrace_get_telemetry_rc_info(void); +// Connection functions +ddog_SidecarTransport *ddtrace_sidecar_connect(bool is_fork); + +// Lifecycle functions +void ddtrace_sidecar_minit(void); void ddtrace_sidecar_setup(bool appsec_activation, bool appsec_config); +void ddtrace_sidecar_handle_fork(void); bool ddtrace_sidecar_maybe_enable_appsec(bool *appsec_activation, bool *appsec_config); +bool ddtrace_sidecar_should_enable(bool *appsec_activation, bool *appsec_config); void ddtrace_sidecar_ensure_active(void); void ddtrace_sidecar_update_process_tags(void); void ddtrace_sidecar_finalize(bool clear_id); void ddtrace_sidecar_shutdown(void); -void ddtrace_reset_sidecar(void); void ddtrace_force_new_instance_id(void); void ddtrace_sidecar_submit_root_span_data(void); void ddtrace_sidecar_push_tag(ddog_Vec_Tag *vec, ddog_CharSlice key, ddog_CharSlice value); diff --git a/libdatadog b/libdatadog index a0cef26b02..cc2fb3d1ae 160000 --- a/libdatadog +++ b/libdatadog @@ -1 +1 @@ -Subproject commit a0cef26b0240f19dd994d471d5679e8c426adfc8 +Subproject commit cc2fb3d1ae47cc0cabee323cb96202a318866bbe diff --git a/tests/Integrations/Custom/Autoloaded/SidecarThreadModeTest.php b/tests/Integrations/Custom/Autoloaded/SidecarThreadModeTest.php new file mode 100644 index 0000000000..beb733eb2c --- /dev/null +++ b/tests/Integrations/Custom/Autoloaded/SidecarThreadModeTest.php @@ -0,0 +1,83 @@ + 'sidecar-thread-mode-test', + // Explicitly force thread mode to test the thread implementation + 'DD_TRACE_SIDECAR_CONNECTION_MODE' => 'thread', + 'DD_TRACE_DEBUG' => '0', + ]); + } + + public function testThreadModeTracesAreSubmitted() + { + if (\getenv('DD_TRACE_TEST_SAPI') !== 'fpm-fcgi') { + $this->markTestSkipped('This test requires DD_TRACE_TEST_SAPI=fpm-fcgi'); + } + + // This test validates that when thread mode is explicitly configured, + // traces are successfully submitted through the thread-based sidecar + $traces = $this->tracesFromWebRequest(function () { + $spec = GetSpec::create('Thread mode trace', '/simple?key=value'); + $this->call($spec); + }); + + // Verify traces were submitted + $this->assertNotEmpty($traces, 'Expected traces to be submitted through thread-based sidecar'); + $this->assertCount(1, $traces[0], 'Expected one span in the trace'); + + $span = $traces[0][0]; + $this->assertSame('web.request', $span['name']); + $this->assertSame('sidecar-thread-mode-test', $span['service']); + } + + public function testThreadModeMultipleRequests() + { + if (\getenv('DD_TRACE_TEST_SAPI') !== 'fpm-fcgi') { + $this->markTestSkipped('This test requires DD_TRACE_TEST_SAPI=fpm-fcgi'); + } + + // This test validates that multiple PHP-FPM workers can successfully + // connect to the same master listener thread and submit traces + $traces = $this->tracesFromWebRequest(function () { + for ($i = 0; $i < 3; $i++) { + $spec = GetSpec::create("Request $i", "/simple?request=$i"); + $this->call($spec); + } + }); + + // Verify all traces were submitted + $this->assertGreaterThanOrEqual(3, count($traces), 'Expected at least 3 traces from multiple requests'); + + foreach ($traces as $trace) { + $this->assertNotEmpty($trace); + $this->assertSame('web.request', $trace[0]['name']); + } + } +} diff --git a/tests/Sapi/PhpFpm/PhpFpm.php b/tests/Sapi/PhpFpm/PhpFpm.php index 239e465af8..2da750cfab 100644 --- a/tests/Sapi/PhpFpm/PhpFpm.php +++ b/tests/Sapi/PhpFpm/PhpFpm.php @@ -44,25 +44,33 @@ final class PhpFpm implements Sapi */ private $port; + /** + * @var int + */ + private $maxChildren; + /** * @param string $rootPath * @param string $host * @param int $port * @param array $envs * @param array $inis + * @param int $maxChildren */ - public function __construct($rootPath, $host, $port, array $envs = [], array $inis = []) + public function __construct($rootPath, $host, $port, array $envs = [], array $inis = [], $maxChildren = 1) { $this->envs = $envs; $this->inis = $inis; $this->host = $host; $this->port = $port; + $this->maxChildren = $maxChildren; $logPath = $rootPath . '/' . self::ERROR_LOG; $replacements = [ '{{fcgi_host}}' => $host, '{{fcgi_port}}' => $port, + '{{max_children}}' => $maxChildren, '{{envs}}' => $this->envsForConfFile(), '{{inis}}' => $this->inisForConfFile(), '{{error_log}}' => $logPath, @@ -88,10 +96,17 @@ public function __construct($rootPath, $host, $port, array $envs = [], array $in public function start() { + $allowRoot = ''; + // Check if running as root and add --allow-to-run-as-root flag + if (function_exists('posix_getuid') && posix_getuid() === 0) { + $allowRoot = ' --allow-to-run-as-root'; + } + $cmd = sprintf( - 'php-fpm -p %s --fpm-config %s -F', + 'php-fpm -p %s --fpm-config %s -F%s', __DIR__, - $this->configFile + $this->configFile, + $allowRoot ); $processCmd = "exec $cmd"; diff --git a/tests/Sapi/PhpFpm/www.conf b/tests/Sapi/PhpFpm/www.conf index 6dd5da6df1..a8552244b9 100644 --- a/tests/Sapi/PhpFpm/www.conf +++ b/tests/Sapi/PhpFpm/www.conf @@ -5,7 +5,7 @@ error_log = {{error_log}} listen = {{fcgi_host}}:{{fcgi_port}} pm = static -pm.max_children = 1 +pm.max_children = {{max_children}} pm.status_path = /status catch_workers_output = yes diff --git a/tests/WebServer.php b/tests/WebServer.php index ce7d27c1db..e50639f74b 100644 --- a/tests/WebServer.php +++ b/tests/WebServer.php @@ -80,6 +80,7 @@ final class WebServer private $isOctane = false; private $isFrankenphp = false; private $isSwoole = false; + private $phpFpmMaxChildren = 1; private $defaultInis = [ 'log_errors' => 'on', @@ -132,6 +133,11 @@ public function setFrankenphp() $this->isFrankenphp = true; } + public function setPhpFpmMaxChildren($maxChildren) + { + $this->phpFpmMaxChildren = $maxChildren; + } + public function start() { if (!isset($this->envs['DD_TRACE_DEBUG'])) { @@ -192,7 +198,8 @@ public function start() self::FCGI_HOST, self::FCGI_PORT, $this->envs, - $this->inis + $this->inis, + $this->phpFpmMaxChildren ); break; case 'apache2handler': diff --git a/tests/ext/sidecar_connection_mode_auto.phpt b/tests/ext/sidecar_connection_mode_auto.phpt new file mode 100644 index 0000000000..449899f8d2 --- /dev/null +++ b/tests/ext/sidecar_connection_mode_auto.phpt @@ -0,0 +1,24 @@ +--TEST-- +Sidecar connection in auto mode (default) +--SKIPIF-- + +--ENV-- +DD_TRACE_SIDECAR_CONNECTION_MODE=auto +DD_INSTRUMENTATION_TELEMETRY_ENABLED=0 +DD_TRACE_SIDECAR_TRACE_SENDER=1 +--FILE-- + +--EXPECT-- +Connection mode: auto +Span created successfully diff --git a/tests/ext/sidecar_connection_mode_config.phpt b/tests/ext/sidecar_connection_mode_config.phpt new file mode 100644 index 0000000000..b7ae94580f --- /dev/null +++ b/tests/ext/sidecar_connection_mode_config.phpt @@ -0,0 +1,16 @@ +--TEST-- +DD_TRACE_SIDECAR_CONNECTION_MODE configuration parsing +--SKIPIF-- + +--ENV-- +DD_TRACE_SIDECAR_CONNECTION_MODE=subprocess +--FILE-- + +--EXPECT-- +Test 1: subprocess mode +string(10) "subprocess" diff --git a/tests/ext/sidecar_connection_mode_invalid.phpt b/tests/ext/sidecar_connection_mode_invalid.phpt new file mode 100644 index 0000000000..69db7138f9 --- /dev/null +++ b/tests/ext/sidecar_connection_mode_invalid.phpt @@ -0,0 +1,24 @@ +--TEST-- +Invalid sidecar connection mode falls back to auto +--SKIPIF-- + +--ENV-- +DD_TRACE_SIDECAR_CONNECTION_MODE=invalid_mode +DD_INSTRUMENTATION_TELEMETRY_ENABLED=0 +DD_TRACE_SIDECAR_TRACE_SENDER=1 +--FILE-- + +--EXPECT-- +Connection mode: auto +Span created successfully diff --git a/tests/ext/sidecar_connection_mode_subprocess.phpt b/tests/ext/sidecar_connection_mode_subprocess.phpt new file mode 100644 index 0000000000..fb10c7a87c --- /dev/null +++ b/tests/ext/sidecar_connection_mode_subprocess.phpt @@ -0,0 +1,24 @@ +--TEST-- +Sidecar connection in subprocess mode +--SKIPIF-- + +--ENV-- +DD_TRACE_SIDECAR_CONNECTION_MODE=subprocess +DD_INSTRUMENTATION_TELEMETRY_ENABLED=0 +DD_TRACE_SIDECAR_TRACE_SENDER=1 +--FILE-- + +--EXPECT-- +Connection mode: subprocess +Span created successfully