Skip to content

Commit

Permalink
updating packages
Browse files Browse the repository at this point in the history
  • Loading branch information
lleadbet committed Jan 29, 2024
1 parent d62a639 commit 7c9b77d
Show file tree
Hide file tree
Showing 7 changed files with 1,988 additions and 680 deletions.
2,583 changes: 1,953 additions & 630 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions router.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ telemetry:
listen: 0.0.0.0:9999
common:
service_name: router
service_namespace: graphql-summit
service_namespace: observability-workshop
attributes:
supergraph:
context:
Expand All @@ -51,7 +51,7 @@ telemetry:
common:
parent_based_sampler: true
service_name: router
service_namespace: graphql-summit
service_namespace: observability-workshop
sampler: 0.3
otlp:
enabled: true
Expand Down
18 changes: 8 additions & 10 deletions subgraphs/posts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,14 @@
"@apollo/datasource-rest": "^6.2.1",
"@apollo/server": "^4.9.4",
"@apollo/subgraph": "^2.5.5",
"@opentelemetry/api": "^1.6.0",
"@opentelemetry/core": "^1.17.0",
"@opentelemetry/exporter-metrics-otlp-proto": "^0.43.0",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.43.0",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/instrumentation-express": "^0.33.1",
"@opentelemetry/instrumentation-graphql": "^0.35.1",
"@opentelemetry/instrumentation-http": "^0.43.0",
"@opentelemetry/sdk-metrics": "^1.17.0",
"@opentelemetry/sdk-node": "^0.43.0",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/auto-instrumentations-node": "^0.40.3",
"@opentelemetry/core": "1.19.0",
"@opentelemetry/exporter-metrics-otlp-http": "^0.46.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.46.0",
"@opentelemetry/resources": "1.19.0",
"@opentelemetry/sdk-trace-base": "1.19.0",
"@opentelemetry/sdk-trace-node": "1.19.0",
"graphql": "^16.8.1",
"graphql-tag": "^2.12.6"
},
Expand Down
16 changes: 4 additions & 12 deletions subgraphs/posts/src/tracing.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
// Import required symbols
import { NodeSDK } from "@opentelemetry/sdk-node";
import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
import { GraphQLInstrumentation } from "@opentelemetry/instrumentation-graphql";
import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-proto";

import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
const collectorOptions = {
url: "http://localhost:43178",
timeoutMillis: 500,
};

const sdk = new NodeSDK({
serviceName: "posts",
instrumentations: [
new HttpInstrumentation(),
new ExpressInstrumentation(),
new GraphQLInstrumentation(),
],
traceExporter: new OTLPTraceExporter(collectorOptions),
metricReader: new PeriodicExportingMetricReader({
exporter: new OTLPMetricExporter(collectorOptions),
}),
instrumentations: [getNodeAutoInstrumentations()],
});

// Register the provider to begin tracing
sdk.start();
17 changes: 8 additions & 9 deletions subgraphs/users/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,14 @@
"@apollo/datasource-rest": "^6.2.1",
"@apollo/server": "^4.9.4",
"@apollo/subgraph": "^2.5.5",
"@opentelemetry/api": "^1.6.0",
"@opentelemetry/exporter-metrics-otlp-proto": "^0.43.0",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.43.0",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/instrumentation-express": "^0.33.1",
"@opentelemetry/instrumentation-graphql": "^0.35.1",
"@opentelemetry/instrumentation-http": "^0.43.0",
"@opentelemetry/sdk-metrics": "^1.17.0",
"@opentelemetry/sdk-node": "^0.43.0",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/auto-instrumentations-node": "^0.40.3",
"@opentelemetry/core": "1.19.0",
"@opentelemetry/exporter-metrics-otlp-http": "^0.46.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.46.0",
"@opentelemetry/resources": "1.19.0",
"@opentelemetry/sdk-trace-base": "1.19.0",
"@opentelemetry/sdk-trace-node": "1.19.0",
"dataloader": "^2.2.2",
"graphql": "^16.8.1",
"graphql-tag": "^2.12.6"
Expand Down
14 changes: 9 additions & 5 deletions subgraphs/users/src/resolvers/Query.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Resolvers } from "../__generated__/resolvers-types";
import { Resolvers, User } from "../__generated__/resolvers-types";

export const Query: Resolvers = {
Query: {
Expand All @@ -12,16 +12,20 @@ export const Query: Resolvers = {
return user;
},
users: async (_p, _a, { usersAPI }) => {
let users = await usersAPI.getUsers(
let userPromises = await usersAPI.getUsers(
[...Array(10).keys()].map((i) => (i + 1).toString())
);
users = await Promise.all(
users.map(async (user) => {
let users = await Promise.all(
userPromises.map(async (user) => {
if (!user) {
return null;
}
user.address = await usersAPI.getUserAddress(user.id!);
return user;
})
);
return users;

return users.filter((user): user is User => user !== null);
},
},
};
16 changes: 4 additions & 12 deletions subgraphs/users/src/tracing.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
// Import required symbols
import { NodeSDK } from "@opentelemetry/sdk-node";
import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
import { GraphQLInstrumentation } from "@opentelemetry/instrumentation-graphql";
import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-proto";

import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
const collectorOptions = {
url: "http://localhost:43178",
timeoutMillis: 500,
};

const sdk = new NodeSDK({
serviceName: "users",
instrumentations: [
new HttpInstrumentation(),
new ExpressInstrumentation(),
new GraphQLInstrumentation(),
],
traceExporter: new OTLPTraceExporter(collectorOptions),
metricReader: new PeriodicExportingMetricReader({
exporter: new OTLPMetricExporter(collectorOptions),
}),
instrumentations: [getNodeAutoInstrumentations()],
});

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

0 comments on commit 7c9b77d

Please sign in to comment.