Merge fauna_logs branch into v4 (#672)

* Add optional, per-query parameters for providing a traceparent and tags (#654)

* Add optional, per-query parameters for traceparent and tags

* Fix merge conflicts

* Fix tests. More merge conflicts

* Address PR feedback

* Tag validation (#658)

* Add validation on per-query tags

* Bump version for beta

* Fix tags type (#661)

* Fix tags type

* 4.8.0-beta.2

* Force "logbeta" tag in publishConfig (#662)

* Set version to 4.8.0

* Version

* Run tests serially because reasons

* Run all node versions in parallel

* npm install

* run npm install with v6

* Remove publishConfig block

* Changelog

* Skip failing test; passes locally

* Removing beta note

* Remove client validation and update tests

---------

Co-authored-by: Trevor Finn <[email protected]>
Co-authored-by: Cleve Stuart <[email protected]>
Co-authored-by: Henry Ball <[email protected]>

Author: 4 people

Diff for: .circleci/config.yml

@@ -128,21 +128,13 @@ workflows:
           context: faunadb-drivers
       - core-stable-16:
           context: faunadb-drivers
-          requires:
-            - core-stable-14
       - core-stable-18:
           context: faunadb-drivers
-          requires:
-            - core-stable-16
 
       # Nightly path
       - core-nightly-14:
           context: faunadb-drivers
       - core-nightly-16:
           context: faunadb-drivers
-          requires:
-            - core-nightly-14
       - core-nightly-18:
           context: faunadb-drivers
-          requires:
-            - core-nightly-16

Diff for: CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.8.0
+- Add `tags` and `traceheader` support in `client.query` [#672](https://github.com/fauna/faunadb-js/pull/672)
+
 ## 4.7.1
 - disallow undefined required args [#663](https://github.com/fauna/faunadb-js/pull/663)
 

Diff for: README.md

@@ -237,8 +237,9 @@ var data = client.query(q.Paginate(q.Collections()), {
 
 #### Per-query options
 
-Some options (currently only `secret` and `queryTimout`) can be overriden on a per-query basis:
+Some options can be provided on a per-query basis:
 
+##### secret
 ```javascript
 var createP = client.query(
   q.Create(q.Collection('test'), { data: { testField: 'testValue' } }),
@@ -256,12 +257,34 @@ var helper = client.paginate(
 )
 ```
 
+##### queryTimeout
 ```javascript
 var data = client.query(q.Paginate(q.Collections()), {
   queryTimeout: 100,
 })
 ```
 
+##### traceparent
+A [W3C-compliant](https://w3c.github.io/trace-context) identifier for enabling distributed tracing across different
+vendors. If not provided, one is automatically generated server-side and attached to the query. Customer's should
+inspect the returned traceresponse to determine if a new traceparent has been created, and use that instead. See
+[Trace Context](https://w3c.github.io/trace-context) spec for more details.
+```javascript
+var data = client.query(q.Paginate(q.Collections()), {
+  traceparent: "00-c91308c112be8448dd34dc6191567fa0-b7ad6b7169203331-01",
+})
+```
+
+##### tags
+Allows for associating user-provided tags with a query.
+```javascript
+var data = client.query(q.Paginate(q.Collections()), {
+  tags: { key1: "value1", key2: "value2" },
+})
+```
+Both tags and their associated values, must be strings. The only allowable characters are alphanumeric values as well
+as an underscope (_). Max length for keys is 40 characters. Max length for values is 60 characters.
+
 #### Custom Fetch
 
 To use a custom `fetch()` you just have to specify it in the configuration and make it compatible with the [standard Web API Specification of the Fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API).