disable long support in protobuf.js

apollographql · Jun 28, 2019 · ec3a614 · ec3a614
1 parent fd0efdd
commit ec3a614
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/packages/apollo-engine-reporting-protobuf/src/index.js b/packages/apollo-engine-reporting-protobuf/src/index.js
@@ -1,4 +1,11 @@
 const protobuf = require('./protobuf');
+const protobufJS = require('protobufjs/minimal');
+
+// Remove Long support.  Our uint64s tend to be small (less
+// than 104 days).
+// https://github.com/protobufjs/protobuf.js/issues/1253
+protobufJS.util.Long = undefined;
+protobufJS.configure();
 
 // Override the generated protobuf Traces.encode function so that it will look
 // for Traces that are already encoded to Buffer as well as unencoded

diff --git a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts
@@ -1966,7 +1966,17 @@ export function testApolloServer<AS extends ApolloServerBase>(
         expect(earliestStartOffset).toBeLessThan(Infinity);
         expect(latestEndOffset).toBeGreaterThan(-Infinity);
         const resolverDuration = latestEndOffset - earliestStartOffset;
-        expect(resolverDuration).not.toBeGreaterThan(trace.durationNs);
+        expect(resolverDuration).toBeGreaterThan(0);
+        expect(trace.durationNs).toBeGreaterThanOrEqual(resolverDuration);
+
+        expect(trace.startTime.seconds).toBeLessThanOrEqual(
+          trace.endTime.seconds,
+        );
+        if (trace.startTime.seconds === trace.endTime.seconds) {
+          expect(trace.startTime.nanos).toBeLessThanOrEqual(
+            trace.endTime.nanos,
+          );
+        }
       });
     });