podium · epinault · Nov 17, 2023 · May 2, 2021 · Sep 17, 2021 · Nov 2, 2021
diff --git a/.dialyzer_ignore.exs b/.dialyzer_ignore.exs
@@ -1,4 +1,8 @@
 [
   {":0:unknown_function Function :persistent_term.get/1 does not exist."},
-  {":0:unknown_function Function :persistent_term.put/2 does not exist."}
+  {":0:unknown_function Function :persistent_term.put/2 does not exist."},
+  {"lib/absinthe/middleware/async.ex", :unknown_function, 117},
+  {"lib/absinthe/middleware/batch.ex", :unknown_function, 213},
+  {"lib/absinthe/utils/render.ex", :improper_list_constr, 51},
+  {":0:unknown_function Function OpentelemetryProcessPropagator.Task.async/1 does not exist."}
 ]
diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
@@ -9,33 +9,34 @@ on:
 jobs:
   test:
     name: Elixir ${{matrix.elixir}} / OTP ${{matrix.otp}}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
         elixir:
-          - "1.10"
-          - "1.11"
-          - "1.12"
           - "1.13"
+          - "1.14"
+          - "1.15"
         otp:
-          - "22"
-          - "23"
           - "24"
-        exclude:
-          - elixir: "1.10"
-            otp: "24"
+          - "25"
+          - "26"
         include:
-          - elixir: "1.13"
-            otp: "24"
+          - elixir: "1.15"
+            otp: "26"
             format: true
+        exclude:
+          - otp: 26
+            elixir: 1.13
+          - otp: 26
+            elixir: 1.14
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Set up Elixir
-        uses: erlef/setup-elixir@v1
+        uses: erlef/setup-beam@v1
         with:
           elixir-version: ${{ matrix.elixir }}
           otp-version: ${{ matrix.otp }}
@@ -69,3 +70,17 @@ jobs:
           mix test
         env:
           SCHEMA_PROVIDER: persistent_term
+
+      - name: Cache/uncache PLTs
+        uses: actions/cache@v3
+        with:
+          path: |
+            priv/plts
+          key: "v1-${{ runner.os }}-\
+                erlang-${{ matrix.otp }}-\
+                elixir-${{ matrix.elixir }}-\
+                ${{ hashFiles('mix.lock') }}"
+
+      - name: Run Dialyzer
+        run: mix dialyzer
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,21 +1,47 @@
 # Changelog
 
-## Unreleased
+## 1.7.4
+
+- Feature: Support Dataloader 2.0
+
+## 1.7.4
+
+- Bug Fix: [Bugfix: multiple pushes per client for subscriptions that have a context_id](https://github.com/absinthe-graphql/absinthe/pull/1249)
+
+## 1.7.3
+
+- Bug Fix: [OTP 26 and Elixir 1.15 tweaks](https://github.com/absinthe-graphql/absinthe/pull/1253)
+- Bug Fix: [OTP 25 tweaks](https://github.com/absinthe-graphql/absinthe/pull/1253)
+- Bug Fix: [Place extra error attributes in error extensions field](https://github.com/absinthe-graphql/absinthe/pull/1215)
+
+## 1.7.2
 
 - Bug Fix: [Validate type references for invalid wrapped types](https://github.com/absinthe-graphql/absinthe/pull/1195)
+- Feature: [Add `specifiedBy` type system directive](https://github.com/absinthe-graphql/absinthe/pull/1193)
+- Bug Fix: [Object type extensions may be empty](https://github.com/absinthe-graphql/absinthe/pull/1228)
+- Bug Fix: [Validate input object not being an Enum](https://github.com/absinthe-graphql/absinthe/pull/1231)
+- Bug Fix: [Deduplicate directives when building schema](https://github.com/absinthe-graphql/absinthe/pull/1242)
+
+## 1.7.1
 - Breaking Bugfix: [Validate repeatable directives on schemas](https://github.com/absinthe-graphql/absinthe/pull/1179)
+- Breaking Bugfix: [Add "Objects must define fields" schema validation](https://github.com/absinthe-graphql/absinthe/pull/1167)
+- Bug Fix: [Validate field identifier uniqueness](https://github.com/absinthe-graphql/absinthe/pull/1200)
+- Bug Fix: [Validate type references for invalid wrapped types](https://github.com/absinthe-graphql/absinthe/pull/1195)
 - Bug Fix: Adds **optional fix** for non compliant built-in scalar Int type. `use Absinthe.Schema, use_spec_compliant_int_scalar: true` in your schema to use the fixed Int type. It is also advisable to upgrade for custom types if you are leveraging the use of integers outside the GraphQl standard. [#1131](https://github.com/absinthe-graphql/absinthe/pull/1131).
 - Feature: [Support error tuples when scalar parsing fails](https://github.com/absinthe-graphql/absinthe/pull/1187)
 - Feature: [Convert SDL Language.\* structs to SDL notation](https://github.com/absinthe-graphql/absinthe/pull/1160)
+- Feature: [Support passing the resolution struct to dataloader helper callbacks](https://github.com/absinthe-graphql/absinthe/pull/1211)
 - Feature: [Add support for type extensions](https://github.com/absinthe-graphql/absinthe/pull/1157)
 - Bug Fix: [Add type system directives to introspection results](https://github.com/absinthe-graphql/absinthe/pull/1189)
 - Bug Fix: [Add `__private__` field to EnumValueDefinition](https://github.com/absinthe-graphql/absinthe/pull/1148)
 - Bug Fix: [Fix bug in Schema.**absinthe_types**(:all) for Persistent Term](https://github.com/absinthe-graphql/absinthe/pull/1161)
 - Bug Fix: [Fix default enum value check for SDL schema's](https://github.com/absinthe-graphql/absinthe/pull/1188)
-- Bug Fix: [Add "Objects must define fields" schema validation](https://github.com/absinthe-graphql/absinthe/pull/1167)
 - Feature: [Add `import_directives` macro](https://github.com/absinthe-graphql/absinthe/pull/1158)
 - Feature: [Support type extensions on schema declarations](https://github.com/absinthe-graphql/absinthe/pull/1176)
 - Bug Fix: [Root objects are marked as referenced correctly](https://github.com/absinthe-graphql/absinthe/pull/1186)
+- Bug Fix: [Prevent DDOS attacks with long queries](https://github.com/absinthe-graphql/absinthe/pull/1220)
+- Feature: [pipeline_modifier option to Absinthe.run/3](https://github.com/absinthe-graphql/absinthe/pull/1221)
+- Bug Fix: [Add end_time_mono to telemetry :stop events](https://github.com/absinthe-graphql/absinthe/pull/1174)
 
 ## 1.7.0
 
@@ -104,6 +130,10 @@ too impactful for a patch release.
 - Bug Fix: Handle null propagation with `non_null(list_of(non_null(type)))` properly
 - Bug Fix: Fix [double escaping issue](https://github.com/absinthe-graphql/absinthe/pull/962) with string literal arguments.
 
+## 1.5.3 (unreleased)
+
+- Bug Fix: Handle null propagation with `non_null(list_of(non_null(type)))` properly
+
 ## 1.5.2
 
 - Bug Fix: Fix issue with persistent term backend.

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -39,4 +39,4 @@ Some things that will increase the chance that your pull request is accepted:
 
 Thanks again for helping!
 
-[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[commit]: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Goals:
 - Detailed error messages and documentation.
 - A focus on robustness and production-level performance.
 
-Please see the website at [http://absinthe-graphql.org](http://absinthe-graphql.org).
+Please see the website at [https://absinthe-graphql.org](https://absinthe-graphql.org).
 
 ## Why Use Absinthe?
 
@@ -86,7 +86,7 @@ See [CHANGELOG](./CHANGELOG.md) for upgrade steps between versions.
 
 - [Absinthe hexdocs](https://hexdocs.pm/absinthe).
 - For the tutorial, guides, and general information about Absinthe-related
-  projects, see [http://absinthe-graphql.org](http://absinthe-graphql.org).
+  projects, see [https://absinthe-graphql.org](https://absinthe-graphql.org).
 
 ### Mix Tasks
 

diff --git a/guides/complexity-analysis.md b/guides/complexity-analysis.md
@@ -1,7 +1,19 @@
-# Complexity Analysis
+# Safety Limits
 
 A misbehaving client might send a very complex GraphQL query that would require
-considerable resources to handle. In order to protect against this scenario, the
+considerable resources to handle. There are two variations of this problem:
+
+- Complex queries that overwhelm resolution resources.
+- Extremely long queries that could take considerable resources to parse. 
+(For example, an attacker could craft a long query including thousands of 
+undefined fields or directives.)
+
+Either of these could be a vector for a denial-of-service attack in any GraphQL 
+service. Absinthe includes mechanisms to protect services each of these.
+
+## Complexity Analysis
+
+To protect against queries that could overwhelm available resources, the
 complexity of a query can be estimated before it is resolved and limited to a
 specified maximum.
 
@@ -105,3 +117,11 @@ But this, at a complexity of `60`, wouldn't:
 If a document's calculated complexity exceeds the configured limit, resolution
 will be skipped and an error will be returned in the result detailing the
 calculated and maximum complexities.
+
+## Token Limits
+
+To protect a service from invalid queries that could take considerable resources to parse, 
+Absinthe offers the option to configure a maximum limit on tokens in the GraphQL request document. 
+If the lexer encounters more tokens than this, it will stop the parse phase and return a phase error 
+with the message `"Token limit exceeded"`. This limit is `:infinity` by default (no limit) 
+and can be overridden by providing an integer to the option `token_limit` to `Absinthe.run`.
diff --git a/guides/introduction/learning.md b/guides/introduction/learning.md
@@ -8,7 +8,7 @@ The following are some Absinthe-specific educational resources that are availabl
 
 ## Online Resources
 
-* [Website](http://absinthe-graphql.org) (mostly just links elsewhere)
+* [Website](https://absinthe-graphql.org) (mostly just links elsewhere)
 * [Documentation](https://hexdocs.pm/absinthe) (current stable release)
 * [How to GraphQL (with Absinthe)](https://www.howtographql.com/graphql-elixir/0-introduction/)
 
@@ -21,4 +21,4 @@ The following are some Absinthe-specific educational resources that are availabl
 
 There's a ton of GraphQL resources on the web.
 
-The [official website](http://graphql.org/) and [How to GraphQL](https://www.howtographql.com) are good places to start.
+The [official website](https://graphql.org/) and [How to GraphQL](https://www.howtographql.com) are good places to start.
diff --git a/guides/introduction/overview.md b/guides/introduction/overview.md
@@ -10,7 +10,7 @@ If you're new to GraphQL, we suggest you read up a bit on GraphQL's foundational
 
 Here are a few resources that might be helpful:
 
-- The official [GraphQL](http://graphql.org/) website
+- The official [GraphQL](https://graphql.org/) website
 - [How to GraphQL](https://www.howtographql.com/), which includes a [brief tutorial](https://www.howtographql.com/graphql-elixir/0-introduction/) using Absinthe
 
 ## Absinthe

diff --git a/guides/introspection.md b/guides/introspection.md
@@ -121,11 +121,5 @@ end
 ```
 
 If you'd prefer to use a desktop application, we recommend using the pre-built
-[Electron](http://electron.atom.io)-based wrapper application,
+[Electron](https://electron.atom.io)-based wrapper application,
 [GraphiQL.app](https://github.com/skevy/graphiql-app).
-
-### GraphQL Hub
-
-[GraphQL Hub](https://www.graphqlhub.com/) is an interesting website that you
-can use to introspect a number of public GraphQL servers, using GraphiQL in the
-browser and providing useful examples.
diff --git a/guides/plug-phoenix.md b/guides/plug-phoenix.md
@@ -100,7 +100,7 @@ With a query string:
 ?query=query+GetItem($id:ID!){item(id:$id){name}}&variables={id:"foo"}
 ```
 
-Due to [varying limits on the maximum size of URLs](http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers),
+Due to [varying limits on the maximum size of URLs](https://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers),
 we recommend using one of the POST options below instead, putting the `query` into the body of the request.
 
 ### Via an `application/json` POST

diff --git a/guides/subscriptions.md b/guides/subscriptions.md
@@ -45,8 +45,17 @@ line:
     Supervisor.start_link(children, opts)
 ```
 
+See `Absinthe.Subscription.child_spec/1` for more information on the supported
+options.
+
 In your `MyAppWeb.Endpoint` module add:
 
+```elixir
+use Absinthe.Phoenix.Endpoint
+```
+
+Now, you need to configure your socket. I.e. in your `MyAppWeb.UserSocket` module add:
+
 ```elixir
 use Absinthe.Phoenix.Socket,
   schema: MyAppWeb.Schema

diff --git a/guides/telemetry.md b/guides/telemetry.md
@@ -62,3 +62,29 @@ After a query is executed, you'll see something like:
   }
 }
 ```
+
+## Opentelemetry
+
+When using Opentelemetry, one usually wants to correlate spans that are created
+in spawned tasks with the main trace. For example, you might have a trace started
+in a Phoenix endpoint, and then have spans around database access.
+
+One can correlate manually by attaching the OTel context the task function:
+
+```elixir
+ctx = OpenTelemetry.Ctx.get_current()
+
+Task.async(fn ->
+  OpenTelemetry.Ctx.attach(ctx)
+
+  # do stuff that might create spans
+end)
+```
+
+When using the `async` and `batch` middleware, the tasks are spawned by Absinthe,
+so you can't attach the context manually.
+
+Instead, you can add the `:opentelemetry_process_propagator` package to your
+dependencies, which has a `Task.async/1` wrapper that will attach the context
+automatically. If the package is installed, the middleware will use it in place
+of the default `Task.async/1`.
diff --git a/guides/testing.md b/guides/testing.md
@@ -89,7 +89,7 @@ end
 ```
 
 Phoenix generates the `MyAppWeb.ConnCase` test helper module. This supplies the
-`conn` variable containing the request and response.  It also has helper functions 
+`conn` variable containing the request and response. It also has helper functions 
 such as [`post/3`](https://hexdocs.pm/phoenix/Phoenix.ConnTest.html#post/3)
 and [`json_response/2`](https://hexdocs.pm/phoenix/Phoenix.ConnTest.html#json_response/2).
 

diff --git a/guides/tutorial/our-first-query.md b/guides/tutorial/our-first-query.md
@@ -110,7 +110,7 @@ which is where all the domain logic for posts lives, invoking its
 > for [advanced plugins](middleware-and-plugins.md) that further process the data.
 >
 > If you're asking yourself what the implementation of the domain logic looks like, and exactly how
-> the related Ecto schemas are built, read through the code in the [absinthe_tutorial](http://github.com/absinthe-graphql/absinthe_tutorial)
+> the related Ecto schemas are built, read through the code in the [absinthe_tutorial](https://github.com/absinthe-graphql/absinthe_tutorial)
 > repository. The tutorial content here is intentionally focused on the Absinthe-specific code.
 
 Now that we have the functional pieces in place, let's configure our
@@ -156,7 +156,7 @@ Once it's up-and-running, take a look at [http://localhost:4000/api/graphiql](ht
 
 Make sure that the `URL` is pointing to the correct place and press the play button. If everything goes according to plan, you should see something like this:
 
-<img style="box-shadow: 0 0 6px #ccc;" src="assets/tutorial/graphiql.png" alt=""/>
+<img style="box-shadow: 0 0 6px #ccc;" src="/guides/assets/tutorial/graphiql.png" alt=""/>
 
 ## Next Step
 

diff --git a/guides/tutorial/start.md b/guides/tutorial/start.md
@@ -7,7 +7,7 @@ Absinthe.
 
 Before you start, it's a good idea to have some background into GraphQL in general. Here are a few resources that might be helpful:
 
-- The official [GraphQL](http://graphql.org/) website
+- The official [GraphQL](https://graphql.org/) website
 - [How to GraphQL](https://www.howtographql.com/) (this includes another [brief tutorial](https://www.howtographql.com/graphql-elixir/0-introduction/) using Absinthe)
 
 ## The Example

diff --git a/guides/tutorial/subscriptions.md b/guides/tutorial/subscriptions.md
@@ -33,7 +33,7 @@ In `lib/blog/application.ex`:
   children = [
     # other children ...
     {BlogWeb.Endpoint, []}, # this line should already exist
-    {Absinthe.Subscription, [BlogWeb.Endpoint]}, # add this line
+    {Absinthe.Subscription, BlogWeb.Endpoint}, # add this line
     # other children ...
   ]
 ```

diff --git a/guides/upgrading/v1.4.md b/guides/upgrading/v1.4.md
@@ -97,7 +97,7 @@ The reason for this is that you can also access the `context` within the `exec`
 
 ## Calling All Resolvers: The Null Literal Has Arrived
 
-Absinthe now supports [GraphQL `null` literals](http://facebook.github.io/graphql/October2016/#sec-Null-Value).
+Absinthe now supports [GraphQL `null` literals](https://spec.graphql.org/October2016/#sec-Null-Value).
 
 `null` values, when provided as arguments, are passed on to Absinthe resolvers as `nil` (provided they don't run afoul of a `non_null/1` argument constraint).
 

diff --git a/lib/absinthe.ex b/lib/absinthe.ex
@@ -3,7 +3,7 @@ defmodule Absinthe do
   Documentation for the Absinthe package, a toolkit for building GraphQL
   APIs with Elixir.
 
-  For usage information, see [the documentation](http://hexdocs.pm/absinthe), which
+  For usage information, see [the documentation](https://hexdocs.pm/absinthe), which
   includes guides, API information for important modules, and links to useful resources.
   """
 
@@ -49,6 +49,8 @@ defmodule Absinthe do
           | %{data: nil | result_selection_t, errors: [result_error_t]}
           | %{errors: [result_error_t]}
 
+  @type pipeline_modifier_fun :: (Absinthe.Pipeline.t(), Keyword.t() -> Absinthe.Pipeline.t())
+
   @doc """
   Evaluates a query document against a schema, with options.
 
@@ -92,7 +94,8 @@ defmodule Absinthe do
           operation_name: String.t(),
           analyze_complexity: boolean,
           variables: %{optional(String.t()) => any()},
-          max_complexity: non_neg_integer | :infinity
+          max_complexity: non_neg_integer | :infinity,
+          pipeline_modifier: pipeline_modifier_fun()
         ]
 
   @type run_result :: {:ok, result_t} | {:error, String.t()}
@@ -103,9 +106,12 @@ defmodule Absinthe do
           run_opts
         ) :: run_result
   def run(document, schema, options \\ []) do
+    pipeline_modifier = options[:pipeline_modifier] || (&pipeline_identity/2)
+
     pipeline =
       schema
       |> Absinthe.Pipeline.for_document(options)
+      |> pipeline_modifier.(options)
 
     case Absinthe.Pipeline.run(document, pipeline) do
       {:ok, %{result: result}, _phases} ->
@@ -126,12 +132,14 @@ defmodule Absinthe do
   @spec run!(
           binary | Absinthe.Language.Source.t() | Absinthe.Language.Document.t(),
           Absinthe.Schema.t(),
-          Keyword.t()
+          run_opts
         ) :: result_t | no_return
   def run!(input, schema, options \\ []) do
     case run(input, schema, options) do
       {:ok, result} -> result
       {:error, err} -> raise ExecutionError, message: err
     end
   end
+
+  defp pipeline_identity(pipeline, _options), do: pipeline
 end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,4 +39,4 @@ Some things that will increase the chance that your pull request is accepted:

		Thanks again for helping!

		[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
		[commit]: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html