Skip to content

Commit

Permalink
chore: update graphql example to latest (open-telemetry#734)
Browse files Browse the repository at this point in the history
  • Loading branch information
obecny committed Nov 16, 2021
1 parent 089e3cb commit 82ebc49
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 19 deletions.
5 changes: 3 additions & 2 deletions examples/graphql/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ services:
# Collector
collector:
# image: otel/opentelemetry-collector:latest
image: otel/opentelemetry-collector:0.27.0
command: ["--config=/conf/collector-config.yaml", "--log-level=DEBUG"]
image: otel/opentelemetry-collector:0.38.0
command: ["--config=/conf/collector-config.yaml"]
volumes:
- ./collector-config.yaml:/conf/collector-config.yaml
ports:
- "9464:9464"
- "4317:4317"
- "4318:4318"
- "55681:55681"
depends_on:
- zipkin-all-in-one
Expand Down
24 changes: 13 additions & 11 deletions examples/graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opentelemetry-plugin-graphql-example",
"private": true,
"version": "0.23.0",
"version": "0.26.0",
"description": "Example of using @opentelemetry/plugin-graphql with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -35,23 +35,25 @@
"dependencies": {
"@apollo/gateway": "^0.19.1",
"@graphql-tools/wrap": "^6.0.18",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-collector": "^0.25.0",
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/instrumentation-express": "^0.24.0",
"@opentelemetry/instrumentation-graphql": "^0.24.0",
"@opentelemetry/instrumentation-http": "^0.25.0",
"@opentelemetry/node": "^0.25.0",
"@opentelemetry/tracing": "^0.25.0",
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/exporter-otlp-http": "~0.26.0",
"@opentelemetry/instrumentation": "~0.26.0",
"@opentelemetry/instrumentation-express": "~0.26.0",
"@opentelemetry/instrumentation-graphql": "~0.26.0",
"@opentelemetry/instrumentation-http": "~0.26.0",
"@opentelemetry/resources": "~1.0.0",
"@opentelemetry/sdk-trace-base": "~1.0.0",
"@opentelemetry/sdk-trace-node": "~1.0.0",
"@opentelemetry/semantic-conventions": "~1.0.0",
"apollo-server": "^2.18.1",
"cross-fetch": "^3.0.5",
"express": "^4.17.1",
"express-graphql": "^0.11.0",
"graphql": "^15.3.0",
"graphql-transform-federation": "^2.1.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
"devDependencies": {
"cross-env": "^6.0.0"
"cross-env": "^7.0.3"
}
}
14 changes: 8 additions & 6 deletions examples/graphql/tracer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@ const { registerInstrumentations } = require('@opentelemetry/instrumentation');
const { GraphQLInstrumentation } = require('@opentelemetry/instrumentation-graphql');
const { ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector');
const { OTLPTraceExporter } = require('@opentelemetry/exporter-otlp-http');
const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
const { Resource } = require('@opentelemetry/resources');
const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');

const exporter = new CollectorTraceExporter({
serviceName: 'basic-service',
const provider = new NodeTracerProvider({
resource: new Resource({
[SemanticResourceAttributes.SERVICE_NAME]: 'graphql-service',
}),
});

const provider = new NodeTracerProvider();

provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter()));
provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
provider.register();

Expand Down

0 comments on commit 82ebc49

Please sign in to comment.