From 82ebc497337a63304f7d26e0b8bffcc99d52a70c Mon Sep 17 00:00:00 2001
From: Bartlomiej Obecny <bobecny@gmail.com>
Date: Tue, 16 Nov 2021 23:05:34 +0100
Subject: [PATCH] chore: update graphql example to latest (#734)

---
 examples/graphql/docker/docker-compose.yaml |  5 +++--
 examples/graphql/package.json               | 24 +++++++++++----------
 examples/graphql/tracer.js                  | 14 ++++++------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/examples/graphql/docker/docker-compose.yaml b/examples/graphql/docker/docker-compose.yaml
index 8d29c574330..ec2a7c65afb 100644
--- a/examples/graphql/docker/docker-compose.yaml
+++ b/examples/graphql/docker/docker-compose.yaml
@@ -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
diff --git a/examples/graphql/package.json b/examples/graphql/package.json
index 273d253b4d2..53e8935933c 100644
--- a/examples/graphql/package.json
+++ b/examples/graphql/package.json
@@ -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": {
@@ -35,14 +35,16 @@
   "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",
@@ -50,8 +52,8 @@
     "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"
   }
 }
diff --git a/examples/graphql/tracer.js b/examples/graphql/tracer.js
index 48dfe279a99..8b804f45173 100644
--- a/examples/graphql/tracer.js
+++ b/examples/graphql/tracer.js
@@ -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();