Skip to content

Commit

Permalink
Update code and snapshots after proto update
Browse files Browse the repository at this point in the history
  • Loading branch information
@bonnici @abernix
bonnici authored and abernix committed May 3, 2024
1 parent 9d7b08d commit a4ba9d3
Show file tree
Hide file tree
Showing 29 changed files with 121 additions and 7 deletions.
6 changes: 4 additions & 2 deletions ...pshots/apollo_router__plugins__telemetry__metrics__apollo__studio__test__aggregation.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@ expression: aggregated_metrics
"client_name": "client_1",
"client_version": "version_1",
"operation_type": "",
"operation_subtype": ""
"operation_subtype": "",
"result": ""
},
{
"context": {
"client_name": "client_1",
"client_version": "version_1",
"operation_type": "",
"operation_subtype": ""
"operation_subtype": "",
"result": ""
},
"query_latency_stats": {
"request_latencies": {
Expand Down
4 changes: 4 additions & 0 deletions apollo-router/src/plugins/telemetry/metrics/apollo/studio.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ impl From<ContextualizedStats>
.collect(),
query_latency_stats: Some(stats.query_latency_stats.into()),
context: Some(stats.context),
limits_stats: None,
local_per_type_stat: HashMap::new(),
operation_count: 0,
}
}
}
Expand Down Expand Up @@ -329,6 +332,7 @@ mod test {
SingleStats {
stats_with_context: SingleContextualizedStats {
context: StatsContext {
result: "".to_string(),
client_name: client_name.to_string(),
client_version: client_version.to_string(),
operation_type: String::new(),
Expand Down
3 changes: 2 additions & 1 deletion ...o_router__plugins__telemetry__metrics__apollo__test__apollo_metrics_for_subscription.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ expression: results
"client_name": "test_client",
"client_version": "1.0-test",
"operation_type": "subscription",
"operation_subtype": "subscription-request"
"operation_subtype": "subscription-request",
"result": ""
},
"query_latency_stats": {
"latency": {
Expand Down
3 changes: 2 additions & 1 deletion ...er__plugins__telemetry__metrics__apollo__test__apollo_metrics_for_subscription_error.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ expression: results
"client_name": "test_client",
"client_version": "1.0-test",
"operation_type": "subscription",
"operation_subtype": "subscription-request"
"operation_subtype": "subscription-request",
"result": ""
},
"query_latency_stats": {
"latency": {
Expand Down
3 changes: 2 additions & 1 deletion ...o_router__plugins__telemetry__metrics__apollo__test__apollo_metrics_single_operation.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ expression: results
"client_name": "test_client",
"client_version": "1.0-test",
"operation_type": "query",
"operation_subtype": ""
"operation_subtype": "",
"result": ""
},
"query_latency_stats": {
"latency": {
Expand Down
3 changes: 2 additions & 1 deletion ..._router__plugins__telemetry__metrics__apollo__test__apollo_metrics_unknown_operation.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ expression: results
"client_name": "test_client",
"client_version": "1.0-test",
"operation_type": "query",
"operation_subtype": ""
"operation_subtype": "",
"result": ""
},
"query_latency_stats": {
"latency": {
Expand Down
1 change: 1 addition & 0 deletions apollo-router/src/plugins/telemetry/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1381,6 +1381,7 @@ impl Telemetry {
SingleStats {
stats_with_context: SingleContextualizedStats {
context: StatsContext {
result: "".to_string(),
client_name: context
.get(CLIENT_NAME)
.unwrap_or_default()
Expand Down
8 changes: 8 additions & 0 deletions apollo-router/tests/snapshots/apollo_reports__batch_send_header-2.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -429,6 +430,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -536,6 +538,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand All @@ -549,6 +552,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
- start_time:
seconds: "[seconds]"
nanos: "[nanos]"
Expand Down Expand Up @@ -722,6 +726,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -965,6 +970,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -1072,6 +1078,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand All @@ -1085,6 +1092,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
stats_with_context: []
referenced_fields_by_type: {}
query_metadata: ~
Expand Down
8 changes: 8 additions & 0 deletions apollo-router/tests/snapshots/apollo_reports__batch_send_header.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -429,6 +430,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -536,6 +538,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand All @@ -549,6 +552,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
- start_time:
seconds: "[seconds]"
nanos: "[nanos]"
Expand Down Expand Up @@ -722,6 +726,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -965,6 +970,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -1072,6 +1078,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand All @@ -1085,6 +1092,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
stats_with_context: []
referenced_fields_by_type: {}
query_metadata: ~
Expand Down
8 changes: 8 additions & 0 deletions apollo-router/tests/snapshots/apollo_reports__batch_trace_id-2.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -426,6 +427,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -533,6 +535,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand All @@ -546,6 +549,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
- start_time:
seconds: "[seconds]"
nanos: "[nanos]"
Expand Down Expand Up @@ -716,6 +720,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -959,6 +964,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -1066,6 +1072,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand All @@ -1079,6 +1086,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
stats_with_context: []
referenced_fields_by_type: {}
query_metadata: ~
Expand Down
8 changes: 8 additions & 0 deletions apollo-router/tests/snapshots/apollo_reports__batch_trace_id.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -426,6 +427,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -533,6 +535,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand All @@ -546,6 +549,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
- start_time:
seconds: "[seconds]"
nanos: "[nanos]"
Expand Down Expand Up @@ -716,6 +720,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -959,6 +964,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -1066,6 +1072,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand All @@ -1079,6 +1086,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
stats_with_context: []
referenced_fields_by_type: {}
query_metadata: ~
Expand Down
4 changes: 4 additions & 0 deletions apollo-router/tests/snapshots/apollo_reports__client_name-2.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -426,6 +427,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand Down Expand Up @@ -533,6 +535,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
sent_time_offset: "[sent_time_offset]"
sent_time:
seconds: "[seconds]"
Expand All @@ -546,6 +549,7 @@ traces_per_query:
registered_operation: false
forbidden_operation: false
field_execution_weight: 1
limits: ~
stats_with_context: []
referenced_fields_by_type: {}
query_metadata: ~
Expand Down

0 comments on commit a4ba9d3

Please sign in to comment.