Merge pull request #30 from mgilbey/grpc-js

Use grpc-js in production dependencies instead of grpc

Author: Kapil Rastogi

.gitignore

@@ -69,3 +69,4 @@ dist/
 *.ipr
 *.iws
 ws2/
+.npmrc

.nvmrc

@@ -1 +1 @@
-6
+12.16.3

.travis.yml

@@ -6,7 +6,7 @@ services:
   - docker
 
 node_js:
-  - "6"
+  - "12.16.3"
 
 env:
   global:

Makefile

@@ -33,8 +33,8 @@ integration_tests:
 		--network=sandbox_default \
 		-v $(PWD):/ws \
 		-w /ws \
-		node:6-alpine \
-		/bin/sh -c 'mkdir -p ws2 && cp -a src tests package.json  tsconfig.json ws2/ && cd ws2 && npm i && ./node_modules/mocha/bin/mocha -r ./node_modules/ts-node/register tests/integration/**/*.ts'
+		node:12.16.3-alpine \
+		/bin/sh -c 'mkdir -p ws2 && apk --no-cache add python make g++ && cp -a src tests package.json  tsconfig.json ws2/ && cd ws2 && npm i && ./node_modules/mocha/bin/mocha -r ./node_modules/ts-node/register --exit tests/integration/**/*.ts'
 	docker-compose -f integration-tests/docker-compose.yml -p sandbox stop
 
 .PHONY: compile
@@ -52,8 +52,8 @@ idl_codegen:
 	mkdir src/proto_idl_codegen
 	git submodule init -- ./haystack-idl
 	git submodule update
-	./node_modules/grpc-tools/bin/protoc -I haystack-idl/proto --plugin=protoc-gen-grpc=./node_modules/grpc-tools/bin/grpc_node_plugin --js_out=import_style=commonjs,binary:./src/proto_idl_codegen --grpc_out=./src/proto_idl_codegen haystack-idl/proto/span.proto
-	./node_modules/grpc-tools/bin/protoc -I haystack-idl/proto --plugin=protoc-gen-grpc=./node_modules/grpc-tools/bin/grpc_node_plugin --js_out=import_style=commonjs,binary:./src/proto_idl_codegen --grpc_out=./src/proto_idl_codegen haystack-idl/proto/agent/spanAgent.proto
+	./node_modules/grpc-tools/bin/protoc -I haystack-idl/proto --plugin=protoc-gen-grpc=./node_modules/grpc-tools/bin/grpc_node_plugin --js_out=import_style=commonjs,binary:./src/proto_idl_codegen --grpc_out=generate_package_definition:./src/proto_idl_codegen haystack-idl/proto/span.proto
+	./node_modules/grpc-tools/bin/protoc -I haystack-idl/proto --plugin=protoc-gen-grpc=./node_modules/grpc-tools/bin/grpc_node_plugin --js_out=import_style=commonjs,binary:./src/proto_idl_codegen --grpc_out=generate_package_definition:./src/proto_idl_codegen haystack-idl/proto/agent/spanAgent.proto
 
 .PHONY: npm_install
 npm_install:
@@ -63,4 +63,4 @@ example: build
 	mkdir -p logs
 	rm -rf logs/spans
 	node examples/index.js
-	cat logs/spans
+	cat logs/spans

package.json

@@ -3,7 +3,7 @@
   "version": "0.1.2",
   "description": "Haystack OpenTracing compliant client",
   "engines": {
-    "node": ">=0.10"
+    "node": ">=10.10.0"
   },
   "license": "Apache-2.0",
   "keywords": [],
@@ -17,26 +17,26 @@
     "Haystack <haystack@expedia.com>"
   ],
   "dependencies": {
+    "@grpc/grpc-js": "^1.0.3",
     "google-protobuf": "^3.0.0",
-    "grpc": "^1.9.0",
     "opentracing": "^0.14.0",
-    "uuid": "^3.2.1",
-    "request": "^2.88.0"
+    "request": "^2.88.0",
+    "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@types/node": "7.0.12",
     "@types/chai": "3.4.35",
-    "@types/mocha": "2.2.40",
     "@types/kafka-node": "2.0.7",
+    "@types/mocha": "^7.0.2",
+    "@types/node": "^12.12.42",
     "@types/request": "2.48.0",
-    "kafka-node": "2.6.1",
     "chai": "^3.5.0",
-    "grpc-tools": "1.6.6",
-    "mocha": "^2.5.3",
+    "grpc-tools": "^1.9.0",
+    "kafka-node": "2.6.1",
+    "mocha": "^7.1.2",
+    "npm-registry-package-info": "1.0.5",
+    "semver": "^5.5.0",
     "ts-node": "^7.0.0",
     "tslint": "^5.0.0",
-    "typescript": "2.9.2",
-    "npm-registry-package-info": "1.0.5",
-    "semver": "^5.5.0"
+    "typescript": "^3.9.3"
   }
 }

src/dispatchers/grpc_agent.ts

@@ -14,20 +14,22 @@
  *       limitations under the License.
  */
 
-import * as grpc from 'grpc';
-const services  = require('../proto_idl_codegen/agent/spanAgent_grpc_pb');
+import * as grpc from '@grpc/grpc-js';
+import * as spanAgentPackageDefinition from '../proto_idl_codegen/agent/spanAgent_grpc_pb';
 import {Dispatcher} from './dispatcher';
 import Span from '../span';
 import { Logger, NullLogger } from '../logger';
 import Utils from '../utils';
+import {ServiceClientConstructor} from '@grpc/grpc-js/build/src/make-client';
 
 export default class RemoteDispatcher implements Dispatcher {
     _client: any;
     _logger: any;
 
     constructor(agentHost: string = 'haystack-agent', agentPort: number = 35000, logger: Logger = new NullLogger()) {
         logger.info(`Initializing the remote grpc agent dispatcher, connecting at ${agentHost}:${agentPort}`);
-        this._client = new services.SpanAgentClient(`${agentHost}:${agentPort}`, grpc.credentials.createInsecure());
+        const protoDescriptor = grpc.loadPackageDefinition(spanAgentPackageDefinition) as {[index: string]: ServiceClientConstructor};
+        this._client = new protoDescriptor.SpanAgent(`${agentHost}:${agentPort}`, grpc.credentials.createInsecure());
         this._logger = logger;
     }