From b9176b992d00ebb901ddba32f015d6c07ebfcc14 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 13 Oct 2023 13:40:03 +0200 Subject: [PATCH] Remove outdated snapshot files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a `.snap` file becomes unused (e.g. renamed) there’s nothing to remove it from the git repository. This is the result of: ``` rm **/*.snap cargo insta test --accept ``` --- ...tion@field_level_instrumentation.yaml.snap | 10 - ...iguration__yaml__test__duplicate_keys.snap | 8 - ...t__oss_restricted_features_via_config.snap | 11 - ...ation_tests__traced_basic_composition.snap | 1275 ----------------- ...tegration_tests__traced_basic_request.snap | 512 ------- ...emplatizes_with_prs_when_empty_issues.snap | 10 - 6 files changed, 1826 deletions(-) delete mode 100644 apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__upgrade_old_configuration@field_level_instrumentation.yaml.snap delete mode 100644 apollo-router/src/configuration/snapshots/apollo_router__configuration__yaml__test__duplicate_keys.snap delete mode 100644 apollo-router/src/uplink/snapshots/apollo_router__uplink__license__test__oss_restricted_features_via_config.snap delete mode 100644 apollo-router/tests/snapshots/integration_tests__traced_basic_composition.snap delete mode 100644 apollo-router/tests/snapshots/integration_tests__traced_basic_request.snap delete mode 100644 xtask/src/commands/changeset/snapshots/xtask__commands__changeset__tests__it_templatizes_with_prs_when_empty_issues.snap diff --git a/apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__upgrade_old_configuration@field_level_instrumentation.yaml.snap b/apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__upgrade_old_configuration@field_level_instrumentation.yaml.snap deleted file mode 100644 index 2b4da064ff..0000000000 --- a/apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__upgrade_old_configuration@field_level_instrumentation.yaml.snap +++ /dev/null @@ -1,10 +0,0 @@ ---- -source: apollo-router/src/configuration/tests.rs -expression: new_config ---- ---- -telemetry: - apollo: - field_level_instrumentation: - sampler: always_off - diff --git a/apollo-router/src/configuration/snapshots/apollo_router__configuration__yaml__test__duplicate_keys.snap b/apollo-router/src/configuration/snapshots/apollo_router__configuration__yaml__test__duplicate_keys.snap deleted file mode 100644 index 6a891be5df..0000000000 --- a/apollo-router/src/configuration/snapshots/apollo_router__configuration__yaml__test__duplicate_keys.snap +++ /dev/null @@ -1,8 +0,0 @@ ---- -source: apollo-router/src/configuration/yaml.rs -expression: "format!(\"{:#?}\", parse(yaml).unwrap_err())" ---- -InvalidConfiguration { - message: "duplicated keys detected in your yaml configuration", - error: "'test.a', 'c.dup', 'test'", -} diff --git a/apollo-router/src/uplink/snapshots/apollo_router__uplink__license__test__oss_restricted_features_via_config.snap b/apollo-router/src/uplink/snapshots/apollo_router__uplink__license__test__oss_restricted_features_via_config.snap deleted file mode 100644 index 56f7389427..0000000000 --- a/apollo-router/src/uplink/snapshots/apollo_router__uplink__license__test__oss_restricted_features_via_config.snap +++ /dev/null @@ -1,11 +0,0 @@ ---- -source: apollo-router/src/uplink/license.rs -expression: err.to_string() ---- -TODO PREAMBLE - -Violations: -* Healthcheck at $.health_check.enabled -* Homepage at $.homepage.enabled - -TODO POSTAMBLE diff --git a/apollo-router/tests/snapshots/integration_tests__traced_basic_composition.snap b/apollo-router/tests/snapshots/integration_tests__traced_basic_composition.snap deleted file mode 100644 index dab4a9ecd8..0000000000 --- a/apollo-router/tests/snapshots/integration_tests__traced_basic_composition.snap +++ /dev/null @@ -1,1275 +0,0 @@ ---- -source: apollo-router/tests/integration_tests.rs -expression: get_spans() ---- -{ - "name": "integration_tests::root", - "record": { - "entries": [], - "metadata": { - "name": "root", - "target": "integration_tests", - "level": "INFO", - "module_path": "integration_tests", - "fields": { - "names": [] - } - } - }, - "children": { - "apollo_router::axum_factory::utils::request": { - "name": "apollo_router::axum_factory::utils::request", - "record": { - "entries": [ - [ - "http.method", - "POST" - ], - [ - "http.route", - "http://default/" - ], - [ - "http.flavor", - "HTTP/1.1" - ], - [ - "otel.kind", - "SERVER" - ] - ], - "metadata": { - "name": "request", - "target": "apollo_router::axum_factory::utils", - "level": "INFO", - "module_path": "apollo_router::axum_factory::utils", - "fields": { - "names": [ - "http.method", - "http.route", - "http.flavor", - "otel.kind" - ] - } - } - }, - "children": { - "apollo_router::plugins::telemetry::router": { - "name": "apollo_router::plugins::telemetry::router", - "record": { - "entries": [ - [ - "http.method", - "POST" - ], - [ - "http.route", - "http://default/" - ], - [ - "http.flavor", - "HTTP/1.1" - ], - [ - "trace_id", - "[REDACTED]" - ], - [ - "client.name", - "" - ], - [ - "client.version", - "" - ], - [ - "otel.kind", - "INTERNAL" - ], - [ - "apollo_private.http.request_headers", - "{}" - ], - [ - "apollo_private.duration_ns", - 0 - ], - [ - "otel.status_code", - "Ok" - ], - [ - "message", - "dropping telemetry..." - ], - [ - "message", - "tracer shutdown failed: Timeout" - ] - ], - "metadata": { - "name": "router", - "target": "apollo_router::plugins::telemetry", - "level": "INFO", - "module_path": "apollo_router::plugins::telemetry", - "fields": { - "names": [ - "http.method", - "http.route", - "http.flavor", - "trace_id", - "client.name", - "client.version", - "otel.kind", - "otel.status_code", - "apollo_private.duration_ns", - "apollo_private.http.request_headers", - "apollo_private.http.response_headers" - ] - } - } - }, - "children": { - "apollo_router::plugins::telemetry::supergraph": { - "name": "apollo_router::plugins::telemetry::supergraph", - "record": { - "entries": [ - [ - "graphql.document", - "{ topProducts { upc name reviews {id product { name } author { id name } } } }" - ], - [ - "graphql.operation.name", - "" - ], - [ - "otel.kind", - "INTERNAL" - ], - [ - "apollo_private.field_level_instrumentation_ratio", - 0.0 - ], - [ - "apollo_private.graphql.variables", - "{\"reviewsForAuthorAuthorId\":\"\",\"topProductsFirst\":\"\"}" - ], - [ - "apollo_private.operation_signature", - "# -\n{topProducts{name reviews{author{id name}id product{name}}upc}}" - ] - ], - "metadata": { - "name": "supergraph", - "target": "apollo_router::plugins::telemetry", - "level": "INFO", - "module_path": "apollo_router::plugins::telemetry", - "fields": { - "names": [ - "graphql.document", - "graphql.operation.name", - "otel.kind", - "apollo_private.field_level_instrumentation_ratio", - "apollo_private.operation_signature", - "apollo_private.graphql.variables" - ] - } - } - }, - "children": { - "apollo_router::services::supergraph_service::query_planning": { - "name": "apollo_router::services::supergraph_service::query_planning", - "record": { - "entries": [ - [ - "graphql.document", - "{ topProducts { upc name reviews {id product { name } author { id name } } } }" - ], - [ - "graphql.operation.name", - "" - ], - [ - "otel.kind", - "INTERNAL" - ], - [ - "histogram.apollo_router_cache_miss_time", - "[REDACTED]" - ], - [ - "kind", - "query planner" - ], - [ - "storage", - "memory" - ], - [ - "monotonic_counter.apollo_router_cache_miss_count", - 1 - ], - [ - "kind", - "query planner" - ], - [ - "storage", - "memory" - ] - ], - "metadata": { - "name": "query_planning", - "target": "apollo_router::services::supergraph_service", - "level": "INFO", - "module_path": "apollo_router::services::supergraph_service", - "fields": { - "names": [ - "graphql.document", - "graphql.operation.name", - "otel.kind" - ] - } - } - }, - "children": { - "apollo_router::query_planner::bridge_query_planner::parse_query": { - "name": "apollo_router::query_planner::bridge_query_planner::parse_query", - "record": { - "entries": [ - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "parse_query", - "target": "apollo_router::query_planner::bridge_query_planner", - "level": "INFO", - "module_path": "apollo_router::query_planner::bridge_query_planner", - "fields": { - "names": [ - "otel.kind" - ] - } - } - }, - "children": {} - } - } - }, - "apollo_router::plugins::telemetry::execution": { - "name": "apollo_router::plugins::telemetry::execution", - "record": { - "entries": [ - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "execution", - "target": "apollo_router::plugins::telemetry", - "level": "INFO", - "module_path": "apollo_router::plugins::telemetry", - "fields": { - "names": [ - "otel.kind" - ] - } - } - }, - "children": { - "apollo_router::query_planner::execution::sequence": { - "name": "apollo_router::query_planner::execution::sequence", - "record": { - "entries": [ - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "sequence", - "target": "apollo_router::query_planner::execution", - "level": "INFO", - "module_path": "apollo_router::query_planner::execution", - "fields": { - "names": [ - "otel.kind" - ] - } - } - }, - "children": { - "apollo_router::query_planner::execution::fetch": { - "name": "apollo_router::query_planner::execution::fetch", - "record": { - "entries": [ - [ - "otel.kind", - "INTERNAL" - ], - [ - "apollo.subgraph.name", - "products" - ], - [ - "apollo_private.sent_time_offset", - 0 - ] - ], - "metadata": { - "name": "fetch", - "target": "apollo_router::query_planner::execution", - "level": "INFO", - "module_path": "apollo_router::query_planner::execution", - "fields": { - "names": [ - "otel.kind", - "apollo.subgraph.name", - "apollo_private.sent_time_offset" - ] - } - } - }, - "children": { - "apollo_router::query_planner::fetch::make_variables": { - "name": "apollo_router::query_planner::fetch::make_variables", - "record": { - "entries": [], - "metadata": { - "name": "make_variables", - "target": "apollo_router::query_planner::fetch", - "level": "DEBUG", - "module_path": "apollo_router::query_planner::fetch", - "fields": { - "names": [] - } - } - }, - "children": {} - }, - "apollo_router::plugins::telemetry::subgraph": { - "name": "apollo_router::plugins::telemetry::subgraph", - "record": { - "entries": [ - [ - "apollo.subgraph.name", - "products" - ], - [ - "graphql.document", - "{topProducts{__typename upc name}}" - ], - [ - "graphql.operation.name", - "" - ], - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "subgraph", - "target": "apollo_router::plugins::telemetry", - "level": "INFO", - "module_path": "apollo_router::plugins::telemetry", - "fields": { - "names": [ - "apollo.subgraph.name", - "graphql.document", - "graphql.operation.name", - "otel.kind", - "apollo_private.ftv1" - ] - } - } - }, - "children": { - "apollo_router::services::subgraph_service::body_compression": { - "name": "apollo_router::services::subgraph_service::body_compression", - "record": { - "entries": [], - "metadata": { - "name": "body_compression", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - }, - "apollo_router::services::subgraph_service::subgraph_request": { - "name": "apollo_router::services::subgraph_service::subgraph_request", - "record": { - "entries": [ - [ - "otel.kind", - "CLIENT" - ], - [ - "net.peer.name", - "products.demo.starstuff.dev" - ], - [ - "net.peer.port", - "443" - ], - [ - "http.route", - "/" - ], - [ - "http.url", - "https://products.demo.starstuff.dev/" - ], - [ - "net.transport", - "ip_tcp" - ], - [ - "apollo.subgraph.name", - "products" - ] - ], - "metadata": { - "name": "subgraph_request", - "target": "apollo_router::services::subgraph_service", - "level": "INFO", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [ - "otel.kind", - "net.peer.name", - "net.peer.port", - "http.route", - "http.url", - "net.transport", - "apollo.subgraph.name" - ] - } - } - }, - "children": { - "apollo_router::services::subgraph_service::aggregate_response_data": { - "name": "apollo_router::services::subgraph_service::aggregate_response_data", - "record": { - "entries": [], - "metadata": { - "name": "aggregate_response_data", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - }, - "apollo_router::services::subgraph_service::parse_subgraph_response": { - "name": "apollo_router::services::subgraph_service::parse_subgraph_response", - "record": { - "entries": [], - "metadata": { - "name": "parse_subgraph_response", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - }, - "apollo_router::query_planner::fetch::response_insert": { - "name": "apollo_router::query_planner::fetch::response_insert", - "record": { - "entries": [], - "metadata": { - "name": "response_insert", - "target": "apollo_router::query_planner::fetch", - "level": "DEBUG", - "module_path": "apollo_router::query_planner::fetch", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - }, - "apollo_router::query_planner::execution::flatten": { - "name": "apollo_router::query_planner::execution::flatten", - "record": { - "entries": [ - [ - "graphql.path", - "/topProducts/@" - ], - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "flatten", - "target": "apollo_router::query_planner::execution", - "level": "INFO", - "module_path": "apollo_router::query_planner::execution", - "fields": { - "names": [ - "graphql.path", - "otel.kind" - ] - } - } - }, - "children": { - "apollo_router::query_planner::execution::fetch": { - "name": "apollo_router::query_planner::execution::fetch", - "record": { - "entries": [ - [ - "otel.kind", - "INTERNAL" - ], - [ - "apollo.subgraph.name", - "reviews" - ], - [ - "apollo_private.sent_time_offset", - 0 - ] - ], - "metadata": { - "name": "fetch", - "target": "apollo_router::query_planner::execution", - "level": "INFO", - "module_path": "apollo_router::query_planner::execution", - "fields": { - "names": [ - "otel.kind", - "apollo.subgraph.name", - "apollo_private.sent_time_offset" - ] - } - } - }, - "children": { - "apollo_router::query_planner::fetch::make_variables": { - "name": "apollo_router::query_planner::fetch::make_variables", - "record": { - "entries": [], - "metadata": { - "name": "make_variables", - "target": "apollo_router::query_planner::fetch", - "level": "DEBUG", - "module_path": "apollo_router::query_planner::fetch", - "fields": { - "names": [] - } - } - }, - "children": {} - }, - "apollo_router::plugins::telemetry::subgraph": { - "name": "apollo_router::plugins::telemetry::subgraph", - "record": { - "entries": [ - [ - "apollo.subgraph.name", - "reviews" - ], - [ - "graphql.document", - "query($representations:[_Any!]!){_entities(representations:$representations){...on Product{reviews{id product{__typename upc}author{__typename id}}}}}" - ], - [ - "graphql.operation.name", - "" - ], - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "subgraph", - "target": "apollo_router::plugins::telemetry", - "level": "INFO", - "module_path": "apollo_router::plugins::telemetry", - "fields": { - "names": [ - "apollo.subgraph.name", - "graphql.document", - "graphql.operation.name", - "otel.kind", - "apollo_private.ftv1" - ] - } - } - }, - "children": { - "apollo_router::services::subgraph_service::body_compression": { - "name": "apollo_router::services::subgraph_service::body_compression", - "record": { - "entries": [], - "metadata": { - "name": "body_compression", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - }, - "apollo_router::services::subgraph_service::subgraph_request": { - "name": "apollo_router::services::subgraph_service::subgraph_request", - "record": { - "entries": [ - [ - "otel.kind", - "CLIENT" - ], - [ - "net.peer.name", - "reviews.demo.starstuff.dev" - ], - [ - "net.peer.port", - "443" - ], - [ - "http.route", - "/" - ], - [ - "http.url", - "https://reviews.demo.starstuff.dev/" - ], - [ - "net.transport", - "ip_tcp" - ], - [ - "apollo.subgraph.name", - "reviews" - ] - ], - "metadata": { - "name": "subgraph_request", - "target": "apollo_router::services::subgraph_service", - "level": "INFO", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [ - "otel.kind", - "net.peer.name", - "net.peer.port", - "http.route", - "http.url", - "net.transport", - "apollo.subgraph.name" - ] - } - } - }, - "children": { - "apollo_router::services::subgraph_service::aggregate_response_data": { - "name": "apollo_router::services::subgraph_service::aggregate_response_data", - "record": { - "entries": [], - "metadata": { - "name": "aggregate_response_data", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - }, - "apollo_router::services::subgraph_service::parse_subgraph_response": { - "name": "apollo_router::services::subgraph_service::parse_subgraph_response", - "record": { - "entries": [], - "metadata": { - "name": "parse_subgraph_response", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - }, - "apollo_router::query_planner::fetch::response_insert": { - "name": "apollo_router::query_planner::fetch::response_insert", - "record": { - "entries": [], - "metadata": { - "name": "response_insert", - "target": "apollo_router::query_planner::fetch", - "level": "DEBUG", - "module_path": "apollo_router::query_planner::fetch", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - } - } - }, - "apollo_router::query_planner::execution::parallel": { - "name": "apollo_router::query_planner::execution::parallel", - "record": { - "entries": [ - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "parallel", - "target": "apollo_router::query_planner::execution", - "level": "INFO", - "module_path": "apollo_router::query_planner::execution", - "fields": { - "names": [ - "otel.kind" - ] - } - } - }, - "children": { - "apollo_router::query_planner::execution::flatten": { - "name": "apollo_router::query_planner::execution::flatten", - "record": { - "entries": [ - [ - "graphql.path", - "/topProducts/@/reviews/@/product" - ], - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "flatten", - "target": "apollo_router::query_planner::execution", - "level": "INFO", - "module_path": "apollo_router::query_planner::execution", - "fields": { - "names": [ - "graphql.path", - "otel.kind" - ] - } - } - }, - "children": { - "apollo_router::query_planner::execution::fetch": { - "name": "apollo_router::query_planner::execution::fetch", - "record": { - "entries": [ - [ - "otel.kind", - "INTERNAL" - ], - [ - "apollo.subgraph.name", - "products" - ], - [ - "apollo_private.sent_time_offset", - 0 - ] - ], - "metadata": { - "name": "fetch", - "target": "apollo_router::query_planner::execution", - "level": "INFO", - "module_path": "apollo_router::query_planner::execution", - "fields": { - "names": [ - "otel.kind", - "apollo.subgraph.name", - "apollo_private.sent_time_offset" - ] - } - } - }, - "children": { - "apollo_router::query_planner::fetch::make_variables": { - "name": "apollo_router::query_planner::fetch::make_variables", - "record": { - "entries": [], - "metadata": { - "name": "make_variables", - "target": "apollo_router::query_planner::fetch", - "level": "DEBUG", - "module_path": "apollo_router::query_planner::fetch", - "fields": { - "names": [] - } - } - }, - "children": {} - }, - "apollo_router::plugins::telemetry::subgraph": { - "name": "apollo_router::plugins::telemetry::subgraph", - "record": { - "entries": [ - [ - "apollo.subgraph.name", - "products" - ], - [ - "graphql.document", - "query($representations:[_Any!]!){_entities(representations:$representations){...on Product{name}}}" - ], - [ - "graphql.operation.name", - "" - ], - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "subgraph", - "target": "apollo_router::plugins::telemetry", - "level": "INFO", - "module_path": "apollo_router::plugins::telemetry", - "fields": { - "names": [ - "apollo.subgraph.name", - "graphql.document", - "graphql.operation.name", - "otel.kind", - "apollo_private.ftv1" - ] - } - } - }, - "children": { - "apollo_router::services::subgraph_service::body_compression": { - "name": "apollo_router::services::subgraph_service::body_compression", - "record": { - "entries": [], - "metadata": { - "name": "body_compression", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - }, - "apollo_router::services::subgraph_service::subgraph_request": { - "name": "apollo_router::services::subgraph_service::subgraph_request", - "record": { - "entries": [ - [ - "otel.kind", - "CLIENT" - ], - [ - "net.peer.name", - "products.demo.starstuff.dev" - ], - [ - "net.peer.port", - "443" - ], - [ - "http.route", - "/" - ], - [ - "http.url", - "https://products.demo.starstuff.dev/" - ], - [ - "net.transport", - "ip_tcp" - ], - [ - "apollo.subgraph.name", - "products" - ] - ], - "metadata": { - "name": "subgraph_request", - "target": "apollo_router::services::subgraph_service", - "level": "INFO", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [ - "otel.kind", - "net.peer.name", - "net.peer.port", - "http.route", - "http.url", - "net.transport", - "apollo.subgraph.name" - ] - } - } - }, - "children": { - "apollo_router::services::subgraph_service::aggregate_response_data": { - "name": "apollo_router::services::subgraph_service::aggregate_response_data", - "record": { - "entries": [], - "metadata": { - "name": "aggregate_response_data", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - }, - "apollo_router::services::subgraph_service::parse_subgraph_response": { - "name": "apollo_router::services::subgraph_service::parse_subgraph_response", - "record": { - "entries": [], - "metadata": { - "name": "parse_subgraph_response", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - }, - "apollo_router::query_planner::fetch::response_insert": { - "name": "apollo_router::query_planner::fetch::response_insert", - "record": { - "entries": [], - "metadata": { - "name": "response_insert", - "target": "apollo_router::query_planner::fetch", - "level": "DEBUG", - "module_path": "apollo_router::query_planner::fetch", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - } - } - }, - "apollo_router::query_planner::execution::flatten": { - "name": "apollo_router::query_planner::execution::flatten", - "record": { - "entries": [ - [ - "graphql.path", - "/topProducts/@/reviews/@/author" - ], - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "flatten", - "target": "apollo_router::query_planner::execution", - "level": "INFO", - "module_path": "apollo_router::query_planner::execution", - "fields": { - "names": [ - "graphql.path", - "otel.kind" - ] - } - } - }, - "children": { - "apollo_router::query_planner::execution::fetch": { - "name": "apollo_router::query_planner::execution::fetch", - "record": { - "entries": [ - [ - "otel.kind", - "INTERNAL" - ], - [ - "apollo.subgraph.name", - "accounts" - ], - [ - "apollo_private.sent_time_offset", - 0 - ] - ], - "metadata": { - "name": "fetch", - "target": "apollo_router::query_planner::execution", - "level": "INFO", - "module_path": "apollo_router::query_planner::execution", - "fields": { - "names": [ - "otel.kind", - "apollo.subgraph.name", - "apollo_private.sent_time_offset" - ] - } - } - }, - "children": { - "apollo_router::query_planner::fetch::make_variables": { - "name": "apollo_router::query_planner::fetch::make_variables", - "record": { - "entries": [], - "metadata": { - "name": "make_variables", - "target": "apollo_router::query_planner::fetch", - "level": "DEBUG", - "module_path": "apollo_router::query_planner::fetch", - "fields": { - "names": [] - } - } - }, - "children": {} - }, - "apollo_router::plugins::telemetry::subgraph": { - "name": "apollo_router::plugins::telemetry::subgraph", - "record": { - "entries": [ - [ - "apollo.subgraph.name", - "accounts" - ], - [ - "graphql.document", - "query($representations:[_Any!]!){_entities(representations:$representations){...on User{name}}}" - ], - [ - "graphql.operation.name", - "" - ], - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "subgraph", - "target": "apollo_router::plugins::telemetry", - "level": "INFO", - "module_path": "apollo_router::plugins::telemetry", - "fields": { - "names": [ - "apollo.subgraph.name", - "graphql.document", - "graphql.operation.name", - "otel.kind", - "apollo_private.ftv1" - ] - } - } - }, - "children": { - "apollo_router::services::subgraph_service::body_compression": { - "name": "apollo_router::services::subgraph_service::body_compression", - "record": { - "entries": [], - "metadata": { - "name": "body_compression", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - }, - "apollo_router::services::subgraph_service::subgraph_request": { - "name": "apollo_router::services::subgraph_service::subgraph_request", - "record": { - "entries": [ - [ - "otel.kind", - "CLIENT" - ], - [ - "net.peer.name", - "accounts.demo.starstuff.dev" - ], - [ - "net.peer.port", - "443" - ], - [ - "http.route", - "/" - ], - [ - "http.url", - "https://accounts.demo.starstuff.dev/" - ], - [ - "net.transport", - "ip_tcp" - ], - [ - "apollo.subgraph.name", - "accounts" - ] - ], - "metadata": { - "name": "subgraph_request", - "target": "apollo_router::services::subgraph_service", - "level": "INFO", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [ - "otel.kind", - "net.peer.name", - "net.peer.port", - "http.route", - "http.url", - "net.transport", - "apollo.subgraph.name" - ] - } - } - }, - "children": { - "apollo_router::services::subgraph_service::aggregate_response_data": { - "name": "apollo_router::services::subgraph_service::aggregate_response_data", - "record": { - "entries": [], - "metadata": { - "name": "aggregate_response_data", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - }, - "apollo_router::services::subgraph_service::parse_subgraph_response": { - "name": "apollo_router::services::subgraph_service::parse_subgraph_response", - "record": { - "entries": [], - "metadata": { - "name": "parse_subgraph_response", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - }, - "apollo_router::query_planner::fetch::response_insert": { - "name": "apollo_router::query_planner::fetch::response_insert", - "record": { - "entries": [], - "metadata": { - "name": "response_insert", - "target": "apollo_router::query_planner::fetch", - "level": "DEBUG", - "module_path": "apollo_router::query_planner::fetch", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - } - } - } - } - } - } - } - } - }, - "apollo_router::services::execution_service::format_response": { - "name": "apollo_router::services::execution_service::format_response", - "record": { - "entries": [], - "metadata": { - "name": "format_response", - "target": "apollo_router::services::execution_service", - "level": "DEBUG", - "module_path": "apollo_router::services::execution_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - } - } - } - } - } - } -} diff --git a/apollo-router/tests/snapshots/integration_tests__traced_basic_request.snap b/apollo-router/tests/snapshots/integration_tests__traced_basic_request.snap deleted file mode 100644 index 1594d8872a..0000000000 --- a/apollo-router/tests/snapshots/integration_tests__traced_basic_request.snap +++ /dev/null @@ -1,512 +0,0 @@ ---- -source: apollo-router/tests/integration_tests.rs -expression: get_spans() ---- -{ - "name": "integration_tests::root", - "record": { - "entries": [], - "metadata": { - "name": "root", - "target": "integration_tests", - "level": "INFO", - "module_path": "integration_tests", - "fields": { - "names": [] - } - } - }, - "children": { - "apollo_router::axum_factory::utils::request": { - "name": "apollo_router::axum_factory::utils::request", - "record": { - "entries": [ - [ - "http.method", - "POST" - ], - [ - "http.route", - "http://default/" - ], - [ - "http.flavor", - "HTTP/1.1" - ], - [ - "otel.kind", - "SERVER" - ] - ], - "metadata": { - "name": "request", - "target": "apollo_router::axum_factory::utils", - "level": "INFO", - "module_path": "apollo_router::axum_factory::utils", - "fields": { - "names": [ - "http.method", - "http.route", - "http.flavor", - "otel.kind" - ] - } - } - }, - "children": { - "apollo_router::plugins::telemetry::router": { - "name": "apollo_router::plugins::telemetry::router", - "record": { - "entries": [ - [ - "http.method", - "POST" - ], - [ - "http.route", - "http://default/" - ], - [ - "http.flavor", - "HTTP/1.1" - ], - [ - "trace_id", - "[REDACTED]" - ], - [ - "client.name", - "" - ], - [ - "client.version", - "" - ], - [ - "otel.kind", - "INTERNAL" - ], - [ - "apollo_private.http.request_headers", - "{}" - ], - [ - "apollo_private.duration_ns", - 0 - ], - [ - "otel.status_code", - "Ok" - ], - [ - "message", - "dropping telemetry..." - ] - ], - "metadata": { - "name": "router", - "target": "apollo_router::plugins::telemetry", - "level": "INFO", - "module_path": "apollo_router::plugins::telemetry", - "fields": { - "names": [ - "http.method", - "http.route", - "http.flavor", - "trace_id", - "client.name", - "client.version", - "otel.kind", - "otel.status_code", - "apollo_private.duration_ns", - "apollo_private.http.request_headers", - "apollo_private.http.response_headers" - ] - } - } - }, - "children": { - "apollo_router::plugins::telemetry::supergraph": { - "name": "apollo_router::plugins::telemetry::supergraph", - "record": { - "entries": [ - [ - "graphql.document", - "{ topProducts { name name2:name } }" - ], - [ - "graphql.operation.name", - "" - ], - [ - "otel.kind", - "INTERNAL" - ], - [ - "apollo_private.field_level_instrumentation_ratio", - 0.01 - ], - [ - "apollo_private.graphql.variables", - "{\"reviewsForAuthorAuthorId\":\"\",\"topProductsFirst\":\"\"}" - ], - [ - "apollo_private.operation_signature", - "# -\n{topProducts{name name}}" - ] - ], - "metadata": { - "name": "supergraph", - "target": "apollo_router::plugins::telemetry", - "level": "INFO", - "module_path": "apollo_router::plugins::telemetry", - "fields": { - "names": [ - "graphql.document", - "graphql.operation.name", - "otel.kind", - "apollo_private.field_level_instrumentation_ratio", - "apollo_private.operation_signature", - "apollo_private.graphql.variables" - ] - } - } - }, - "children": { - "apollo_router::services::supergraph_service::query_planning": { - "name": "apollo_router::services::supergraph_service::query_planning", - "record": { - "entries": [ - [ - "graphql.document", - "{ topProducts { name name2:name } }" - ], - [ - "graphql.operation.name", - "" - ], - [ - "otel.kind", - "INTERNAL" - ], - [ - "histogram.apollo_router_cache_miss_time", - "[REDACTED]" - ], - [ - "kind", - "query planner" - ], - [ - "storage", - "memory" - ], - [ - "monotonic_counter.apollo_router_cache_miss_count", - 1 - ], - [ - "kind", - "query planner" - ], - [ - "storage", - "memory" - ] - ], - "metadata": { - "name": "query_planning", - "target": "apollo_router::services::supergraph_service", - "level": "INFO", - "module_path": "apollo_router::services::supergraph_service", - "fields": { - "names": [ - "graphql.document", - "graphql.operation.name", - "otel.kind" - ] - } - } - }, - "children": { - "apollo_router::query_planner::bridge_query_planner::parse_query": { - "name": "apollo_router::query_planner::bridge_query_planner::parse_query", - "record": { - "entries": [ - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "parse_query", - "target": "apollo_router::query_planner::bridge_query_planner", - "level": "INFO", - "module_path": "apollo_router::query_planner::bridge_query_planner", - "fields": { - "names": [ - "otel.kind" - ] - } - } - }, - "children": {} - } - } - }, - "apollo_router::plugins::telemetry::execution": { - "name": "apollo_router::plugins::telemetry::execution", - "record": { - "entries": [ - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "execution", - "target": "apollo_router::plugins::telemetry", - "level": "INFO", - "module_path": "apollo_router::plugins::telemetry", - "fields": { - "names": [ - "otel.kind" - ] - } - } - }, - "children": { - "apollo_router::query_planner::execution::fetch": { - "name": "apollo_router::query_planner::execution::fetch", - "record": { - "entries": [ - [ - "otel.kind", - "INTERNAL" - ], - [ - "apollo.subgraph.name", - "products" - ], - [ - "apollo_private.sent_time_offset", - 0 - ] - ], - "metadata": { - "name": "fetch", - "target": "apollo_router::query_planner::execution", - "level": "INFO", - "module_path": "apollo_router::query_planner::execution", - "fields": { - "names": [ - "otel.kind", - "apollo.subgraph.name", - "apollo_private.sent_time_offset" - ] - } - } - }, - "children": { - "apollo_router::query_planner::fetch::make_variables": { - "name": "apollo_router::query_planner::fetch::make_variables", - "record": { - "entries": [], - "metadata": { - "name": "make_variables", - "target": "apollo_router::query_planner::fetch", - "level": "DEBUG", - "module_path": "apollo_router::query_planner::fetch", - "fields": { - "names": [] - } - } - }, - "children": {} - }, - "apollo_router::plugins::telemetry::subgraph": { - "name": "apollo_router::plugins::telemetry::subgraph", - "record": { - "entries": [ - [ - "apollo.subgraph.name", - "products" - ], - [ - "graphql.document", - "{topProducts{name name2:name}}" - ], - [ - "graphql.operation.name", - "" - ], - [ - "otel.kind", - "INTERNAL" - ] - ], - "metadata": { - "name": "subgraph", - "target": "apollo_router::plugins::telemetry", - "level": "INFO", - "module_path": "apollo_router::plugins::telemetry", - "fields": { - "names": [ - "apollo.subgraph.name", - "graphql.document", - "graphql.operation.name", - "otel.kind", - "apollo_private.ftv1" - ] - } - } - }, - "children": { - "apollo_router::services::subgraph_service::body_compression": { - "name": "apollo_router::services::subgraph_service::body_compression", - "record": { - "entries": [], - "metadata": { - "name": "body_compression", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - }, - "apollo_router::services::subgraph_service::subgraph_request": { - "name": "apollo_router::services::subgraph_service::subgraph_request", - "record": { - "entries": [ - [ - "otel.kind", - "CLIENT" - ], - [ - "net.peer.name", - "products.demo.starstuff.dev" - ], - [ - "net.peer.port", - "443" - ], - [ - "http.route", - "/" - ], - [ - "http.url", - "https://products.demo.starstuff.dev/" - ], - [ - "net.transport", - "ip_tcp" - ], - [ - "apollo.subgraph.name", - "products" - ] - ], - "metadata": { - "name": "subgraph_request", - "target": "apollo_router::services::subgraph_service", - "level": "INFO", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [ - "otel.kind", - "net.peer.name", - "net.peer.port", - "http.route", - "http.url", - "net.transport", - "apollo.subgraph.name" - ] - } - } - }, - "children": { - "apollo_router::services::subgraph_service::aggregate_response_data": { - "name": "apollo_router::services::subgraph_service::aggregate_response_data", - "record": { - "entries": [], - "metadata": { - "name": "aggregate_response_data", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - }, - "apollo_router::services::subgraph_service::parse_subgraph_response": { - "name": "apollo_router::services::subgraph_service::parse_subgraph_response", - "record": { - "entries": [], - "metadata": { - "name": "parse_subgraph_response", - "target": "apollo_router::services::subgraph_service", - "level": "DEBUG", - "module_path": "apollo_router::services::subgraph_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - }, - "apollo_router::query_planner::fetch::response_insert": { - "name": "apollo_router::query_planner::fetch::response_insert", - "record": { - "entries": [], - "metadata": { - "name": "response_insert", - "target": "apollo_router::query_planner::fetch", - "level": "DEBUG", - "module_path": "apollo_router::query_planner::fetch", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - } - } - }, - "apollo_router::services::execution_service::format_response": { - "name": "apollo_router::services::execution_service::format_response", - "record": { - "entries": [], - "metadata": { - "name": "format_response", - "target": "apollo_router::services::execution_service", - "level": "DEBUG", - "module_path": "apollo_router::services::execution_service", - "fields": { - "names": [] - } - } - }, - "children": {} - } - } - } - } - } - } - } - } -} diff --git a/xtask/src/commands/changeset/snapshots/xtask__commands__changeset__tests__it_templatizes_with_prs_when_empty_issues.snap b/xtask/src/commands/changeset/snapshots/xtask__commands__changeset__tests__it_templatizes_with_prs_when_empty_issues.snap deleted file mode 100644 index e0f310c4ae..0000000000 --- a/xtask/src/commands/changeset/snapshots/xtask__commands__changeset__tests__it_templatizes_with_prs_when_empty_issues.snap +++ /dev/null @@ -1,10 +0,0 @@ ---- -source: src/commands/changeset/mod.rs -expression: rendered_template ---- -### TITLE ([Pull #PULL_NUMBER](https://github.com/REPO_WITH_OWNER/pull/PULL_NUMBER)) - -BODY - -By [@AUTHOR](https://github.com/AUTHOR) in https://github.com/REPO_WITH_OWNER/pull/PULL_NUMBER -