@netwerk-digitaal-erfgoed/network-of-terms-query 5.0.0 → 5.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,5 +4,5 @@ export interface GetLoggerOptions {
4
4
  level: string;
5
5
  }
6
6
  export declare function getCliLogger(options: GetLoggerOptions): Pino.Logger;
7
- export declare function getHttpLogger(options: GetLoggerOptions): Pino.Logger;
7
+ export declare function getHttpLogger(options: GetLoggerOptions): Pino.LoggerOptions;
8
8
  //# sourceMappingURL=logger.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/helpers/logger.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAsBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAanE;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC,MAAM,CASpE"}
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/helpers/logger.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAsBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAanE;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAQ3E"}
@@ -34,12 +34,11 @@ export function getCliLogger(options) {
34
34
  }
35
35
  export function getHttpLogger(options) {
36
36
  const args = Joi.attempt(options, schemaGetLogger);
37
- const loggerOptions = Object.assign(baseOptions, {
37
+ return Object.assign(baseOptions, {
38
38
  base: {
39
39
  name: args.name,
40
40
  },
41
41
  level: args.level,
42
42
  });
43
- return Pino(loggerOptions);
44
43
  }
45
44
  //# sourceMappingURL=logger.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/helpers/logger.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,IAAI,MAAM,MAAM,CAAC;AAOxB,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC;IACjC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAC;AAEH,MAAM,WAAW,GAAuB;IACtC,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS,EAAE,6BAA6B;KAC/C;IACD,KAAK,EAAE,MAAM;IACb,UAAU,EAAE,SAAS;IACrB,UAAU,EAAE;QACV,KAAK,CAAC,KAAK;YACT,OAAO;gBACL,KAAK,EAAE,KAAK;aACb,CAAC;QACJ,CAAC;KACF;CACF,CAAC;AAEF,MAAM,UAAU,YAAY,CAAC,OAAyB;IACpD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACnD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE;QAC/C,IAAI,EAAE;YACJ,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB;QACD,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,WAAW,EAAE;YACX,QAAQ,EAAE,IAAI;SACf;KACF,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC9C,OAAO,IAAI,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAyB;IACrD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACnD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE;QAC/C,IAAI,EAAE;YACJ,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB;QACD,KAAK,EAAE,IAAI,CAAC,KAAK;KAClB,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC;AAC7B,CAAC"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/helpers/logger.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,IAAI,MAAM,MAAM,CAAC;AAOxB,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC;IACjC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAC;AAEH,MAAM,WAAW,GAAuB;IACtC,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS,EAAE,6BAA6B;KAC/C;IACD,KAAK,EAAE,MAAM;IACb,UAAU,EAAE,SAAS;IACrB,UAAU,EAAE;QACV,KAAK,CAAC,KAAK;YACT,OAAO;gBACL,KAAK,EAAE,KAAK;aACb,CAAC;QACJ,CAAC;KACF;CACF,CAAC;AAEF,MAAM,UAAU,YAAY,CAAC,OAAyB;IACpD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACnD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE;QAC/C,IAAI,EAAE;YACJ,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB;QACD,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,WAAW,EAAE;YACX,QAAQ,EAAE,IAAI;SACf;KACF,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC9C,OAAO,IAAI,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAyB;IACrD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACnD,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE;QAChC,IAAI,EAAE;YACJ,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB;QACD,KAAK,EAAE,IAAI,CAAC,KAAK;KAClB,CAAC,CAAC;AACL,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../src/instrumentation.ts"],"names":[],"mappings":"AAgCA,eAAO,MAAM,oBAAoB,+EAMhC,CAAC;AAEF,eAAO,MAAM,sBAAsB,iFAOlC,CAAC"}
1
+ {"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../src/instrumentation.ts"],"names":[],"mappings":"AAkCA,eAAO,MAAM,oBAAoB,+EAMhC,CAAC;AAEF,eAAO,MAAM,sBAAsB,iFAOlC,CAAC"}
@@ -1,20 +1,23 @@
1
1
  import { MeterProvider, PeriodicExportingMetricReader, } from '@opentelemetry/sdk-metrics';
2
2
  import { Resource } from '@opentelemetry/resources';
3
3
  import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-proto';
4
- import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
4
+ import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
5
5
  import { metrics, ValueType } from '@opentelemetry/api';
6
6
  const sourceQueriesHistogramName = 'queries.source';
7
7
  const meterProvider = new MeterProvider({
8
8
  resource: Resource.default().merge(new Resource({
9
- [SemanticResourceAttributes.SERVICE_NAME]: 'network-of-terms',
9
+ [SEMRESATTRS_SERVICE_NAME]: 'network-of-terms',
10
10
  })),
11
+ readers: 'test' === process.env.NODE_ENV
12
+ ? []
13
+ : [
14
+ new PeriodicExportingMetricReader({
15
+ exporter: new OTLPMetricExporter(),
16
+ exportIntervalMillis: process.env.OTEL_METRIC_EXPORT_INTERVAL ??
17
+ 60000,
18
+ }),
19
+ ],
11
20
  });
12
- if ('test' !== process.env.NODE_ENV) {
13
- meterProvider.addMetricReader(new PeriodicExportingMetricReader({
14
- exporter: new OTLPMetricExporter(),
15
- exportIntervalMillis: process.env.OTEL_METRIC_EXPORT_INTERVAL ?? 60000,
16
- }));
17
- }
18
21
  metrics.setGlobalMeterProvider(meterProvider);
19
22
  const meter = metrics.getMeter('default');
20
23
  export const clientQueriesCounter = meter.createCounter('queries.client.counter', {
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../src/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,6BAA6B,GAC9B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAC,kBAAkB,EAAC,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAC,0BAA0B,EAAC,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAC,OAAO,EAAE,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAEtD,MAAM,0BAA0B,GAAG,gBAAgB,CAAC;AAEpD,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC;IACtC,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,CAChC,IAAI,QAAQ,CAAC;QACX,CAAC,0BAA0B,CAAC,YAAY,CAAC,EAAE,kBAAkB;KAC9D,CAAC,CACH;CACF,CAAC,CAAC;AAEH,IAAI,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;IACpC,aAAa,CAAC,eAAe,CAC3B,IAAI,6BAA6B,CAAC;QAChC,QAAQ,EAAE,IAAI,kBAAkB,EAAE;QAClC,oBAAoB,EACjB,OAAO,CAAC,GAAG,CAAC,2BAAiD,IAAI,KAAK;KAC1E,CAAC,CACH,CAAC;AACJ,CAAC;AACD,OAAO,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;AAE9C,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAE1C,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC,aAAa,CACrD,wBAAwB,EACxB;IACE,WAAW,EAAE,wBAAwB;IACrC,SAAS,EAAE,SAAS,CAAC,GAAG;CACzB,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC,eAAe,CACzD,0BAA0B,EAC1B;IACE,WAAW,EAAE,yDAAyD;IACtE,SAAS,EAAE,SAAS,CAAC,GAAG;IACxB,IAAI,EAAE,IAAI;CACX,CACF,CAAC"}
1
+ {"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../src/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,6BAA6B,GAC9B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAC,kBAAkB,EAAC,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAC,wBAAwB,EAAC,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAC,OAAO,EAAE,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAEtD,MAAM,0BAA0B,GAAG,gBAAgB,CAAC;AAEpD,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC;IACtC,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,CAChC,IAAI,QAAQ,CAAC;QACX,CAAC,wBAAwB,CAAC,EAAE,kBAAkB;KAC/C,CAAC,CACH;IACD,OAAO,EACL,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,IAAI,6BAA6B,CAAC;gBAChC,QAAQ,EAAE,IAAI,kBAAkB,EAAE;gBAClC,oBAAoB,EACjB,OAAO,CAAC,GAAG,CAAC,2BAAiD;oBAC9D,KAAK;aACR,CAAC;SACH;CACR,CAAC,CAAC;AAEH,OAAO,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;AAE9C,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAE1C,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC,aAAa,CACrD,wBAAwB,EACxB;IACE,WAAW,EAAE,wBAAwB;IACrC,SAAS,EAAE,SAAS,CAAC,GAAG;CACzB,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC,eAAe,CACzD,0BAA0B,EAC1B;IACE,WAAW,EAAE,yDAAyD;IACtE,SAAS,EAAE,SAAS,CAAC,GAAG;IACxB,IAAI,EAAE,IAAI;CACX,CACF,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@netwerk-digitaal-erfgoed/network-of-terms-query",
3
- "version": "5.0.0",
3
+ "version": "5.0.1",
4
4
  "type": "module",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -33,26 +33,26 @@
33
33
  "@comunica/data-factory": "^2.7.0",
34
34
  "@comunica/query-sparql": "^2.10.2",
35
35
  "@hapi/hoek": "^11.0.4",
36
- "@opentelemetry/api": "^1.7.0",
37
- "@opentelemetry/exporter-metrics-otlp-proto": "0.48.0",
38
- "@opentelemetry/resources": "1.21.0",
39
- "@opentelemetry/sdk-metrics": "1.20.0",
40
- "@opentelemetry/semantic-conventions": "1.21.0",
41
- "@rdfjs/data-model": "^2.0.1",
42
- "joi": "^17.12.0",
43
- "pino": "^8.18.0",
36
+ "@opentelemetry/api": "^1.8.0",
37
+ "@opentelemetry/exporter-metrics-otlp-proto": "0.49.1",
38
+ "@opentelemetry/resources": "1.22.0",
39
+ "@opentelemetry/sdk-metrics": "1.22.0",
40
+ "@opentelemetry/semantic-conventions": "1.22.0",
41
+ "@rdfjs/data-model": "^2.0.2",
42
+ "joi": "^17.12.2",
43
+ "pino": "^8.19.0",
44
44
  "pino-pretty": "^10.3.1",
45
45
  "pretty-ms": "^9.0.0",
46
46
  "rdf-data-factory": "^1.1.2",
47
- "rdf-store-stream": "^2.0.0"
47
+ "rdf-store-stream": "^2.0.1"
48
48
  },
49
49
  "devDependencies": {
50
50
  "@comunica/core": "^2.7.0",
51
51
  "@comunica/query-sparql-file": "^2.10.2",
52
52
  "@jest/globals": "^29.6.2",
53
- "asynciterator": "^3.8.1",
54
- "jest-dev-server": "9.0.2",
55
- "spawnd": "^9.0.2"
53
+ "asynciterator": "^3.9.0",
54
+ "jest-dev-server": "10.0.0",
55
+ "spawnd": "^10.0.0"
56
56
  },
57
57
  "engines": {
58
58
  "node": ">=16.15.0"