release: on branch next

composition-js/CHANGELOG.md

@@ -1,5 +1,44 @@
 # CHANGELOG for `@apollo/composition`
 
+## 2.6.0
+### Minor Changes
+
+
+- Update `license` field in `package.json` to use `Elastic-2.0` SPDX identifier ([#2741](https://github.com/apollographql/federation/pull/2741))
+
+
+- Introduce the new `@policy` scope for composition ([#2818](https://github.com/apollographql/federation/pull/2818))
+
+    > Note that this directive will only be _fully_ supported by the Apollo Router as a GraphOS Enterprise feature at runtime. Also note that _composition_ of valid `@policy` directive applications will succeed, but the resulting supergraph will not be _executable_ by the Gateway or an Apollo Router which doesn't have the GraphOS Enterprise entitlement.
+  
+    Users may now compose `@policy` applications from their subgraphs into a supergraph.
+
+    The directive is defined as follows:
+
+    ```graphql
+    scalar federation__Policy
+
+    directive @policy(policies: [[federation__Policy!]!]!) on
+      | FIELD_DEFINITION
+      | OBJECT
+      | INTERFACE
+      | SCALAR
+      | ENUM
+    ```
+
+    The `Policy` scalar is effectively a `String`, similar to the `FieldSet` type.
+
+    In order to compose your `@policy` usages, you must update your subgraph's federation spec version to v2.6 and add the `@policy` import to your existing imports like so:
+    ```graphql
+    @link(url: "https://specs.apollo.dev/federation/v2.6", import: [..., "@policy"])
+    ```
+
+### Patch Changes
+
+- Updated dependencies [[`b18841be`](https://github.com/apollographql/federation/commit/b18841be897e6d4f47454568776f199e2adb60ae), [`e325b499`](https://github.com/apollographql/federation/commit/e325b499d592dabe61c93112c292c92ca10afbc5)]:
+  - @apollo/query-graphs@2.6.0
+  - @apollo/federation-internals@2.6.0
+
 ## 2.5.7
 ### Patch Changes
 

composition-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/composition",
-  "version": "2.5.7",
+  "version": "2.6.0",
   "description": "Apollo Federation composition utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,8 +27,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/federation-internals": "2.5.7",
-    "@apollo/query-graphs": "2.5.7"
+    "@apollo/federation-internals": "2.6.0",
+    "@apollo/query-graphs": "2.6.0"
   },
   "peerDependencies": {
     "graphql": "^16.5.0"

federation-integration-testsuite-js/CHANGELOG.md

@@ -1,5 +1,38 @@
 # CHANGELOG for `federation-integration-testsuite-js`
 
+## 2.6.0
+### Minor Changes
+
+
+- Update `license` field in `package.json` to use `Elastic-2.0` SPDX identifier ([#2741](https://github.com/apollographql/federation/pull/2741))
+
+
+- Introduce the new `@policy` scope for composition ([#2818](https://github.com/apollographql/federation/pull/2818))
+
+    > Note that this directive will only be _fully_ supported by the Apollo Router as a GraphOS Enterprise feature at runtime. Also note that _composition_ of valid `@policy` directive applications will succeed, but the resulting supergraph will not be _executable_ by the Gateway or an Apollo Router which doesn't have the GraphOS Enterprise entitlement.
+  
+    Users may now compose `@policy` applications from their subgraphs into a supergraph.
+
+    The directive is defined as follows:
+
+    ```graphql
+    scalar federation__Policy
+
+    directive @policy(policies: [[federation__Policy!]!]!) on
+      | FIELD_DEFINITION
+      | OBJECT
+      | INTERFACE
+      | SCALAR
+      | ENUM
+    ```
+
+    The `Policy` scalar is effectively a `String`, similar to the `FieldSet` type.
+
+    In order to compose your `@policy` usages, you must update your subgraph's federation spec version to v2.6 and add the `@policy` import to your existing imports like so:
+    ```graphql
+    @link(url: "https://specs.apollo.dev/federation/v2.6", import: [..., "@policy"])
+    ```
+
 ## 2.5.7
 
 ## 2.5.6

federation-integration-testsuite-js/package.json

@@ -1,7 +1,7 @@
 {
   "name": "apollo-federation-integration-testsuite",
   "private": true,
-  "version": "2.5.7",
+  "version": "2.6.0",
   "description": "Apollo Federation Integrations / Test Fixtures",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

gateway-js/CHANGELOG.md

@@ -1,5 +1,81 @@
 # CHANGELOG for `@apollo/gateway`
 
+## 2.6.0
+### Minor Changes
+
+
+- Add more information to OpenTelemetry spans. ([#2700](https://github.com/apollographql/federation/pull/2700))
+
+  Rename `operationName` to `graphql.operation.name` and add a
+  `graphql.operation.type` attribute, in conformance with the OpenTelemetry
+  Semantic Conventions for GraphQL. The `operationName` attribute is now
+  deprecated, but it is still emitted alongside `graphql.operation.name`.
+
+  Add a `graphql.document` span attribute to the `gateway.request` span,
+  containing the entire GraphQL source sent in the request. This feature
+  is disable by default.
+
+  When one or more GraphQL or internal errors occur, report them in the
+  OpenTelemetry span in which they took place, as an exception event. This
+  feature is disabled by default.
+
+  To enable the `graphql.document` span attribute and the exception event
+  reporting, add the following entries to your `ApolloGateway` instance
+  configuration:
+
+  ```ts
+  const gateway = new ApolloGateway({
+    // ...
+    telemetry: {
+      // Set to `true` to include the `graphql.document` attribute
+      includeDocument: true,
+      // Set to `true` to report all exception events, or set to a number
+      // to report at most that number of exception events per span
+      reportExceptions: true,
+      // or: reportExceptions: 1
+    },
+  });
+  ```
+
+- Update `license` field in `package.json` to use `Elastic-2.0` SPDX identifier ([#2741](https://github.com/apollographql/federation/pull/2741))
+
+
+- Introduce the new `@policy` scope for composition ([#2818](https://github.com/apollographql/federation/pull/2818))
+
+    > Note that this directive will only be _fully_ supported by the Apollo Router as a GraphOS Enterprise feature at runtime. Also note that _composition_ of valid `@policy` directive applications will succeed, but the resulting supergraph will not be _executable_ by the Gateway or an Apollo Router which doesn't have the GraphOS Enterprise entitlement.
+  
+    Users may now compose `@policy` applications from their subgraphs into a supergraph.
+
+    The directive is defined as follows:
+
+    ```graphql
+    scalar federation__Policy
+
+    directive @policy(policies: [[federation__Policy!]!]!) on
+      | FIELD_DEFINITION
+      | OBJECT
+      | INTERFACE
+      | SCALAR
+      | ENUM
+    ```
+
+    The `Policy` scalar is effectively a `String`, similar to the `FieldSet` type.
+
+    In order to compose your `@policy` usages, you must update your subgraph's federation spec version to v2.6 and add the `@policy` import to your existing imports like so:
+    ```graphql
+    @link(url: "https://specs.apollo.dev/federation/v2.6", import: [..., "@policy"])
+    ```
+
+- Add graphql.operation.name attribute on gateway.plan span ([#2807](https://github.com/apollographql/federation/pull/2807))
+
+
+### Patch Changes
+
+- Updated dependencies [[`b18841be`](https://github.com/apollographql/federation/commit/b18841be897e6d4f47454568776f199e2adb60ae), [`e325b499`](https://github.com/apollographql/federation/commit/e325b499d592dabe61c93112c292c92ca10afbc5)]:
+  - @apollo/query-planner@2.6.0
+  - @apollo/composition@2.6.0
+  - @apollo/federation-internals@2.6.0
+
 ## 2.5.7
 ### Patch Changes
 

gateway-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/gateway",
-  "version": "2.5.7",
+  "version": "2.6.0",
   "description": "Apollo Gateway",
   "author": "Apollo <packages@apollographql.com>",
   "main": "dist/index.js",
@@ -25,9 +25,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/composition": "2.5.7",
-    "@apollo/federation-internals": "2.5.7",
-    "@apollo/query-planner": "2.5.7",
+    "@apollo/composition": "2.6.0",
+    "@apollo/federation-internals": "2.6.0",
+    "@apollo/query-planner": "2.6.0",
     "@apollo/server-gateway-interface": "^1.1.0",
     "@apollo/usage-reporting-protobuf": "^4.1.0",
     "@apollo/utils.createhash": "^2.0.0",

internals-js/CHANGELOG.md

@@ -1,5 +1,38 @@
 # CHANGELOG for `@apollo/federation-internals`
 
+## 2.6.0
+### Minor Changes
+
+
+- Update `license` field in `package.json` to use `Elastic-2.0` SPDX identifier ([#2741](https://github.com/apollographql/federation/pull/2741))
+
+
+- Introduce the new `@policy` scope for composition ([#2818](https://github.com/apollographql/federation/pull/2818))
+
+    > Note that this directive will only be _fully_ supported by the Apollo Router as a GraphOS Enterprise feature at runtime. Also note that _composition_ of valid `@policy` directive applications will succeed, but the resulting supergraph will not be _executable_ by the Gateway or an Apollo Router which doesn't have the GraphOS Enterprise entitlement.
+  
+    Users may now compose `@policy` applications from their subgraphs into a supergraph.
+
+    The directive is defined as follows:
+
+    ```graphql
+    scalar federation__Policy
+
+    directive @policy(policies: [[federation__Policy!]!]!) on
+      | FIELD_DEFINITION
+      | OBJECT
+      | INTERFACE
+      | SCALAR
+      | ENUM
+    ```
+
+    The `Policy` scalar is effectively a `String`, similar to the `FieldSet` type.
+
+    In order to compose your `@policy` usages, you must update your subgraph's federation spec version to v2.6 and add the `@policy` import to your existing imports like so:
+    ```graphql
+    @link(url: "https://specs.apollo.dev/federation/v2.6", import: [..., "@policy"])
+    ```
+
 ## 2.5.7
 
 ## 2.5.6

internals-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/federation-internals",
-  "version": "2.5.7",
+  "version": "2.6.0",
   "description": "Apollo Federation internal utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",