Merge branch 'main' into feat/sqs-payload-context

.release-please-manifest.json

@@ -1 +1 @@
-{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.26.0","detectors/node/opentelemetry-resource-detector-aws":"1.0.1","detectors/node/opentelemetry-resource-detector-gcp":"0.26.0","detectors/node/opentelemetry-resource-detector-github":"0.26.0","metapackages/auto-instrumentations-node":"0.26.0","metapackages/auto-instrumentations-web":"0.26.0","packages/opentelemetry-browser-extension-autoinjection":"0.26.0","packages/opentelemetry-host-metrics":"0.26.0","packages/opentelemetry-id-generator-aws-xray":"1.0.0","packages/opentelemetry-test-utils":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.1.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.26.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.26.0","plugins/node/opentelemetry-instrumentation-connect":"0.26.0","plugins/node/opentelemetry-instrumentation-dns":"0.26.0","plugins/node/opentelemetry-instrumentation-express":"0.26.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.26.0","plugins/node/opentelemetry-instrumentation-graphql":"0.26.0","plugins/node/opentelemetry-instrumentation-hapi":"0.26.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.26.0","plugins/node/opentelemetry-instrumentation-knex":"0.26.0","plugins/node/opentelemetry-instrumentation-koa":"0.26.0","plugins/node/opentelemetry-instrumentation-memcached":"0.26.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.26.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.26.0","plugins/node/opentelemetry-instrumentation-net":"0.26.0","plugins/node/opentelemetry-instrumentation-pg":"0.26.0","plugins/node/opentelemetry-instrumentation-pino":"0.26.0","plugins/node/opentelemetry-instrumentation-redis":"0.26.0","plugins/node/opentelemetry-instrumentation-restify":"0.26.0","plugins/node/opentelemetry-instrumentation-router":"0.26.0","plugins/node/opentelemetry-instrumentation-winston":"0.26.0","plugins/web/opentelemetry-instrumentation-document-load":"0.26.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.26.0","plugins/web/opentelemetry-plugin-react-load":"0.26.0","propagators/opentelemetry-propagator-aws-xray":"1.0.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.25.0","propagators/opentelemetry-propagator-ot-trace":"0.25.0"}
+{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.26.0","detectors/node/opentelemetry-resource-detector-aws":"1.0.1","detectors/node/opentelemetry-resource-detector-gcp":"0.26.0","detectors/node/opentelemetry-resource-detector-github":"0.26.0","metapackages/auto-instrumentations-node":"0.26.1","metapackages/auto-instrumentations-web":"0.26.0","packages/opentelemetry-browser-extension-autoinjection":"0.26.0","packages/opentelemetry-host-metrics":"0.26.0","packages/opentelemetry-id-generator-aws-xray":"1.0.0","packages/opentelemetry-test-utils":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.2.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.26.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.26.0","plugins/node/opentelemetry-instrumentation-connect":"0.26.0","plugins/node/opentelemetry-instrumentation-dns":"0.26.0","plugins/node/opentelemetry-instrumentation-express":"0.26.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.26.0","plugins/node/opentelemetry-instrumentation-graphql":"0.26.1","plugins/node/opentelemetry-instrumentation-hapi":"0.26.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.26.0","plugins/node/opentelemetry-instrumentation-knex":"0.26.0","plugins/node/opentelemetry-instrumentation-koa":"0.26.0","plugins/node/opentelemetry-instrumentation-memcached":"0.26.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.26.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.27.0","plugins/node/opentelemetry-instrumentation-net":"0.26.0","plugins/node/opentelemetry-instrumentation-pg":"0.26.0","plugins/node/opentelemetry-instrumentation-pino":"0.26.0","plugins/node/opentelemetry-instrumentation-redis":"0.26.0","plugins/node/opentelemetry-instrumentation-restify":"0.26.0","plugins/node/opentelemetry-instrumentation-router":"0.26.0","plugins/node/opentelemetry-instrumentation-winston":"0.26.0","plugins/web/opentelemetry-instrumentation-document-load":"0.26.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.26.0","plugins/web/opentelemetry-plugin-react-load":"0.26.0","propagators/opentelemetry-propagator-aws-xray":"1.0.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.25.0","propagators/opentelemetry-propagator-ot-trace":"0.25.0"}

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

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,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"
   }
 }

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();
 

metapackages/auto-instrumentations-node/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+### [0.26.1](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.26.0...auto-instrumentations-node-v0.26.1) (2021-11-12)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @opentelemetry/instrumentation-graphql bumped from ^0.26.0 to ^0.26.1
+
 ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.25.0...auto-instrumentations-node-v0.26.0) (2021-10-22)
 
 
@@ -21,4 +30,4 @@
     * @opentelemetry/instrumentation-mongodb bumped from ^0.25.0 to ^0.26.0
     * @opentelemetry/instrumentation-mysql bumped from ^0.25.0 to ^0.26.0
     * @opentelemetry/instrumentation-pg bumped from ^0.25.0 to ^0.26.0
-    * @opentelemetry/instrumentation-redis bumped from ^0.25.0 to ^0.26.0
+    * @opentelemetry/instrumentation-redis bumped from ^0.25.0 to ^0.26.0

metapackages/auto-instrumentations-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/auto-instrumentations-node",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
@@ -48,7 +48,7 @@
     "@opentelemetry/instrumentation": "^0.26.0",
     "@opentelemetry/instrumentation-dns": "^0.26.0",
     "@opentelemetry/instrumentation-express": "^0.26.0",
-    "@opentelemetry/instrumentation-graphql": "^0.26.0",
+    "@opentelemetry/instrumentation-graphql": "^0.26.1",
     "@opentelemetry/instrumentation-grpc": "^0.26.0",
     "@opentelemetry/instrumentation-http": "^0.26.0",
     "@opentelemetry/instrumentation-ioredis": "^0.26.0",

plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.2.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.1.0...instrumentation-aws-sdk-v0.2.0) (2021-11-12)
+
+
+### Features
+
+* AWS-SDK SNS Context propagation ([#728](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/728)) ([78cd4e1](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/78cd4e118e5a41107d84dfd1ae8c4c28e885b27e))
+
 ## 0.1.0 (2021-10-22)
 
 
@@ -13,4 +20,4 @@
 
 * The following workspace dependencies were updated
   * devDependencies
-    * @opentelemetry/contrib-test-utils bumped from ^0.26.0 to ^0.27.0
+    * @opentelemetry/contrib-test-utils bumped from ^0.26.0 to ^0.27.0

plugins/node/opentelemetry-instrumentation-aws-sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opentelemetry/instrumentation-aws-sdk",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package",
     "keywords": [
         "aws",

plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### [0.26.1](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-graphql-v0.26.0...instrumentation-graphql-v0.26.1) (2021-11-12)
+
+
+### Bug Fixes
+
+* adding nested input variables in graphql plugin ([#720](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/720)) ([7a7d3a3](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7a7d3a35e66678cf7d11fb9c89b8a26f2d4bfd6b))
+
 ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-graphql-v0.25.0...instrumentation-graphql-v0.26.0) (2021-10-22)
 
 

plugins/node/opentelemetry-instrumentation-graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-graphql",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "description": "OpenTelemetry @opentelemetry/instrumentation-graphql automatic instrumentation package.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-nestjs-core-v0.26.0...instrumentation-nestjs-core-v0.27.0) (2021-11-12)
+
+
+### Features
+
+* report `path` and `route` with fastify backend in nestjs-core instrumentation ([#714](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/714)) ([62a04c7](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/62a04c7a7d640393c31ae357131bfca766c1f3fb))
+
 ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-nestjs-core-v0.25.0...instrumentation-nestjs-core-v0.26.0) (2021-10-22)
 
 

plugins/node/opentelemetry-instrumentation-nestjs-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-nestjs-core",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "description": "OpenTelemetry NestJS automatic instrumentation package.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

renovate.json

@@ -21,5 +21,6 @@
   "schedule": [
     "before 3am on Friday"
   ],
-  "labels": ["dependencies"]
+  "labels": ["dependencies"],
+  "semanticCommitType": "feat"
 }