Merge branch 'main' into fix-graphql-operation-name

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

@@ -33,7 +33,7 @@
     "compile": "npm run version:update && tsc -p .",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
-    "precompile": "tsc --version && lerna run version --scope $(npm pkg get name) --include-dependencies",
+    "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-aws-sdk --include-dependencies",
     "prewatch": "npm run precompile",
     "prepare": "npm run compile",
     "tdd": "npm run test -- --watch-extensions ts --watch",

plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/sqs.ts

@@ -32,6 +32,7 @@ import {
 } from '../types';
 import {
   MessagingDestinationKindValues,
+  MessagingOperationValues,
   SemanticAttributes,
 } from '@opentelemetry/semantic-conventions';
 import {
@@ -63,7 +64,8 @@ export class SqsServiceExtension implements ServiceExtension {
           isIncoming = true;
           spanKind = SpanKind.CONSUMER;
           spanName = `${queueName} receive`;
-          spanAttributes[SemanticAttributes.MESSAGING_OPERATION] = 'receive';
+          spanAttributes[SemanticAttributes.MESSAGING_OPERATION] =
+            MessagingOperationValues.RECEIVE;
 
           request.commandInput.MessageAttributeNames = (
             request.commandInput.MessageAttributeNames ?? []
@@ -145,7 +147,8 @@ export class SqsServiceExtension implements ServiceExtension {
               MessagingDestinationKindValues.QUEUE,
             [SemanticAttributes.MESSAGING_MESSAGE_ID]: message.MessageId,
             [SemanticAttributes.MESSAGING_URL]: queueUrl,
-            [SemanticAttributes.MESSAGING_OPERATION]: 'process',
+            [SemanticAttributes.MESSAGING_OPERATION]:
+              MessagingOperationValues.PROCESS,
           },
         }),
         processHook: (span: Span, message: SQS.Message) =>

plugins/node/opentelemetry-instrumentation-aws-sdk/test/sqs.test.ts

@@ -24,7 +24,10 @@ const instrumentation = registerInstrumentationTesting(
 import * as AWS from 'aws-sdk';
 import { AWSError } from 'aws-sdk';
 
-import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
+import {
+  MessagingOperationValues,
+  SemanticAttributes,
+} from '@opentelemetry/semantic-conventions';
 import {
   context,
   SpanKind,
@@ -171,12 +174,16 @@ describe('SQS', () => {
       numChildPerProcessSpan: number
     ) => {
       const awsReceiveSpan = spans.filter(
-        s => s.attributes[SemanticAttributes.MESSAGING_OPERATION] === 'receive'
+        s =>
+          s.attributes[SemanticAttributes.MESSAGING_OPERATION] ===
+          MessagingOperationValues.RECEIVE
       );
       expect(awsReceiveSpan.length).toBe(1);
 
       const processSpans = spans.filter(
-        s => s.attributes[SemanticAttributes.MESSAGING_OPERATION] === 'process'
+        s =>
+          s.attributes[SemanticAttributes.MESSAGING_OPERATION] ===
+          MessagingOperationValues.PROCESS
       );
       expect(processSpans.length).toBe(2);
       expect(processSpans[0].parentSpanId).toStrictEqual(
@@ -380,7 +387,9 @@ describe('SQS', () => {
       );
 
       const processSpans = getTestSpans().filter(
-        s => s.attributes[SemanticAttributes.MESSAGING_OPERATION] === 'process'
+        s =>
+          s.attributes[SemanticAttributes.MESSAGING_OPERATION] ===
+          MessagingOperationValues.PROCESS
       );
       expect(processSpans.length).toBe(2);
       expect(
@@ -402,7 +411,9 @@ describe('SQS', () => {
         message => 'some mapping to create child process spans'
       );
       const processSpans = getTestSpans().filter(
-        s => s.attributes[SemanticAttributes.MESSAGING_OPERATION] === 'process'
+        s =>
+          s.attributes[SemanticAttributes.MESSAGING_OPERATION] ===
+          MessagingOperationValues.PROCESS
       );
       expect(processSpans.length).toBe(2);
     });
@@ -429,7 +440,9 @@ describe('SQS', () => {
       );
 
       const processSpans = getTestSpans().filter(
-        s => s.attributes[SemanticAttributes.MESSAGING_OPERATION] === 'process'
+        s =>
+          s.attributes[SemanticAttributes.MESSAGING_OPERATION] ===
+          MessagingOperationValues.PROCESS
       );
       expect(processSpans.length).toBe(2);
       expect(processSpans[0].status.code).toStrictEqual(SpanStatusCode.UNSET);

plugins/node/opentelemetry-instrumentation-mysql/src/utils.ts

@@ -36,7 +36,11 @@ export function getConnectionAttributes(
   return {
     [SemanticAttributes.NET_PEER_NAME]: host,
     [SemanticAttributes.NET_PEER_PORT]: port,
-    [SemanticAttributes.NET_PEER_IP]: getJDBCString(host, port, database),
+    [SemanticAttributes.DB_CONNECTION_STRING]: getJDBCString(
+      host,
+      port,
+      database
+    ),
     [SemanticAttributes.DB_NAME]: database,
     [SemanticAttributes.DB_USER]: user,
   };

plugins/node/opentelemetry-instrumentation-mysql2/.tav.yml

@@ -1,6 +1,12 @@
 mysql2:
-  versions: 2.*
-  commands: npm run test
+  - versions: 2.*
+    commands: npm run test
 
-  # Fix missing `test-utils` package
-  pretest: npm run --prefix ../../../ lerna:link
+    # Fix missing `test-utils` package
+    pretest: npm run --prefix ../../../ lerna:link
+  - versions: 1.4.2 || 1.5.0 || 1.5.1 || 1.5.2 || 1.5.3 || 1.6.0 || 1.6.3 || 1.6.4 || 1.6.5 || 1.7.0
+    # Skip v1.6.2, which is broken
+    commands: npm run test
+
+    # Fix missing `test-utils` package
+    pretest: npm run --prefix ../../../ lerna:link

plugins/node/opentelemetry-instrumentation-mysql2/README.md

@@ -20,7 +20,7 @@ npm install --save @opentelemetry/instrumentation-mysql2
 
 ## Supported Versions
 
-- `2.x`
+- `>= 1.4.2, < 3.0`
 
 ## Usage
 

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

@@ -52,12 +52,15 @@
     "@opentelemetry/contrib-test-utils": "^0.29.0",
     "@opentelemetry/sdk-trace-base": "1.0.1",
     "@types/mocha": "7.0.2",
+    "@types/mysql2": "github:types/mysql2",
     "@types/node": "16.11.21",
+    "@types/semver": "7.3.8",
     "gts": "3.1.0",
     "mocha": "7.2.0",
     "mysql2": "2.3.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
+    "semver": "7.3.5",
     "test-all-versions": "5.0.1",
     "ts-mocha": "8.0.0",
     "typescript": "4.3.5"

plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts

@@ -49,7 +49,7 @@ export class MySQL2Instrumentation extends InstrumentationBase<
     return [
       new InstrumentationNodeModuleDefinition<typeof mysqlTypes>(
         'mysql2',
-        ['2.*'],
+        ['>= 1.4.2 < 3.0'],
         (moduleExports: any, moduleVersion) => {
           api.diag.debug(`Patching mysql@${moduleVersion}`);
 

plugins/node/opentelemetry-instrumentation-mysql2/src/utils.ts

@@ -36,7 +36,11 @@ export function getConnectionAttributes(config: Config): SpanAttributes {
   return {
     [SemanticAttributes.NET_PEER_NAME]: host,
     [SemanticAttributes.NET_PEER_PORT]: port,
-    [SemanticAttributes.NET_PEER_IP]: getJDBCString(host, port, database),
+    [SemanticAttributes.DB_CONNECTION_STRING]: getJDBCString(
+      host,
+      port,
+      database
+    ),
     [SemanticAttributes.DB_NAME]: database,
     [SemanticAttributes.DB_USER]: user,
   };

plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import * as semver from 'semver';
 import { context, trace, SpanStatusCode } from '@opentelemetry/api';
 import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
 import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
@@ -669,5 +670,5 @@ function assertSpan(
 function isPoolClusterEndIgnoreCallback() {
   // Since v2.2.0 `end` function respect callback
   // https://github.com/sidorares/node-mysql2/commit/1481015626e506754adc4308e5508356a3a03aa0
-  return ['2.0.0', '2.0.1', '2.0.2', '2.1.0'].includes(LIB_VERSION);
+  return semver.lt(LIB_VERSION, '2.2.0');
 }

plugins/node/opentelemetry-instrumentation-redis/src/utils.ts

@@ -120,7 +120,7 @@ export const getTracedInternalSendCommand = (
     }
     if (this.address) {
       span.setAttribute(
-        SemanticAttributes.NET_PEER_IP,
+        SemanticAttributes.DB_CONNECTION_STRING,
         `redis://${this.address}`
       );
     }
@@ -140,7 +140,9 @@ export const getTracedInternalSendCommand = (
               responseHook(span, cmd.command, cmd.args, reply);
             },
             err => {
-              diag.error('Error executing responseHook', err);
+              if (err) {
+                diag.error('Error executing responseHook', err);
+              }
             },
             true
           );

plugins/node/opentelemetry-instrumentation-redis/test/redis.test.ts

@@ -53,7 +53,7 @@ const DEFAULT_ATTRIBUTES = {
   [SemanticAttributes.DB_SYSTEM]: RedisInstrumentation.COMPONENT,
   [SemanticAttributes.NET_PEER_NAME]: CONFIG.host,
   [SemanticAttributes.NET_PEER_PORT]: CONFIG.port,
-  [SemanticAttributes.NET_PEER_IP]: URL,
+  [SemanticAttributes.DB_CONNECTION_STRING]: URL,
 };
 
 const unsetStatus: SpanStatus = {

plugins/node/opentelemetry-instrumentation-winston/README.md

@@ -30,7 +30,7 @@ registerInstrumentations({
     new WinstonInstrumentation({
       // Optional hook to insert additional context to log metadata.
       // Called after trace context is injected to metadata.
-      logHook: (record, span) => {
+      logHook: (span, record) => {
         record['resource.service.name'] = provider.resource.attributes['service.name'];
       },
     }),