Merge branch 'main' into fix-db-connection-string

open-telemetry · Feb 21, 2022 · 57b084d · 57b084d
2 parents de67ae5 + 0a557e8
commit 57b084d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/utils.ts b/plugins/node/opentelemetry-instrumentation-redis/src/utils.ts
@@ -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
           );

diff --git a/plugins/node/opentelemetry-instrumentation-winston/README.md b/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'];
       },
     }),