Skip to content

Commit 7c9b77d

Browse files
lleadbetlleadbet
committed
updating packages
1 parent d62a639 commit 7c9b77d

File tree

7 files changed

+1988
-680
lines changed

7 files changed

+1988
-680
lines changed

‎package-lock.json

Lines changed: 1953 additions & 630 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎router.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ telemetry:
3333
listen: 0.0.0.0:9999
3434
common:
3535
service_name: router
36-
service_namespace: graphql-summit
36+
service_namespace: observability-workshop
3737
attributes:
3838
supergraph:
3939
context:
@@ -51,7 +51,7 @@ telemetry:
5151
common:
5252
parent_based_sampler: true
5353
service_name: router
54-
service_namespace: graphql-summit
54+
service_namespace: observability-workshop
5555
sampler: 0.3
5656
otlp:
5757
enabled: true

‎subgraphs/posts/package.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,14 @@
2828
"@apollo/datasource-rest": "^6.2.1",
2929
"@apollo/server": "^4.9.4",
3030
"@apollo/subgraph": "^2.5.5",
31-
"@opentelemetry/api": "^1.6.0",
32-
"@opentelemetry/core": "^1.17.0",
33-
"@opentelemetry/exporter-metrics-otlp-proto": "^0.43.0",
34-
"@opentelemetry/exporter-trace-otlp-grpc": "^0.43.0",
35-
"@opentelemetry/instrumentation": "^0.43.0",
36-
"@opentelemetry/instrumentation-express": "^0.33.1",
37-
"@opentelemetry/instrumentation-graphql": "^0.35.1",
38-
"@opentelemetry/instrumentation-http": "^0.43.0",
39-
"@opentelemetry/sdk-metrics": "^1.17.0",
40-
"@opentelemetry/sdk-node": "^0.43.0",
31+
"@opentelemetry/api": "^1.7.0",
32+
"@opentelemetry/auto-instrumentations-node": "^0.40.3",
33+
"@opentelemetry/core": "1.19.0",
34+
"@opentelemetry/exporter-metrics-otlp-http": "^0.46.0",
35+
"@opentelemetry/exporter-trace-otlp-http": "^0.46.0",
36+
"@opentelemetry/resources": "1.19.0",
37+
"@opentelemetry/sdk-trace-base": "1.19.0",
38+
"@opentelemetry/sdk-trace-node": "1.19.0",
4139
"graphql": "^16.8.1",
4240
"graphql-tag": "^2.12.6"
4341
},

‎subgraphs/posts/src/tracing.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
// Import required symbols
22
import { NodeSDK } from "@opentelemetry/sdk-node";
3+
import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
34
import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
4-
import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
5-
import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
6-
import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
7-
import { GraphQLInstrumentation } from "@opentelemetry/instrumentation-graphql";
8-
import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-proto";
9-
5+
import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
6+
import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
107
const collectorOptions = {
118
url: "http://localhost:43178",
129
timeoutMillis: 500,
1310
};
1411

1512
const sdk = new NodeSDK({
1613
serviceName: "posts",
17-
instrumentations: [
18-
new HttpInstrumentation(),
19-
new ExpressInstrumentation(),
20-
new GraphQLInstrumentation(),
21-
],
2214
traceExporter: new OTLPTraceExporter(collectorOptions),
2315
metricReader: new PeriodicExportingMetricReader({
2416
exporter: new OTLPMetricExporter(collectorOptions),
2517
}),
18+
instrumentations: [getNodeAutoInstrumentations()],
2619
});
2720

28-
// Register the provider to begin tracing
2921
sdk.start();

‎subgraphs/users/package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@
2828
"@apollo/datasource-rest": "^6.2.1",
2929
"@apollo/server": "^4.9.4",
3030
"@apollo/subgraph": "^2.5.5",
31-
"@opentelemetry/api": "^1.6.0",
32-
"@opentelemetry/exporter-metrics-otlp-proto": "^0.43.0",
33-
"@opentelemetry/exporter-trace-otlp-grpc": "^0.43.0",
34-
"@opentelemetry/instrumentation": "^0.43.0",
35-
"@opentelemetry/instrumentation-express": "^0.33.1",
36-
"@opentelemetry/instrumentation-graphql": "^0.35.1",
37-
"@opentelemetry/instrumentation-http": "^0.43.0",
38-
"@opentelemetry/sdk-metrics": "^1.17.0",
39-
"@opentelemetry/sdk-node": "^0.43.0",
31+
"@opentelemetry/api": "^1.7.0",
32+
"@opentelemetry/auto-instrumentations-node": "^0.40.3",
33+
"@opentelemetry/core": "1.19.0",
34+
"@opentelemetry/exporter-metrics-otlp-http": "^0.46.0",
35+
"@opentelemetry/exporter-trace-otlp-http": "^0.46.0",
36+
"@opentelemetry/resources": "1.19.0",
37+
"@opentelemetry/sdk-trace-base": "1.19.0",
38+
"@opentelemetry/sdk-trace-node": "1.19.0",
4039
"dataloader": "^2.2.2",
4140
"graphql": "^16.8.1",
4241
"graphql-tag": "^2.12.6"

‎subgraphs/users/src/resolvers/Query.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Resolvers } from "../__generated__/resolvers-types";
1+
import { Resolvers, User } from "../__generated__/resolvers-types";
22

33
export const Query: Resolvers = {
44
Query: {
@@ -12,16 +12,20 @@ export const Query: Resolvers = {
1212
return user;
1313
},
1414
users: async (_p, _a, { usersAPI }) => {
15-
let users = await usersAPI.getUsers(
15+
let userPromises = await usersAPI.getUsers(
1616
[...Array(10).keys()].map((i) => (i + 1).toString())
1717
);
18-
users = await Promise.all(
19-
users.map(async (user) => {
18+
let users = await Promise.all(
19+
userPromises.map(async (user) => {
20+
if (!user) {
21+
return null;
22+
}
2023
user.address = await usersAPI.getUserAddress(user.id!);
2124
return user;
2225
})
2326
);
24-
return users;
27+
28+
return users.filter((user): user is User => user !== null);
2529
},
2630
},
2731
};

‎subgraphs/users/src/tracing.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
// Import required symbols
22
import { NodeSDK } from "@opentelemetry/sdk-node";
3+
import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
34
import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
4-
import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
5-
import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
6-
import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
7-
import { GraphQLInstrumentation } from "@opentelemetry/instrumentation-graphql";
8-
import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-proto";
9-
5+
import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
6+
import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
107
const collectorOptions = {
118
url: "http://localhost:43178",
129
timeoutMillis: 500,
1310
};
1411

1512
const sdk = new NodeSDK({
1613
serviceName: "users",
17-
instrumentations: [
18-
new HttpInstrumentation(),
19-
new ExpressInstrumentation(),
20-
new GraphQLInstrumentation(),
21-
],
2214
traceExporter: new OTLPTraceExporter(collectorOptions),
2315
metricReader: new PeriodicExportingMetricReader({
2416
exporter: new OTLPMetricExporter(collectorOptions),
2517
}),
18+
instrumentations: [getNodeAutoInstrumentations()],
2619
});
2720

28-
// Register the provider to begin tracing
2921
sdk.start();

0 commit comments

Comments
 (0)