@opentelemetry/instrumentation-grpc - npm Package Compare versions

Comparing version 0.27.0 to 0.28.0

build/src/grpc-js/clientUtils.js

@@ -32,3 +32,3 @@ "use strict";
     Object.entries(methods).forEach(([name, { originalName }]) => {
-        if (!utils_1._methodIsIgnored(name, this.getConfig().ignoreGrpcMethods)) {
+        if (!(0, utils_1._methodIsIgnored)(name, this.getConfig().ignoreGrpcMethods)) {
             methodList.push(name); // adds camel case method name: "unaryMethod"
@@ -61,3 +61,3 @@ if (originalName &&
                 if (err.code) {
-                    span.setStatus(utils_1._grpcStatusCodeToSpanStatus(err.code));
+                    span.setStatus((0, utils_1._grpcStatusCodeToSpanStatus)(err.code));
                     span.setAttribute(semantic_conventions_1.SemanticAttributes.RPC_GRPC_STATUS_CODE, err.code.toString());
@@ -113,3 +113,3 @@ }
                 span.setStatus({
-                    code: utils_1._grpcStatusCodeToOpenTelemetryStatusCode(err.code),
+                    code: (0, utils_1._grpcStatusCodeToOpenTelemetryStatusCode)(err.code),
                     message: err.message,
@@ -128,3 +128,3 @@ });
                 call[serverUtils_1.CALL_SPAN_ENDED] = true;
-                span.setStatus(utils_1._grpcStatusCodeToSpanStatus(status.code));
+                span.setStatus((0, utils_1._grpcStatusCodeToSpanStatus)(status.code));
                 endSpan();
@@ -131,0 +131,0 @@ });

build/src/grpc-js/index.js

@@ -33,3 +33,3 @@ "use strict";
                 this._diag.debug(`Applying patch for @grpc/grpc-js@${version}`);
-                if (instrumentation_1.isWrapped(moduleExports.Server.prototype.register)) {
+                if ((0, instrumentation_1.isWrapped)(moduleExports.Server.prototype.register)) {
                     this._unwrap(moduleExports.Server.prototype, 'register');
@@ -40,11 +40,11 @@ }
                 // Patch Client methods
-                if (instrumentation_1.isWrapped(moduleExports.makeGenericClientConstructor)) {
+                if ((0, instrumentation_1.isWrapped)(moduleExports.makeGenericClientConstructor)) {
                     this._unwrap(moduleExports, 'makeGenericClientConstructor');
                 }
                 this._wrap(moduleExports, 'makeGenericClientConstructor', this._patchClient(moduleExports));
-                if (instrumentation_1.isWrapped(moduleExports.makeClientConstructor)) {
+                if ((0, instrumentation_1.isWrapped)(moduleExports.makeClientConstructor)) {
                     this._unwrap(moduleExports, 'makeClientConstructor');
                 }
                 this._wrap(moduleExports, 'makeClientConstructor', this._patchClient(moduleExports));
-                if (instrumentation_1.isWrapped(moduleExports.loadPackageDefinition)) {
+                if ((0, instrumentation_1.isWrapped)(moduleExports.loadPackageDefinition)) {
                     this._unwrap(moduleExports, 'loadPackageDefinition');
@@ -83,4 +83,4 @@ }
                         const self = this;
-                        if (serverUtils_1.shouldNotTraceServerCall(call.metadata, name, config.ignoreGrpcMethods)) {
-                            return serverUtils_1.handleUntracedServerFunction(type, originalFunc, call, callback);
+                        if ((0, serverUtils_1.shouldNotTraceServerCall)(call.metadata, name, config.ignoreGrpcMethods)) {
+                            return (0, serverUtils_1.handleUntracedServerFunction)(type, originalFunc, call, callback);
                         }
@@ -148,3 +148,3 @@ const spanName = `grpc.${name.replace('/', '')}`;
             instrumentation._diag.debug('patch all client methods');
-            return function clientMethodTrace() {
+            function clientMethodTrace() {
                 const name = `grpc.${original.path.replace('/', '')}`;
@@ -156,4 +156,6 @@ const args = [...arguments];
                 });
-                return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), () => clientUtils_1.makeGrpcClientRemoteCall(original, args, metadata, this)(span));
-            };
+                return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), () => (0, clientUtils_1.makeGrpcClientRemoteCall)(original, args, metadata, this)(span));
+            }
+            Object.assign(clientMethodTrace, original);
+            return clientMethodTrace;
         };
@@ -160,0 +162,0 @@ }

build/src/grpc-js/serverUtils.js

@@ -62,3 +62,3 @@ "use strict";
         span.setStatus({
-            code: utils_1._grpcStatusCodeToOpenTelemetryStatusCode(err.code),
+            code: (0, utils_1._grpcStatusCodeToOpenTelemetryStatusCode)(err.code),
             message: err.message,
@@ -83,3 +83,3 @@ });
                 span.setStatus({
-                    code: utils_1._grpcStatusCodeToOpenTelemetryStatusCode(err.code),
+                    code: (0, utils_1._grpcStatusCodeToOpenTelemetryStatusCode)(err.code),
                     message: err.message,
@@ -147,5 +147,5 @@ });
     const parsedName = methodName.split('/');
-    return utils_1._methodIsIgnored(parsedName[parsedName.length - 1] || methodName, ignoreGrpcMethods);
+    return (0, utils_1._methodIsIgnored)(parsedName[parsedName.length - 1] || methodName, ignoreGrpcMethods);
 }
 exports.shouldNotTraceServerCall = shouldNotTraceServerCall;
 //# sourceMappingURL=serverUtils.js.map

build/src/grpc/clientUtils.js

@@ -35,3 +35,3 @@ "use strict";
                 if (err.code) {
-                    span.setStatus(utils_1._grpcStatusCodeToSpanStatus(err.code));
+                    span.setStatus((0, utils_1._grpcStatusCodeToSpanStatus)(err.code));
                     span.setAttribute(semantic_conventions_1.SemanticAttributes.RPC_GRPC_STATUS_CODE, err.code.toString());
@@ -59,3 +59,3 @@ }
         if (!original.responseStream) {
-            const callbackFuncIndex = utils_1.findIndex(args, arg => {
+            const callbackFuncIndex = (0, utils_1.findIndex)(args, arg => {
                 return typeof arg === 'function';
@@ -88,3 +88,3 @@ });
                 span.setStatus({
-                    code: utils_1._grpcStatusCodeToOpenTelemetryStatusCode(err.code),
+                    code: (0, utils_1._grpcStatusCodeToOpenTelemetryStatusCode)(err.code),
                     message: err.message,
@@ -114,3 +114,3 @@ });
     // but this is an extremely rare case.
-    let metadataIndex = utils_1.findIndex(args, (arg) => {
+    let metadataIndex = (0, utils_1.findIndex)(args, (arg) => {
         return (arg &&
@@ -117,0 +117,0 @@ typeof arg === 'object' &&

build/src/grpc/index.js

@@ -39,3 +39,3 @@ "use strict";
                 grpcClient = moduleExports;
-                if (instrumentation_1.isWrapped(moduleExports.Server.prototype.register)) {
+                if ((0, instrumentation_1.isWrapped)(moduleExports.Server.prototype.register)) {
                     this._unwrap(moduleExports.Server.prototype, 'register');
@@ -45,3 +45,3 @@ }
                 // Wrap the externally exported client constructor
-                if (instrumentation_1.isWrapped(moduleExports.makeGenericClientConstructor)) {
+                if ((0, instrumentation_1.isWrapped)(moduleExports.makeGenericClientConstructor)) {
                     this._unwrap(moduleExports, 'makeGenericClientConstructor');
@@ -65,3 +65,3 @@ }
             this._diag.debug(`Applying internal patch for grpc@${version}`);
-            if (instrumentation_1.isWrapped(moduleExports.makeClientConstructor)) {
+            if ((0, instrumentation_1.isWrapped)(moduleExports.makeClientConstructor)) {
                 this._unwrap(moduleExports, 'makeClientConstructor');
@@ -123,6 +123,6 @@ }
                                     case 'client_stream':
-                                        return serverUtils_1.clientStreamAndUnaryHandler(grpcModule, span, call, callback, originalFunc, self);
+                                        return (0, serverUtils_1.clientStreamAndUnaryHandler)(grpcModule, span, call, callback, originalFunc, self);
                                     case 'server_stream':
                                     case 'bidi':
-                                        return serverUtils_1.serverStreamAndBidiHandler(span, call, originalFunc, self);
+                                        return (0, serverUtils_1.serverStreamAndBidiHandler)(span, call, originalFunc, self);
                                     default:
@@ -154,3 +154,3 @@ break;
         Object.entries(methods).forEach(([name, { originalName }]) => {
-            if (!utils_1._methodIsIgnored(name, this.getConfig().ignoreGrpcMethods)) {
+            if (!(0, utils_1._methodIsIgnored)(name, this.getConfig().ignoreGrpcMethods)) {
                 methodList.push(name); // adds camel case method name: "unaryMethod"
@@ -173,12 +173,14 @@ if (originalName &&
             instrumentation._diag.debug('patch all client methods');
-            return function clientMethodTrace() {
+            function clientMethodTrace() {
                 var _a;
                 const name = `grpc.${(_a = original.path) === null || _a === void 0 ? void 0 : _a.replace('/', '')}`;
                 const args = Array.prototype.slice.call(arguments);
-                const metadata = clientUtils_1.getMetadata(grpcClient, original, args);
+                const metadata = (0, clientUtils_1.getMetadata)(grpcClient, original, args);
                 const span = instrumentation.tracer.startSpan(name, {
                     kind: api_1.SpanKind.CLIENT,
                 });
-                return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), () => clientUtils_1.makeGrpcClientRemoteCall(grpcClient, original, args, metadata, this)(span));
-            };
+                return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), () => (0, clientUtils_1.makeGrpcClientRemoteCall)(grpcClient, original, args, metadata, this)(span));
+            }
+            Object.assign(clientMethodTrace, original);
+            return clientMethodTrace;
         };
@@ -185,0 +187,0 @@ }

build/src/grpc/serverUtils.js

@@ -28,3 +28,3 @@ "use strict";
                 span.setStatus({
-                    code: utils_1._grpcStatusCodeToOpenTelemetryStatusCode(err.code),
+                    code: (0, utils_1._grpcStatusCodeToOpenTelemetryStatusCode)(err.code),
                     message: err.message,
@@ -62,3 +62,3 @@ });
     call.on('finish', () => {
-        span.setStatus(utils_1._grpcStatusCodeToSpanStatus(call.status.code));
+        span.setStatus((0, utils_1._grpcStatusCodeToSpanStatus)(call.status.code));
         span.setAttribute(semantic_conventions_1.SemanticAttributes.RPC_GRPC_STATUS_CODE, call.status.code.toString());
@@ -73,3 +73,3 @@ // if there is an error, span will be ended on error event, otherwise end it here
         span.setStatus({
-            code: utils_1._grpcStatusCodeToOpenTelemetryStatusCode(err.code),
+            code: (0, utils_1._grpcStatusCodeToOpenTelemetryStatusCode)(err.code),
             message: err.message,
@@ -92,5 +92,5 @@ });
     const parsedName = name.split('/');
-    return utils_1._methodIsIgnored(parsedName[parsedName.length - 1] || name, this.getConfig().ignoreGrpcMethods);
+    return (0, utils_1._methodIsIgnored)(parsedName[parsedName.length - 1] || name, this.getConfig().ignoreGrpcMethods);
 };
 exports.shouldNotTraceServerCall = shouldNotTraceServerCall;
 //# sourceMappingURL=serverUtils.js.map

build/src/utils.js

@@ -44,3 +44,3 @@ "use strict";
 const _grpcStatusCodeToSpanStatus = (status) => {
-    return { code: exports._grpcStatusCodeToOpenTelemetryStatusCode(status) };
+    return { code: (0, exports._grpcStatusCodeToOpenTelemetryStatusCode)(status) };
 };
@@ -47,0 +47,0 @@ exports._grpcStatusCodeToSpanStatus = _grpcStatusCodeToSpanStatus;

build/src/version.d.ts

@@ -1,2 +0,2 @@
-export declare const VERSION = "0.27.0";
+export declare const VERSION = "0.28.0";
 //# sourceMappingURL=version.d.ts.map

build/src/version.js

@@ -20,3 +20,3 @@ "use strict";
 // this is autogenerated file, see scripts/version-update.js
-exports.VERSION = '0.27.0';
+exports.VERSION = '0.28.0';
 //# sourceMappingURL=version.js.map

package.json

 {
   "name": "@opentelemetry/instrumentation-grpc",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "OpenTelemetry grpc automatic instrumentation package.",
@@ -9,2 +9,3 @@ "main": "build/src/index.js",
   "scripts": {
+    "prepublishOnly": "npm run compile",
     "compile": "tsc --build",
@@ -16,7 +17,8 @@ "clean": "tsc --build --clean",
     "lint:fix": "eslint . --ext .ts --fix",
-    "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
+    "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
     "version": "node ../../../scripts/version-update.js",
     "watch": "tsc --build --watch",
-    "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
-    "prewatch": "node ../../../scripts/version-update.js"
+    "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies",
+    "prewatch": "node ../../../scripts/version-update.js",
+    "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
@@ -34,3 +36,3 @@ "keywords": [
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=8.12.0"
   },
@@ -49,13 +51,13 @@ "files": [
   "devDependencies": {
-    "@grpc/grpc-js": "1.3.7",
-    "@grpc/proto-loader": "0.6.4",
-    "@opentelemetry/api": "^1.0.3",
-    "@opentelemetry/context-async-hooks": "1.0.1",
-    "@opentelemetry/core": "1.0.1",
-    "@opentelemetry/sdk-trace-base": "1.0.1",
-    "@opentelemetry/sdk-trace-node": "1.0.1",
+    "@grpc/grpc-js": "1.5.9",
+    "@grpc/proto-loader": "0.6.9",
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/context-async-hooks": "1.2.0",
+    "@opentelemetry/core": "1.2.0",
+    "@opentelemetry/sdk-trace-base": "1.2.0",
+    "@opentelemetry/sdk-trace-node": "1.2.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "14.17.11",
-    "@types/semver": "7.3.8",
-    "@types/sinon": "10.0.2",
+    "@types/node": "14.17.33",
+    "@types/semver": "7.3.9",
+    "@types/sinon": "10.0.6",
     "codecov": "3.8.3",
@@ -70,3 +72,3 @@ "grpc": "1.24.11",
     "ts-mocha": "8.0.0",
-    "typescript": "4.3.5"
+    "typescript": "4.4.4"
   },
@@ -77,7 +79,7 @@ "peerDependencies": {
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.27.0",
-    "@opentelemetry/instrumentation": "0.27.0",
-    "@opentelemetry/semantic-conventions": "1.0.1"
+    "@opentelemetry/api-metrics": "0.28.0",
+    "@opentelemetry/instrumentation": "0.28.0",
+    "@opentelemetry/semantic-conventions": "1.2.0"
   },
-  "gitHead": "f5e227f0cb829df1ca2dc220a3e0e8ae0e607405"
+  "gitHead": "a0a670a03fd35b0799bee8cc466f79e93b5b6dd2"
 }

README.md

 # OpenTelemetry gRPC Instrumentation for Node.js
 
 [![NPM Published Version][npm-img]][npm-url]
-[![dependencies][dependencies-image]][dependencies-url]
-[![devDependencies][devDependencies-image]][devDependencies-url]
 [![Apache License][license-image]][license-image]
@@ -64,7 +62,3 @@
 [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat
-[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-grpc
-[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation-grpc
-[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-grpc&type=dev
-[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation-grpc&type=dev
 [npm-url]: https://www.npmjs.com/package/@opentelemetry/instrumentation-grpc
 [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Finstrumentation-grpc.svg

No alert changes

Improved metrics

Total package byte prevSize

170866

increased by0.11%

Lines of code

1455

increased by0.28%

Worsened metrics

Number of lines in readme file

64

decreased by-8.57%

Dependency changes

• + Added@opentelemetry/api-metrics@0.28.0(transitive)

• + Added@opentelemetry/instrumentation@0.28.0(transitive)

• + Added@opentelemetry/semantic-conventions@1.2.0(transitive)

• - Removed@opentelemetry/api-metrics@0.27.0(transitive)

• - Removed@opentelemetry/instrumentation@0.27.0(transitive)

• - Removed@opentelemetry/semantic-conventions@1.0.1(transitive)

• Updated@opentelemetry/api-metrics@0.28.0

• Updated@opentelemetry/instrumentation@0.28.0

• Updated@opentelemetry/semantic-conventions@1.2.0