Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Duplicate V2 #1846

Merged
merged 2 commits into from
Jul 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions __mocks__/dd-trace.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// No-op: make sure we never load dd-trace in tests, as we run into memory issues.
10 changes: 8 additions & 2 deletions src/lib/cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { isArray } from "lodash"
import config from "config"
import { error, verbose } from "./loggers"
import Memcached from "memcached"
import { cacheTracer } from "./tracer"
import { statsClient } from "./stats"
import { createCacheTracer } from "./tracer"
import { createStatsClient } from "./stats"

const {
NODE_ENV,
Expand Down Expand Up @@ -80,6 +80,12 @@ function createMemcachedClient() {

export const client = isTest ? createMockClient() : createMemcachedClient()

const cacheTracer: ReturnType<typeof createCacheTracer> = isTest
? { get: x => x, set: x => x, delete: x => x }
: createCacheTracer()

const statsClient = isTest ? null : createStatsClient()

function _get<T>(key) {
return new Promise<T>((resolve, reject) => {
let timeoutId: NodeJS.Timer | null = setTimeout(() => {
Expand Down
154 changes: 79 additions & 75 deletions src/lib/stats.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,88 +4,92 @@ import StatsD from "hot-shots"
import config from "config"
import { error } from "./loggers"

const {
NODE_ENV,
ENABLE_METRICS,
STATSD_HOST,
STATSD_PORT,
DD_TRACER_SERVICE_NAME,
} = config
export function createStatsClient() {
const {
NODE_ENV,
ENABLE_METRICS,
STATSD_HOST,
STATSD_PORT,
DD_TRACER_SERVICE_NAME,
} = config

const isProd = NODE_ENV === "production"
const enableMetrics = ENABLE_METRICS === "true"
const appMetricsDisable = [
"http",
"http-outbound",
"mongo",
"socketio",
"mqlight",
"postgresql",
"mqtt",
"mysql",
"redis",
"riak",
"memcached",
"oracledb",
"oracle",
"strong-oracle",
]
const isProd = NODE_ENV === "production"
const enableMetrics = ENABLE_METRICS === "true"
const appMetricsDisable = [
"http",
"http-outbound",
"mongo",
"socketio",
"mqlight",
"postgresql",
"mqtt",
"mysql",
"redis",
"riak",
"memcached",
"oracledb",
"oracle",
"strong-oracle",
]

export const statsClient = new StatsD({
host: STATSD_HOST,
port: STATSD_PORT,
globalTags: { service: DD_TRACER_SERVICE_NAME, pod_name: os.hostname() },
mock: !isProd,
errorHandler: function(err) {
error(`Statsd client error ${err}`)
},
})

if (enableMetrics && isProd) {
const appmetrics = require("appmetrics")
appmetrics.configure({
mqtt: "off",
})
const monitoring = appmetrics.monitor()
_.forEach(appMetricsDisable, (val, idx) => {
appmetrics.disable(val)
const statsClient = new StatsD({
host: STATSD_HOST,
port: STATSD_PORT,
globalTags: { service: DD_TRACER_SERVICE_NAME, pod_name: os.hostname() },
mock: !isProd,
errorHandler: function(err) {
error(`Statsd client error ${err}`)
},
})

monitoring.on("loop", loopMetrics => {
statsClient.timing("loop.count_per_five_seconds", loopMetrics.count)
statsClient.timing("loop.minimum_loop_duration", loopMetrics.minimum)
statsClient.timing("loop.maximum_loop_duration", loopMetrics.maximum)
statsClient.timing("loop.cpu_usage_in_userland", loopMetrics.cpu_user)
statsClient.timing("loop.cpu_usage_in_system", loopMetrics.cpu_system)
})
if (enableMetrics && isProd) {
const appmetrics = require("appmetrics")
appmetrics.configure({
mqtt: "off",
})
const monitoring = appmetrics.monitor()
_.forEach(appMetricsDisable, (val, idx) => {
appmetrics.disable(val)
})

monitoring.on("eventloop", eventloopMetrics => {
statsClient.timing("eventloop.latency.min", eventloopMetrics.latency.min)
statsClient.timing("eventloop.latency.max", eventloopMetrics.latency.max)
statsClient.timing("eventloop.latency.avg", eventloopMetrics.latency.avg)
})
monitoring.on("loop", loopMetrics => {
statsClient.timing("loop.count_per_five_seconds", loopMetrics.count)
statsClient.timing("loop.minimum_loop_duration", loopMetrics.minimum)
statsClient.timing("loop.maximum_loop_duration", loopMetrics.maximum)
statsClient.timing("loop.cpu_usage_in_userland", loopMetrics.cpu_user)
statsClient.timing("loop.cpu_usage_in_system", loopMetrics.cpu_system)
})

monitoring.on("memory", memoryMetrics => {
statsClient.gauge("memory.physical", memoryMetrics.physical)
statsClient.gauge("memory.virtual", memoryMetrics.virtual)
})
monitoring.on("eventloop", eventloopMetrics => {
statsClient.timing("eventloop.latency.min", eventloopMetrics.latency.min)
statsClient.timing("eventloop.latency.max", eventloopMetrics.latency.max)
statsClient.timing("eventloop.latency.avg", eventloopMetrics.latency.avg)
})

monitoring.on("gc", gcMetrics => {
statsClient.gauge("gc.heap_size", gcMetrics.size)
statsClient.gauge("gc.heap_used", gcMetrics.used)
statsClient.timing("gc.sweep_duration", gcMetrics.duration, {
sweep_type: gcMetrics.type,
monitoring.on("memory", memoryMetrics => {
statsClient.gauge("memory.physical", memoryMetrics.physical)
statsClient.gauge("memory.virtual", memoryMetrics.virtual)
})
})

setInterval(() => {
statsClient.gauge(
"process.active_handles",
process._getActiveHandles().length
)
statsClient.gauge(
"process.active_requests",
process._getActiveRequests().length
)
}, 5000)
monitoring.on("gc", gcMetrics => {
statsClient.gauge("gc.heap_size", gcMetrics.size)
statsClient.gauge("gc.heap_used", gcMetrics.used)
statsClient.timing("gc.sweep_duration", gcMetrics.duration, {
sweep_type: gcMetrics.type,
})
})

setInterval(() => {
statsClient.gauge(
"process.active_handles",
process._getActiveHandles().length
)
statsClient.gauge(
"process.active_requests",
process._getActiveRequests().length
)
}, 5000)
}

return statsClient
}
3 changes: 2 additions & 1 deletion src/lib/stitching/convection/__tests__/stitching.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import { incrementalMergeSchemas } from "../../mergeSchemas"
import { graphql } from "graphql"
import gql from "lib/gql"
import { addMockFunctionsToSchema } from "graphql-tools"
import schema from "schema/v1/schema"

it("resolves an Artist on a Consignment Submission", async () => {
const allMergedSchemas = await incrementalMergeSchemas({
const allMergedSchemas = await incrementalMergeSchemas(schema, {
ENABLE_CONSIGNMENTS_STITCHING: true,
})

Expand Down
3 changes: 1 addition & 2 deletions src/lib/stitching/mergeSchemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { executableKawsSchema } from "lib/stitching/kaws/schema"
import { kawsStitchingEnvironment } from "lib/stitching/kaws/stitching"
import config from "config"

import localSchema from "schema/v1/schema"
import { GraphQLSchema } from "graphql"
import { exchangeStitchingEnvironment } from "./exchange/stitching"
import { executableVortexSchema } from "lib/stitching/vortex/schema"
Expand All @@ -19,7 +18,7 @@ import { vortexStitchingEnvironment } from "./vortex/stitching"
/**
* Incrementally merges in schemas according to `process.env`
*/
export const incrementalMergeSchemas = (testConfig?: any) => {
export const incrementalMergeSchemas = (localSchema, testConfig?: any) => {
const environment = testConfig || config

const {
Expand Down
10 changes: 6 additions & 4 deletions src/lib/tracer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ const createCommand = (command: string) => <T>(
)
}

export const cacheTracer = {
get: createCommand("get"),
set: createCommand("set"),
delete: createCommand("delete"),
export function createCacheTracer() {
return {
get: createCommand("get"),
set: createCommand("set"),
delete: createCommand("delete"),
}
}
2 changes: 1 addition & 1 deletion src/schema/v1/__tests__/article.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"

describe("Article type", () => {
let article = null
Expand Down
2 changes: 1 addition & 1 deletion src/schema/v1/__tests__/articles.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"

describe("Articles type", () => {
let context = null
Expand Down
2 changes: 1 addition & 1 deletion src/schema/v1/__tests__/artists.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import gql from "lib/gql"
import { find } from "lodash"

Expand Down
2 changes: 1 addition & 1 deletion src/schema/v1/__tests__/artworkAttributionClasses.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"

describe("ArtworkAttributionClasses type", () => {
it("fetches artworkAttributionClasses", () => {
Expand Down
2 changes: 1 addition & 1 deletion src/schema/v1/__tests__/auction_results.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"

const artist = {
id: "percy-z",
Expand Down
2 changes: 1 addition & 1 deletion src/schema/v1/__tests__/causality_jwt.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable promise/always-return */
import jwt from "jwt-simple"
import { omit } from "lodash"
import { runQuery, runAuthenticatedQuery } from "test/utils"
import { runQuery, runAuthenticatedQuery } from "schema/v1/test/utils"
import config from "config"

const { HMAC_SECRET } = config
Expand Down
2 changes: 1 addition & 1 deletion src/schema/v1/__tests__/city.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jest.mock("../city/cityDataSortedByDisplayPreference.json", () => mockCities)
jest.mock("lib/all.ts")
jest.mock("lib/sponsoredContent/data.json", () => mockSponsoredContent)

import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import gql from "lib/gql"
import { MAX_GRAPHQL_INT, allViaLoader as _allViaLoader } from "lib/all"

Expand Down
2 changes: 1 addition & 1 deletion src/schema/v1/__tests__/collection.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { resolve } from "path"
import { readFileSync } from "fs"
import { runAuthenticatedQuery } from "test/utils"
import { runAuthenticatedQuery } from "schema/v1/test/utils"
import gql from "lib/gql"
import { isEqual } from "lodash"

Expand Down
2 changes: 1 addition & 1 deletion src/schema/v1/__tests__/credit_card.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"

describe("CreditCard type", () => {
let creditCard: any
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
import { sampleOrder } from "test/fixtures/results/sample_order"
import exchangeOrderJSON from "test/fixtures/exchange/offer_order.json"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { sampleOrder } from "test/fixtures/results/sample_order"
import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { sampleOrder } from "test/fixtures/results/sample_order"
import gql from "lib/gql"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { sampleOrder } from "test/fixtures/results/sample_order"
import gql from "lib/gql"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import gql from "lib/gql"
import { OrderBuyerFields } from "./order_fields"
import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { sampleOrder } from "test/fixtures/results/sample_order"

let context
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { sampleOrder } from "test/fixtures/results/sample_order"
import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
import { sampleOrder } from "test/fixtures/results/sample_order"
import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
import { sampleOrder } from "test/fixtures/results/sample_order"
import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { sampleOrder } from "test/fixtures/results/sample_order"
import gql from "lib/gql"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
import { sampleOrder } from "test/fixtures/results/sample_order"
import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
Expand Down
2 changes: 1 addition & 1 deletion src/schema/v1/__tests__/ecommerce/order.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable promise/always-return */

import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
import { sampleOrder } from "test/fixtures/results/sample_order"
import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
Expand Down
2 changes: 1 addition & 1 deletion src/schema/v1/__tests__/ecommerce/orders.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable promise/always-return */

import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
import { sampleOrder } from "test/fixtures/results/sample_order"
import exchangeOrdersJSON from "test/fixtures/exchange/orders.json"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable promise/always-return */
import { runQuery } from "test/utils"
import { runQuery } from "schema/v1/test/utils"
import { mockxchange } from "test/fixtures/exchange/mockxchange"
import { sampleOrder } from "test/fixtures/results/sample_order"
import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
Expand Down