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
1 change: 1 addition & 0 deletions manifests/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ manifest:
tests/parametric/test_tracer_flare.py::TestTracerFlareV1::test_tracer_flare_content_with_debug: missing_feature # Created by easy win activation script
tests/parametric/test_tracer_flare.py::TestTracerFlareV1::test_tracer_flare_with_debug: missing_feature # Created by easy win activation script
tests/parametric/test_tracer_flare.py::TestTracerFlareV1::test_tracer_profiling_notracing_flare_content: missing_feature # Created by easy win activation script
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/test_library_conf.py::Test_ExtractBehavior_Default::test_multiple_tracecontexts: missing_feature (baggage is not implemented, also remove DD_TRACE_PROPAGATION_STYLE_EXTRACT workaround in containers.py)
tests/test_library_conf.py::Test_ExtractBehavior_Default::test_single_tracecontext: missing_feature (baggage is not implemented, also remove DD_TRACE_PROPAGATION_STYLE_EXTRACT workaround in containers.py)
tests/test_library_conf.py::Test_ExtractBehavior_Ignore::test_multiple_tracecontexts: missing_feature (baggage is not implemented, also remove DD_TRACE_PROPAGATION_STYLE_EXTRACT workaround in containers.py)
Expand Down
1 change: 1 addition & 0 deletions manifests/cpp_httpd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ manifest:
tests/stats/test_stats.py::Test_Client_Stats::test_is_trace_root: missing_feature # Created by easy win activation script
tests/stats/test_stats.py::Test_Client_Stats::test_obfuscation: missing_feature # Created by easy win activation script
tests/stats/test_stats.py::Test_Peer_Tags: missing_feature # Created by easy win activation script
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/stats/test_stats.py::Test_Time_Bucketing::test_client_side_stats: missing_feature # Created by easy win activation script
tests/stats/test_stats.py::Test_Time_Bucketing::test_client_side_stats_bucket_alignment: missing_feature # Created by easy win activation script
tests/stats/test_stats.py::Test_Transport_Headers: missing_feature # Created by easy win activation script
Expand Down
1 change: 1 addition & 0 deletions manifests/cpp_nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ manifest:
tests/stats/test_stats.py::Test_Client_Stats::test_is_trace_root: missing_feature # Created by easy win activation script
tests/stats/test_stats.py::Test_Client_Stats::test_obfuscation: missing_feature # Created by easy win activation script
tests/stats/test_stats.py::Test_Peer_Tags: missing_feature # Created by easy win activation script
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/stats/test_stats.py::Test_Time_Bucketing::test_client_side_stats: missing_feature # Created by easy win activation script
tests/stats/test_stats.py::Test_Time_Bucketing::test_client_side_stats_bucket_alignment: missing_feature # Created by easy win activation script
tests/stats/test_stats.py::Test_Transport_Headers: missing_feature # Created by easy win activation script
Expand Down
1 change: 1 addition & 0 deletions manifests/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,7 @@ manifest:
- weblog_declaration:
uds: missing_feature
poc: missing_feature
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/stats/test_stats.py::Test_Time_Bucketing::test_client_side_stats: # Created by easy win activation script
- weblog_declaration:
uds: missing_feature
Expand Down
1 change: 1 addition & 0 deletions manifests/golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1217,6 +1217,7 @@ manifest:
tests/stats/test_stats.py: v1.54.0
tests/stats/test_stats.py::Test_Client_Drop_P0s::test_client_drop_p0s_false: v2.6.0
tests/stats/test_stats.py::Test_Client_Stats::test_grpc_status_code: irrelevant (variant has no gRPC endpoint)
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
Copy link
Member

Choose a reason for hiding this comment

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

it's implemented now in go and merged in main, but can be done later

tests/test_baggage.py::Test_Baggage_Headers_Api_Datadog: incomplete_test_app (/otel_drop_in_baggage_api_datadog endpoint is not implemented)
tests/test_baggage.py::Test_Baggage_Headers_Api_OTel: incomplete_test_app (/otel_drop_in_baggage_api_otel endpoint is not implemented)
tests/test_baggage.py::Test_Baggage_Headers_Basic: incomplete_test_app (/make_distant_call endpoint is not correctly implemented)
Expand Down
4 changes: 4 additions & 0 deletions manifests/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3797,6 +3797,10 @@ manifest:
- weblog_declaration:
"*": v1.54.0
spring-boot-3-native: missing_feature (rasp endpoint not implemented)
tests/stats/test_stats.py::Test_Stats_Service_Source:
- weblog_declaration:
"*": v0.0.0
spring-boot-3-native: irrelevant (/rasp/sqli endpoint is not available)
tests/stats/test_stats.py::Test_Time_Bucketing::test_client_side_stats_bucket_alignment: missing_feature
tests/test_baggage.py::Test_Baggage_Headers_Api_Datadog: irrelevant (no Datadog API for W3C Baggage)
tests/test_baggage.py::Test_Baggage_Headers_Api_OTel:
Expand Down
1 change: 1 addition & 0 deletions manifests/java_otel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ manifest:
tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java)
tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java)
tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)"
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/test_library_conf.py::Test_HeaderTags_DynamicConfig::test_tracing_client_http_header_tags_apm_multiconfig: missing_feature (APM_TRACING_MULTICONFIG is not supported in any language yet)
tests/test_library_logs.py::Test_NoExceptions::test_dotnet: irrelevant (only for .NET)
tests/test_library_logs.py::Test_NoExceptions::test_java_logs: irrelevant (only for Java)
Expand Down
1 change: 1 addition & 0 deletions manifests/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2141,6 +2141,7 @@ manifest:
tests/serverless/span_pointers/aws/test_s3_span_pointers.py::Test_MultipartUpload: missing_feature
tests/serverless/span_pointers/aws/test_s3_span_pointers.py::Test_PutObject: missing_feature
tests/stats/test_stats.py: missing_feature
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/test_baggage.py::Test_Baggage_Headers_Api_Datadog:
- weblog_declaration:
"*": incomplete_test_app (endpoint not implemented)
Expand Down
1 change: 1 addition & 0 deletions manifests/nodejs_otel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ manifest:
tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java)
tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java)
tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)"
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/test_library_conf.py::Test_HeaderTags_DynamicConfig::test_tracing_client_http_header_tags_apm_multiconfig: missing_feature (APM_TRACING_MULTICONFIG is not supported in any language yet)
tests/test_library_logs.py::Test_NoExceptions::test_dotnet: irrelevant (only for .NET)
tests/test_library_logs.py::Test_NoExceptions::test_java_logs: irrelevant (only for Java)
Expand Down
1 change: 1 addition & 0 deletions manifests/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,7 @@ manifest:
tests/serverless/span_pointers/aws/test_s3_span_pointers.py::Test_MultipartUpload: missing_feature
tests/serverless/span_pointers/aws/test_s3_span_pointers.py::Test_PutObject: missing_feature
tests/stats/test_stats.py: missing_feature
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/test_baggage.py::Test_Baggage_Headers_Api_Datadog: incomplete_test_app (/otel_drop_in_baggage_api_datadog endpoint is not implemented)
tests/test_baggage.py::Test_Baggage_Headers_Api_OTel: incomplete_test_app (/otel_drop_in_baggage_api_otel endpoint is not implemented)
tests/test_baggage.py::Test_Baggage_Headers_Basic: incomplete_test_app (/make_distant_call endpoint is not correctly implemented)
Expand Down
1 change: 1 addition & 0 deletions manifests/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1856,6 +1856,7 @@ manifest:
tests/stats/test_stats.py::Test_Client_Stats::test_is_trace_root:
- weblog_declaration:
"*": v2.8.0
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/stats/test_stats.py::Test_Time_Bucketing::test_client_side_stats_bucket_alignment: # Modified by easy win activation script
- weblog_declaration:
'*': missing_feature
Expand Down
1 change: 1 addition & 0 deletions manifests/python_lambda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ manifest:
tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java)
tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java)
tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)"
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/test_library_conf.py::Test_HeaderTags_DynamicConfig::test_tracing_client_http_header_tags_apm_multiconfig: missing_feature (APM_TRACING_MULTICONFIG is not supported in any language yet)
tests/test_library_logs.py::Test_NoExceptions::test_dotnet: irrelevant (only for .NET)
tests/test_library_logs.py::Test_NoExceptions::test_java_logs: irrelevant (only for Java)
Expand Down
1 change: 1 addition & 0 deletions manifests/python_otel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ manifest:
tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java)
tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java)
tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)"
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/test_library_conf.py::Test_HeaderTags_DynamicConfig::test_tracing_client_http_header_tags_apm_multiconfig: missing_feature (APM_TRACING_MULTICONFIG is not supported in any language yet)
tests/test_library_logs.py::Test_NoExceptions::test_dotnet: irrelevant (only for .NET)
tests/test_library_logs.py::Test_NoExceptions::test_java_logs: irrelevant (only for Java)
Expand Down
1 change: 1 addition & 0 deletions manifests/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1624,6 +1624,7 @@ manifest:
uds-sinatra: missing_feature
sinatra41: missing_feature
sinatra22: missing_feature
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/stats/test_stats.py::Test_Time_Bucketing::test_client_side_stats: # Created by easy win activation script
- weblog_declaration:
rails80: missing_feature
Expand Down
1 change: 1 addition & 0 deletions manifests/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ manifest:
tests/parametric/test_tracer_flare.py::TestTracerFlareV1::test_tracer_flare_with_debug: missing_feature # Created by easy win activation script
tests/parametric/test_tracer_flare.py::TestTracerFlareV1::test_tracer_profiling_notracing_flare_content: missing_feature # Created by easy win activation script
tests/stats/test_stats.py: missing_feature
tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java)
tests/test_library_conf.py::Test_HeaderTags_DynamicConfig::test_tracing_client_http_header_tags_apm_multiconfig: missing_feature (APM_TRACING_MULTICONFIG is not supported in any language yet)
tests/test_library_logs.py::Test_NoExceptions::test_dotnet: irrelevant (only for .NET)
tests/test_library_logs.py::Test_NoExceptions::test_java_logs: irrelevant (only for Java)
Expand Down
3 changes: 2 additions & 1 deletion tests/schemas/utils/agent/api/v0.2/stats-request.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
"description": "Peer tags"
},
"IsTraceRoot": { "type": "integer", "description": "Trace root flag" },
"GRPCStatusCode": { "type": "string", "description": "gRPC status code" }
"GRPCStatusCode": { "type": "string", "description": "gRPC status code" },
"srv_src": { "type": "string", "description": "Service name override source (e.g. integration name)" }
}
}
},
Expand Down
3 changes: 2 additions & 1 deletion tests/schemas/utils/library/v0.6/stats-request.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
"description": "Peer tags array from span metadata (based on agent peer tags configuration)"
},
"IsTraceRoot": { "type": "integer", "description": "TRUE if span parentID == 0, FALSE otherwise" },
"GRPCStatusCode": { "type": "string", "description": "gRPC status code from span metadata" }
"GRPCStatusCode": { "type": "string", "description": "gRPC status code from span metadata" },
"srv_src": { "type": "string", "description": "Service name override source (e.g. integration name)" }
}
}
}
Expand Down
21 changes: 20 additions & 1 deletion tests/stats/test_stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def test_obfuscation(self):
assert stats_count <= 4, (
"expect <= 4 stats"
) # Normally this is exactly 2 but in certain high load this can flake and result in additional payloads where hits are split across two payloads
assert hits == top_hits == 4, "expect exactly 4 'OK' hits and top level hits across all payloads"
assert hits == top_hits >= 4, "expect at least 4 'OK' hits and top level hits across all payloads"

def test_is_trace_root(self):
"""Test IsTraceRoot presence in stats.
Expand Down Expand Up @@ -119,6 +119,25 @@ def test_grpc_status_code(self):
)


@features.service_override_source
@scenarios.trace_stats_computation
class Test_Stats_Service_Source:
"""Test that srv_src field is set in stat buckets when service name is overridden by an integration"""

def setup_srv_src(self):
weblog.get("/rasp/sqli?user_id=1")

def test_srv_src(self):
"""Test that at least one stat bucket has the srv_src field set"""
srv_src_found = False
for s in interfaces.agent.get_stats():
logger.debug(f"asserting on {s}")
if s.get("srv_src"):
srv_src_found = True
break
assert srv_src_found, "Expected at least one stat bucket to have srv_src set"


@features.client_side_stats_supported
@scenarios.trace_stats_computation
class Test_Agent_Info_Endpoint:
Expand Down
Loading