Skip to content

Commit

Permalink
changelog & lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Geoffroy Couprie committed Dec 12, 2022
1 parent 7c606d7 commit d564e36
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
6 changes: 6 additions & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ By [@Geal](https://github.com/geal) in https://github.com/apollographql/router/p
When we drop Telemetry we spawn a thread to perform the global opentelemetry trace provider shutdown. The documentation of this function indicates that "This will invoke the shutdown method on all span processors. span processors should export remaining spans before return". We should give that process some time to complete (5 seconds currently) before returning from the `drop`. This will provide more opportunity for spans to be exported.

By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/2191
### Dispatch errors from the primary response to deferred responses ([Issue #1818](https://github.com/apollographql/router/issues/1818), [Issue #2185](https://github.com/apollographql/router/issues/2185))

When errors are generated during the primary execution, some of them can be affected to
deferred responses.

By [@Geal](https://github.com/geal) in https://github.com/apollographql/router/pull/2192

## 🛠 Maintenance

Expand Down
5 changes: 2 additions & 3 deletions apollo-router/src/spec/selection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ use serde::Deserialize;
use serde::Serialize;
use serde_json_bytes::ByteString;

use super::Fragments;
use crate::json_ext::Object;
use crate::json_ext::PathElement;
use crate::spec::TYPENAME;
use crate::FieldType;
use crate::Schema;
use crate::SpecError;

use super::Fragments;

#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub(crate) enum Selection {
Field {
Expand Down Expand Up @@ -376,7 +375,7 @@ impl Selection {
if let Some(f) = fragments.get(name) {
f.selection_set
.iter()
.any(|selection| selection.contains_error_path(&path, fragments))
.any(|selection| selection.contains_error_path(path, fragments))
} else {
false
}
Expand Down

0 comments on commit d564e36

Please sign in to comment.