diff --git a/manifests/java.yml b/manifests/java.yml index 949f140f3dd..76c330e3f01 100644 --- a/manifests/java.yml +++ b/manifests/java.yml @@ -1630,9 +1630,7 @@ manifest: ratpack: missing_feature (endpoint not implemented) vertx3: missing_feature (endpoint not implemented) vertx4: missing_feature (endpoint not implemented) - tests/appsec/test_asm_standalone.py::Test_SCAStandalone_Telemetry_V2::test_telemetry_sca_enabled_propagated: - - declaration: missing_feature (Temporarily disabling until Java PR is merged https://github.com/DataDog/dd-trace-java/pull/10823) - component_version: '>=1.60.1' + tests/appsec/test_asm_standalone.py::Test_SCAStandalone_Telemetry_V2::test_telemetry_sca_enabled_propagated: v1.61.0-SNAPSHOT # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823 tests/appsec/test_asm_standalone.py::Test_UserEventsStandalone_Automated: - weblog_declaration: "*": v1.45.0 @@ -3052,9 +3050,7 @@ manifest: tests/docker_ssi/test_docker_ssi.py::TestDockerSSIFeatures::test_instrumentation_source_ssi: - declaration: missing_feature (Not implemented yet) component_version: <1.52.0 - tests/docker_ssi/test_docker_ssi_appsec.py::TestDockerSSIAppsecFeatures::test_telemetry_source_ssi: - - declaration: missing_feature (Temporarily disabling until Java PR is merged https://github.com/DataDog/dd-trace-java/pull/10823) - component_version: '>=1.60.1' + tests/docker_ssi/test_docker_ssi_appsec.py::TestDockerSSIAppsecFeatures::test_telemetry_source_ssi: 1.61.0-SNAPSHOT # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823 tests/docker_ssi/test_docker_ssi_crash.py::TestDockerSSICrash::test_crash: missing_feature (No implemented the endpoint /crashme) tests/ffe/test_dynamic_evaluation.py: - weblog_declaration: @@ -3712,22 +3708,18 @@ manifest: - component_version: ">=1.57.0" declaration: flaky (APMAPI-1785) tests/parametric/test_telemetry.py::Test_Consistent_Configs: missing_feature - tests/parametric/test_telemetry.py::Test_Defaults: '>=1.31.0 <1.60.1' # temporarily disabling until Java PR is merged (https://github.com/DataDog/dd-trace-java/pull/10823) - tests/parametric/test_telemetry.py::Test_Environment: '>=1.31.0 <1.60.1' # temporarily disabling until Java PR is merged (https://github.com/DataDog/dd-trace-java/pull/10823) + tests/parametric/test_telemetry.py::Test_Defaults: v1.61.0-SNAPSHOT # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823 + tests/parametric/test_telemetry.py::Test_Environment: v1.61.0-SNAPSHOT # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823 tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_hiding: missing_feature (Not implemented) tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_invalid: missing_feature (Not implemented) - tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin: '>=1.47.0-SNAPSHOT <1.60.1' - tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_config_id: - - declaration: missing_feature (Not implemented) - component_version: <=1.53.0-SNAPSHOT - - declaration: missing_feature (Temporarily disabling until Java PR is merged https://github.com/DataDog/dd-trace-java/pull/10823) - component_version: '>=1.60.1' + tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin: 1.61.0-SNAPSHOT # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823 + tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_config_id: 1.61.0-SNAPSHOT # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823 ? tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_origin_extended_configs_temporary_use_case : irrelevant (temporary use case for python, ruby and nodejs) tests/parametric/test_telemetry.py::Test_TelemetryInstallSignature: v1.27.0 - tests/parametric/test_telemetry.py::Test_TelemetrySCAEnvVar: '>=1.34.0 <1.60.1' # temporarily disabling until Java PR is merged (https://github.com/DataDog/dd-trace-java/pull/10823) + tests/parametric/test_telemetry.py::Test_TelemetrySCAEnvVar: v1.61.0-SNAPSHOT # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823 tests/parametric/test_telemetry.py::Test_TelemetrySCAEnvVar::test_telemetry_sca_enabled_propagated_specifics: irrelevant - tests/parametric/test_telemetry.py::Test_TelemetrySSIConfigs: '>=1.51.0 <1.60.1' # temporarily disabling until Java PR is merged (https://github.com/DataDog/dd-trace-java/pull/10823) + tests/parametric/test_telemetry.py::Test_TelemetrySSIConfigs: v1.61.0-SNAPSHOT # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823 tests/parametric/test_trace_sampling.py::Test_Trace_Sampling_Basic: v0.111.0 tests/parametric/test_trace_sampling.py::Test_Trace_Sampling_Globs: v1.25.1 tests/parametric/test_trace_sampling.py::Test_Trace_Sampling_Globs_Feb2024_Revision: v1.30.0 @@ -4290,9 +4282,8 @@ manifest: tests/test_telemetry.py::Test_Telemetry::test_app_product_change: missing_feature (Weblog GET/enable_product and app-product-change event is not implemented yet.) tests/test_telemetry.py::Test_Telemetry::test_app_started_client_configuration: # Created by easy win activation script - weblog_declaration: + "*": v1.61.0-SNAPSHOT # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823 spring-boot-3-native: missing_feature (GraalVM. Tracing support only) - - declaration: missing_feature (Temporarily disabling until Java PR is merged https://github.com/DataDog/dd-trace-java/pull/10823) - component_version: '>=1.60.1' tests/test_telemetry.py::Test_Telemetry::test_app_started_is_first_message: # Created by easy win activation script - weblog_declaration: spring-boot-3-native: missing_feature (GraalVM. Tracing support only) @@ -4315,10 +4306,8 @@ manifest: - weblog_declaration: spring-boot-3-native: missing_feature (GraalVM. Tracing support only) tests/test_telemetry.py::Test_TelemetryEnhancedConfigReporting: - - declaration: missing_feature (Temporarily disabling until Java PR is merged https://github.com/DataDog/dd-trace-java/pull/10823) - component_version: '>=1.60.1' - weblog_declaration: - "*": v1.54.0-SNAPSHOT + "*": v1.61.0-SNAPSHOT # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823 spring-boot-3-native: missing_feature (GraalVM. Tracing support only) tests/test_telemetry.py::Test_TelemetrySCAEnvVar: missing_feature tests/test_telemetry.py::Test_TelemetryV2: v1.23.0 diff --git a/tests/parametric/test_telemetry.py b/tests/parametric/test_telemetry.py index ca0ca4770ae..376af21ec56 100644 --- a/tests/parametric/test_telemetry.py +++ b/tests/parametric/test_telemetry.py @@ -16,20 +16,24 @@ telemetry_name_mapping: dict[str, dict[str, str | list[str]]] = { + "instrumentation_source": { + "java": "DD_INSTRUMENTATION_SOURCE", + }, "ssi_injection_enabled": { "python": "DD_INJECTION_ENABLED", - "java": "injection_enabled", + "java": "DD_INJECTION_ENABLED", "ruby": "DD_INJECTION_ENABLED", "golang": ["DD_INJECTION_ENABLED", "injection_enabled"], }, "ssi_forced_injection_enabled": { "python": "DD_INJECT_FORCE", "ruby": "DD_INJECT_FORCE", - "java": "inject_force", + "java": "DD_INJECT_FORCE", "golang": ["DD_INJECT_FORCE", "inject_force"], }, "trace_sample_rate": { "dotnet": "DD_TRACE_SAMPLE_RATE", + "java": "DD_TRACE_SAMPLE_RATE", "nodejs": "DD_TRACE_SAMPLE_RATE", "python": "DD_TRACE_SAMPLE_RATE", "ruby": "DD_TRACE_SAMPLE_RATE", @@ -42,16 +46,25 @@ "php": "trace.logs_enabled", "ruby": "tracing.log_injection", "golang": ["DD_LOGS_INJECTION", "trace.logs_enabled"], + "java": "DD_LOGS_INJECTION_ENABLED", }, "trace_header_tags": { "dotnet": "DD_TRACE_HEADER_TAGS", "nodejs": "DD_TRACE_HEADER_TAGS", "python": "DD_TRACE_HEADER_TAGS", "golang": ["DD_TRACE_HEADER_TAGS", "trace_header_tags"], + "java": "DD_TRACE_HEADER_TAGS", + }, + "trace_tags": { + "dotnet": "DD_TAGS", + "java": "DD_TRACE_TAGS", + "nodejs": "DD_TAGS", + "python": "DD_TAGS", + "golang": ["DD_TAGS", "trace_tags"], }, - "trace_tags": {"dotnet": "DD_TAGS", "nodejs": "DD_TAGS", "python": "DD_TAGS", "golang": ["DD_TAGS", "trace_tags"]}, "trace_enabled": { "dotnet": "DD_TRACE_ENABLED", + "java": "DD_TRACE_ENABLED", "nodejs": "tracing", "python": "DD_TRACE_ENABLED", "ruby": "tracing.enabled", @@ -63,6 +76,7 @@ "python": "DD_PROFILING_ENABLED", "ruby": "profiling.enabled", "golang": ["DD_PROFILING_ENABLED", "profiling_enabled"], + "java": "DD_PROFILING_ENABLED", }, "appsec_enabled": { "dotnet": "DD_APPSEC_ENABLED", @@ -70,14 +84,17 @@ "python": "DD_APPSEC_ENABLED", "ruby": "appsec.enabled", "golang": ["DD_APPSEC_ENABLED", "appsec_enabled"], + "java": "DD_APPSEC_ENABLED", }, "data_streams_enabled": { "dotnet": "DD_DATA_STREAMS_ENABLED", "nodejs": "dsmEnabled", "python": "DD_DATA_STREAMS_ENABLED", + "java": "DD_DATA_STREAMS_ENABLED", "golang": ["DD_DATA_STREAMS_ENABLED", "data_streams_enabled"], }, "runtime_metrics_enabled": { + "java": "DD_RUNTIME_METRICS_ENABLED", "dotnet": "DD_RUNTIME_METRICS_ENABLED", "nodejs": "runtime.metrics.enabled", "python": "DD_RUNTIME_METRICS_ENABLED", @@ -85,6 +102,7 @@ "golang": ["DD_RUNTIME_METRICS_ENABLED", "runtime_metrics_enabled"], }, "dynamic_instrumentation_enabled": { + "java": "DD_DYNAMIC_INSTRUMENTATION_ENABLED", "dotnet": "DD_DYNAMIC_INSTRUMENTATION_ENABLED", "nodejs": "dynamicInstrumentation.enabled", "python": "DD_DYNAMIC_INSTRUMENTATION_ENABLED", @@ -94,19 +112,20 @@ }, "trace_debug_enabled": { "php": "trace.debug", - "java": "trace_debug", + "java": "DD_TRACE_DEBUG", "ruby": "DD_TRACE_DEBUG", "python": "DD_TRACE_DEBUG", "golang": ["trace_debug_enabled", "DD_TRACE_DEBUG"], }, "tags": { - "java": "trace_tags", + "java": "DD_TRACE_TAGS", "dotnet": "DD_TAGS", "python": "DD_TAGS", "nodejs": "DD_TAGS", "golang": ["DD_TAGS", "trace_tags"], }, "trace_propagation_style": { + "java": "DD_TRACE_PROPAGATION_STYLE", "dotnet": "DD_TRACE_PROPAGATION_STYLE", "php": "trace.propagation_style", "golang": ["DD_TRACE_PROPAGATION_STYLE", "trace.propagation_style"], diff --git a/tests/test_telemetry.py b/tests/test_telemetry.py index 1196cca3e90..7f9ebb9517c 100644 --- a/tests/test_telemetry.py +++ b/tests/test_telemetry.py @@ -460,7 +460,7 @@ def test_app_started_client_configuration(self): "python": {}, "cpp_nginx": {"trace_agent_port": trace_agent_port}, "cpp_httpd": {"trace_agent_port": trace_agent_port}, - "java": {"trace_agent_port": trace_agent_port, "telemetry_heartbeat_interval": 2}, + "java": {"DD_TRACE_AGENT_PORT": trace_agent_port, "DD_TELEMETRY_HEARTBEAT_INTERVAL": 2}, "ruby": {"DD_AGENT_TRANSPORT": "TCP"}, "golang": {"lambda_mode": False}, } @@ -488,7 +488,7 @@ def validator(data: dict): if cnf.get("name") == config_name_to_check: config_value = cnf.get("value") # Accept both the expected value and its float version for telemetry_heartbeat_interval - if expected_config_name == "telemetry_heartbeat_interval": + if expected_config_name == "DD_TELEMETRY_HEARTBEAT_INTERVAL": try: expected_float = float(expected_value) config_float = float(config_value) @@ -588,7 +588,7 @@ class Test_TelemetryEnhancedConfigReporting: ], }, "java": { - "name": "logs_injection_enabled", + "name": "DD_LOGS_INJECTION_ENABLED", "precedence": [ {"origin": "default", "value": "true"}, { diff --git a/utils/telemetry_utils.py b/utils/telemetry_utils.py index de390343ba0..2d633696b6e 100644 --- a/utils/telemetry_utils.py +++ b/utils/telemetry_utils.py @@ -19,9 +19,7 @@ def get_loaded_dependency(library: str) -> dict[str, bool]: @staticmethod def get_dd_appsec_sca_enabled_str(library: ComponentVersion) -> str: result = "DD_APPSEC_SCA_ENABLED" - if library == "java": - result = "appsec_sca_enabled" - elif library == "nodejs": + if library == "nodejs": result = "appsec.sca.enabled" elif library in ("php", "ruby"): result = "appsec.sca_enabled"