Merge branch 'dev_producer_testing_and_fixes' into feature/add-basic-semaphore-setup

Author: milindl

.semaphore/semaphore.yml

@@ -206,4 +206,4 @@ blocks:
             - npm install # node-pre-gyp will fallback to build here, because new tag implies no release yet.
             - npx node-pre-gyp package
             - ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
-            - artifact push project "build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}" --destination "releases/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}"
+            - artifact push project "build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}" --destination "releases/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}"

binding.gyp

@@ -3,10 +3,11 @@
     # may be redefined in command line on configuration stage
     # "BUILD_LIBRDKAFKA%": "<!(echo ${BUILD_LIBRDKAFKA:-1})"
     "BUILD_LIBRDKAFKA%": "<!(node ./util/get-env.js BUILD_LIBRDKAFKA 1)",
+    "CKJS_LINKING%": "<!(node ./util/get-env.js CKJS_LINKING static)",
   },
   "targets": [
     {
-      "target_name": "node-librdkafka",
+      "target_name": "confluent-kafka-js",
       'sources': [
         'src/binding.cc',
         'src/callbacks.cc',
@@ -85,7 +86,17 @@
                   ],
                   'conditions': [
                     [
-                      'OS=="linux"',
+                      ['OS=="linux"', 'CKJS_LINKING="dynamic"'],
+                      {
+                        "libraries": [
+                          "../build/deps/librdkafka.so",
+                          "../build/deps/librdkafka++.so",
+                          "-Wl,-rpath='$$ORIGIN/../deps'",
+                        ],
+                      }
+                    ],
+                    [
+                      ['OS=="linux"', 'CKJS_LINKING!="dynamic"'],
                       {
                         "libraries": [
                           "../build/deps/librdkafka-static.a",

deps/librdkafka.gyp

@@ -26,7 +26,7 @@
                   "librdkafka/config.h",
                 ],
                 "action": [
-                  "make", "-C", "librdkafka", "libs", "install"
+                  "make", "-j5", "-C", "librdkafka", "libs", "install"
                 ],
                 "conditions": [
                   [

librdkafka.js

@@ -7,6 +7,6 @@
  * of the MIT license.  See the LICENSE.txt file for details.
  */
 
-var kafka = require('bindings')('node-librdkafka');
+var kafka = require('bindings')('confluent-kafka-js');
 
 module.exports = kafka;

package.json

@@ -14,7 +14,7 @@
     "test:types": "tsc -p ."
   },
   "binary": {
-    "module_name": "node-librdkafka",
+    "module_name": "confluent-kafka-js",
     "module_path": "./build/{configuration}/",
     "package_name": "{module_name}-v{version}-{node_abi}-{platform}-{libc}-{arch}.tar.gz",
     "host": "https://github.com/confluentinc/confluent-kafka-js/releases/download/",

test/binding.spec.js

@@ -7,7 +7,7 @@
  * of the MIT license.  See the LICENSE.txt file for details.
  */
 
-var addon = require('bindings')('node-librdkafka');
+var addon = require('bindings')('confluent-kafka-js');
 var t = require('assert');
 
 var consumerConfig = {

test/consumer.spec.js

@@ -7,7 +7,7 @@
  * of the MIT license.  See the LICENSE.txt file for details.
  */
 
-var addon = require('bindings')('node-librdkafka');
+var addon = require('bindings')('confluent-kafka-js');
 var t = require('assert');
 
 var client;

util/configure.js

@@ -7,11 +7,6 @@ var path = require('path');
 
 var baseDir = path.resolve(__dirname, '../');
 var releaseDir = path.join(baseDir, 'build', 'deps');
-// var command = './configure --install-deps --source-deps-only --disable-lz4-ext --enable-static --enable-strip --disable-gssapi';
-// if (!process.env.IS_ON_CI) {
-var command = './configure --install-deps --source-deps-only --disable-lz4-ext --enable-static --enable-strip --disable-gssapi --prefix=' + releaseDir + ' --libdir=' + releaseDir;
-// }
-
 var isWin = /^win/.test(process.platform);
 
 // Skip running this if we are running on a windows system
@@ -23,8 +18,10 @@ if (isWin) {
 var childProcess = require('child_process');
 
 try {
-  process.stderr.write("Running: " + command + 'on working directory = ' + baseDir + '\n');
-  childProcess.execSync(command, {
+  let opts = '--install-deps --source-deps-only --disable-lz4-ext --enable-static --enable-strip --disable-gssapi';
+  if (process.env['CKJS_LINKING'] === 'dynamic')
+    opts = '';
+  childProcess.execSync(`./configure ${opts} --prefix=${releaseDir} --libdir=${releaseDir}`, {
     cwd: baseDir,
     stdio: [0,1,2]
   });