Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion utils/telemetry/intake/static/config_norm_rules.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"DD_APM_RECEIVER_SOCKET": "trace_agent_socket",
"DD_APM_TRACING_ENABLED": "apm_tracing_enabled",
"DD_APPLICATION_MONITORING_CONFIG_FILE_ENABLED": "application_monitoring_config_file_enabled",
"DD_APP_LOGS_COLLECTION_ENABLED": "app_logs_collection_enabled",
"DD_APPSEC_AUTOMATED_USER_EVENTS_TRACKING": "appsec_auto_user_events_tracking",
"DD_APPSEC_AUTO_USER_INSTRUMENTATION_MODE": "appsec_auto_user_instrumentation_mode",
"DD_APPSEC_BODY_PARSING_SIZE_LIMIT": "appsec_body_parsing_size_limit",
Expand Down Expand Up @@ -183,7 +184,7 @@
"DD_INSTRUMENTATION_TELEMETRY_COMPRESSION_METHOD": "instrumentation_telemetry_compression_method",
"DD_INSTRUMENTATION_TELEMETRY_ENABLED": "instrumentation_telemetry_enabled",
"DD_INSTRUMENTATION_TELEMETRY_URL": "instrumentation_telemetry_agentless_url",
"DD_INTERAL_FORCE_SYMBOL_DATABASE_UPLOAD": "internal_force_symbol_database_upload",
"DD_INTERNAL_DYNAMIC_INSTRUMENTATION_MAX_PROBES_PER_TYPE": "dynamic_instrumentation_max_probes_per_type",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Restore legacy INTERAL symbol-upload normalization alias

This replacement drops the only allowlisted mapping for DD_INTERAL_FORCE_SYMBOL_DATABASE_UPLOAD; test_config_telemetry_completeness rejects any reported config key not present in normalization rules or prefix block lists (tests/test_telemetry.py checks this at lines 745-753), and there is no fallback prefix for this key. If older tracer versions still emit the legacy misspelled name, telemetry validation will now fail even though it was previously accepted, so the old alias should be kept alongside the new entry for backward compatibility.

Useful? React with 👍 / 👎.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, Codex, since this is an autogenerated PR, I am not going to address this piece of feedback in here.

"DD_INTERNAL_RCM_POLL_INTERVAL": "remote_config_poll_interval",
"DD_INTERNAL_TELEMETRY_DEBUG_ENABLED": "instrumentation_telemetry_debug_enabled",
"DD_INTERNAL_TELEMETRY_V2_ENABLED": "instrumentation_telemetry_v2_enabled",
Expand Down Expand Up @@ -650,6 +651,7 @@
"dd_logs_otel_enabled": "logs_otel_enabled",
"dd_metrics_otel_enabled": "metrics_otel_enabled",
"dd_metrics_otel_meter_names": "metrics_otel_meter_names",
"dd_model_lab_enabled": "model_lab_enabled",
"dd_otel_logs_enabled": "logs_otel_enabled",
"dd_priority_sampling": "trace_priority_sampling_enabled",
"dd_profiling_agentless": "profiling_agentless",
Expand Down
158 changes: 158 additions & 0 deletions utils/telemetry/intake/static/config_prefix_block_list.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[
"_",
"DD_API_KEY",
"DD_APPENDCOMMENT",
"DD_APPLICATION_KEY",
"DD_APPSEC_EVENT_TRACKING_ENABLED",
"DD_APP_KEY",
"DD_AdoNet_",
"DD_Aerospike_",
"DD_AspNetCore_",
Expand All @@ -16,12 +19,17 @@
"DD_AwsSqs_",
"DD_AzureFunctions_",
"DD_AzureServiceBus_",
"DD_COVERAGE_RUN",
"DD_CosmosDb_",
"DD_Couchbase_",
"DD_CurlHandler_",
"DD_DEPENDENCIES_AVAILABLE",
"DD_ElasticsearchNet_",
"DD_FASTAPI_ASYNC_BODY_TIMEOUT_SECONDS",
"DD_GLOBAL_TAG_RUNTIME_ID",
"DD_GraphQL_",
"DD_Grpc_",
"DD_HEAPSNAPSHOT_",
"DD_HarcodedSecret_",
"DD_HashAlgorithm_",
"DD_HotChocolate_",
Expand All @@ -30,6 +38,8 @@
"DD_ILogger_",
"DD_IbmMq_",
"DD_Kafka_",
"DD_LIBDL_PRESENT",
"DD_LLMOBS_APIKEY",
"DD_Ldap_",
"DD_Log4Net_",
"DD_MongoDb_",
Expand All @@ -41,12 +51,21 @@
"DD_Npgsql_",
"DD_OpenTelemetry_",
"DD_Oracle_",
"DD_PROFILING_APIKEY",
"DD_PROFILING_APIKEY_FILE",
"DD_PROFILING_API_KEY",
"DD_PROFILING_API_KEY_FILE",
"DD_PROFILING_PROXY_PASSWORD",
"DD_PROFILING_PROXY_USERNAME",
"DD_PROFILING__FORCE_LEGACY_EXPORTER",
"DD_PYRAMID_DISTRIBUTED_TRACING",
"DD_PYTEST_ADDOPTS",
"DD_PathTraversal_",
"DD_Process_",
"DD_RabbitMQ_",
"DD_Remoting_",
"DD_SAMPLER_SPANSAMPLINGRULES_",
"DD_SR_",
"DD_Serilog_",
"DD_ServiceRemoting_",
"DD_ServiceStackRedis_",
Expand All @@ -56,6 +75,9 @@
"DD_StackExchangeRedis_",
"DD_SymmetricAlgorithm_",
"DD_SystemRandom_",
"DD_TRACE_AMQP_ANALYTICS_ENABLED",
"DD_TRACE_AMQP_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_AMQP_ENABLED",
"DD_TRACE_AdoNet_",
"DD_TRACE_Aerospike_",
"DD_TRACE_AspNetCore_",
Expand All @@ -70,36 +92,159 @@
"DD_TRACE_AwsSqs_",
"DD_TRACE_AzureFunctions_",
"DD_TRACE_AzureServiceBus_",
"DD_TRACE_CAKEPHP_ANALYTICS_ENABLED",
"DD_TRACE_CAKEPHP_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_CAKEPHP_ENABLED",
"DD_TRACE_CODEIGNITER_ANALYTICS_ENABLED",
"DD_TRACE_CODEIGNITER_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_CODEIGNITER_ENABLED",
"DD_TRACE_CURL_ANALYTICS_ENABLED",
"DD_TRACE_CURL_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_CURL_ENABLED",
"DD_TRACE_CosmosDb_",
"DD_TRACE_Couchbase_",
"DD_TRACE_CurlHandler_",
"DD_TRACE_DISCORDPHP_ANALYTICS_ENABLED",
"DD_TRACE_DISCORDPHP_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_DISCORDPHP_ENABLED",
"DD_TRACE_DRUPAL_ANALYTICS_ENABLED",
"DD_TRACE_DRUPAL_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_DRUPAL_ENABLED",
"DD_TRACE_ELASTICSEARCH_ANALYTICS_ENABLED",
"DD_TRACE_ELASTICSEARCH_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_ELASTICSEARCH_ENABLED",
"DD_TRACE_ELOQUENT_ANALYTICS_ENABLED",
"DD_TRACE_ELOQUENT_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_ELOQUENT_ENABLED",
"DD_TRACE_EXEC_ANALYTICS_ENABLED",
"DD_TRACE_EXEC_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_EXEC_ENABLED",
"DD_TRACE_ElasticsearchNet_",
"DD_TRACE_FILESYSTEM_ANALYTICS_ENABLED",
"DD_TRACE_FILESYSTEM_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_FILESYSTEM_ENABLED",
"DD_TRACE_FRANKENPHP_ANALYTICS_ENABLED",
"DD_TRACE_FRANKENPHP_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_FRANKENPHP_ENABLED",
"DD_TRACE_GCP_PUBSUB_",
"DD_TRACE_GOOGLESPANNER_ANALYTICS_ENABLED",
"DD_TRACE_GOOGLESPANNER_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_GOOGLESPANNER_ENABLED",
"DD_TRACE_GUZZLE_ANALYTICS_ENABLED",
"DD_TRACE_GUZZLE_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_GUZZLE_ENABLED",
"DD_TRACE_GraphQL_",
"DD_TRACE_Grpc_",
"DD_TRACE_HTTPSTREAM_ANALYTICS_ENABLED",
"DD_TRACE_HTTPSTREAM_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_HTTPSTREAM_ENABLED",
"DD_TRACE_HardcodedSecret_",
"DD_TRACE_HashAlgorithm_",
"DD_TRACE_HotChocolate_",
"DD_TRACE_HttpMessageHandler_",
"DD_TRACE_HttpSocketsHandler_",
"DD_TRACE_ILogger_",
"DD_TRACE_INTEGRATION_",
"DD_TRACE_IbmMq_",
"DD_TRACE_Kafka_",
"DD_TRACE_LAMINAS_ANALYTICS_ENABLED",
"DD_TRACE_LAMINAS_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_LAMINAS_ENABLED",
"DD_TRACE_LARAVELQUEUE_ANALYTICS_ENABLED",
"DD_TRACE_LARAVELQUEUE_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_LARAVELQUEUE_ENABLED",
"DD_TRACE_LARAVEL_ANALYTICS_ENABLED",
"DD_TRACE_LARAVEL_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_LARAVEL_ENABLED",
"DD_TRACE_LOGS_ANALYTICS_ENABLED",
"DD_TRACE_LOGS_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_LOGS_ENABLED",
"DD_TRACE_LUMEN_ANALYTICS_ENABLED",
"DD_TRACE_LUMEN_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_LUMEN_ENABLED",
"DD_TRACE_Ldap_",
"DD_TRACE_Log4Net_",
"DD_TRACE_MAGENTO_ANALYTICS_ENABLED",
"DD_TRACE_MAGENTO_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_MAGENTO_ENABLED",
"DD_TRACE_MEMCACHED_ANALYTICS_ENABLED",
"DD_TRACE_MEMCACHED_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_MEMCACHED_ENABLED",
"DD_TRACE_MEMCACHE_ANALYTICS_ENABLED",
"DD_TRACE_MEMCACHE_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_MEMCACHE_ENABLED",
"DD_TRACE_MONGODB_ANALYTICS_ENABLED",
"DD_TRACE_MONGODB_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_MONGODB_ENABLED",
"DD_TRACE_MONGO_ANALYTICS_ENABLED",
"DD_TRACE_MONGO_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_MONGO_ENABLED",
"DD_TRACE_MYSQLI_ANALYTICS_ENABLED",
"DD_TRACE_MYSQLI_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_MYSQLI_ENABLED",
"DD_TRACE_MongoDb_",
"DD_TRACE_MsTestV2_",
"DD_TRACE_Msmq_",
"DD_TRACE_MySql_",
"DD_TRACE_NETTE_ANALYTICS_ENABLED",
"DD_TRACE_NETTE_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_NETTE_ENABLED",
"DD_TRACE_NLog_",
"DD_TRACE_NUnit_",
"DD_TRACE_Npgsql_",
"DD_TRACE_OPENAI_ANALYTICS_ENABLED",
"DD_TRACE_OPENAI_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_OPENAI_ENABLED",
"DD_TRACE_OpenTelemetry_",
"DD_TRACE_Oracle_",
"DD_TRACE_PCNTL_ANALYTICS_ENABLED",
"DD_TRACE_PCNTL_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_PCNTL_ENABLED",
"DD_TRACE_PDO_ANALYTICS_ENABLED",
"DD_TRACE_PDO_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_PDO_ENABLED",
"DD_TRACE_PHPREDIS_ANALYTICS_ENABLED",
"DD_TRACE_PHPREDIS_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_PHPREDIS_ENABLED",
"DD_TRACE_PREDIS_ANALYTICS_ENABLED",
"DD_TRACE_PREDIS_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_PREDIS_ENABLED",
"DD_TRACE_PROPAGATION_STYLE_EXTRACT_",
"DD_TRACE_PROPAGATION_STYLE_INJECT_",
"DD_TRACE_PSR18_ANALYTICS_ENABLED",
"DD_TRACE_PSR18_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_PSR18_ENABLED",
"DD_TRACE_PathTraversal_",
"DD_TRACE_Process_",
"DD_TRACE_RATCHET_ANALYTICS_ENABLED",
"DD_TRACE_RATCHET_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_RATCHET_ENABLED",
"DD_TRACE_REACTPROMISE_ANALYTICS_ENABLED",
"DD_TRACE_REACTPROMISE_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_REACTPROMISE_ENABLED",
"DD_TRACE_REVOLT_ANALYTICS_ENABLED",
"DD_TRACE_REVOLT_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_REVOLT_ENABLED",
"DD_TRACE_ROADRUNNER_ANALYTICS_ENABLED",
"DD_TRACE_ROADRUNNER_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_ROADRUNNER_ENABLED",
"DD_TRACE_RabbitMQ_",
"DD_TRACE_Remoting_",
"DD_TRACE_SLIM_ANALYTICS_ENABLED",
"DD_TRACE_SLIM_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_SLIM_ENABLED",
"DD_TRACE_SQLSRV_ANALYTICS_ENABLED",
"DD_TRACE_SQLSRV_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_SQLSRV_ENABLED",
"DD_TRACE_SWOOLE_ANALYTICS_ENABLED",
"DD_TRACE_SWOOLE_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_SWOOLE_ENABLED",
"DD_TRACE_SYMFONYMESSENGER_ANALYTICS_ENABLED",
"DD_TRACE_SYMFONYMESSENGER_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_SYMFONYMESSENGER_ENABLED",
"DD_TRACE_SYMFONY_ANALYTICS_ENABLED",
"DD_TRACE_SYMFONY_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_SYMFONY_ENABLED",
"DD_TRACE_Serilog_",
"DD_TRACE_ServiceRemoting_",
"DD_TRACE_ServiceStackRedis_",
Expand All @@ -110,11 +255,24 @@
"DD_TRACE_SymmetricAlgorithm_",
"DD_TRACE_SystemRandom_",
"DD_TRACE_TraceAnnotations_",
"DD_TRACE_WEB_ANALYTICS_ENABLED",
"DD_TRACE_WEB_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_WEB_ENABLED",
"DD_TRACE_WORDPRESS_ANALYTICS_ENABLED",
"DD_TRACE_WORDPRESS_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_WORDPRESS_ENABLED",
"DD_TRACE_Wcf_",
"DD_TRACE_WebRequest_",
"DD_TRACE_WinHttpHandler_",
"DD_TRACE_XUnit_",
"DD_TRACE_YII_ANALYTICS_ENABLED",
"DD_TRACE_YII_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_YII_ENABLED",
"DD_TRACE_ZENDFRAMEWORK_ANALYTICS_ENABLED",
"DD_TRACE_ZENDFRAMEWORK_ANALYTICS_SAMPLE_RATE",
"DD_TRACE_ZENDFRAMEWORK_ENABLED",
"DD_TraceAnnotations_",
"DD_V1",
"DD_Wcf_",
"DD_WebRequest_",
"DD_WinHttpHandler_",
Expand Down
13 changes: 11 additions & 2 deletions utils/telemetry/intake/static/go_config_rules.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@
"withenablementmode": "appsec_enablement_mode"
},
"prefix_block_list": [
"DD_AGENTLESS",
"DD_BLOCK_",
"DD_CPU_",
"DD_DELTA_PROFILES",
"DD_FLUSH_ON_EXIT",
"DD_MAX_GOROUTINES_WAIT",
"DD_MUTEX_PROFILE_FRACTION",
"DD_NUM_CUSTOM_PROFILER_LABEL_KEYS",
"DD_OSINFO_LIBDL_PATH",
"DD_PROFILE_PERIOD",
"DD_UPLOAD_TIMEOUT",
"agentless",
"block_",
"cpu_",
Expand All @@ -36,8 +47,6 @@
"num_custom_profiler_label_keys",
"osinfo_libdl_path",
"profile_period",
"profile_period",
"upload_timeout",
"upload_timeout"
],
"redaction_list": [],
Expand Down
Loading
Loading