Merge branch 'master' into dev_producer_testing_and_fixes

milindl · milindl · commit de06e491c278 · 2023-12-13T14:59:40.000+05:30
diff --git a/.semaphore/project.yml b/.semaphore/project.yml
@@ -0,0 +1,44 @@
+# This file is managed by ServiceBot plugin - Semaphore. The content in this file is created using a common
+# template and configurations in service.yml.
+# Modifications in this file will be overwritten by generated content in the nightly run.
+# For more information, please refer to the page:
+# https://confluentinc.atlassian.net/wiki/spaces/Foundations/pages/2871296194/Add+SemaphoreCI
+apiVersion: v1alpha
+kind: Project
+metadata:
+  name: confluent-kafka-js
+  description: ""
+spec:
+  visibility: private
+  repository:
+    url: git@github.com:confluentinc/confluent-kafka-js.git
+    run_on:
+    - branches
+    - tags
+    - pull_requests
+    pipeline_file: .semaphore/semaphore.yml
+    integration_type: github_app
+    status:
+      pipeline_files:
+      - path: .semaphore/semaphore.yml
+        level: pipeline
+    whitelist:
+      branches:
+      - master
+      - main
+      - /^v\d+\.\d+\.x$/
+      - /^gh-readonly-queue.*/
+  custom_permissions: true
+  debug_permissions:
+  - empty
+  - default_branch
+  - non_default_branch
+  - pull_request
+  - forked_pull_request
+  - tag
+  attach_permissions:
+  - default_branch
+  - non_default_branch
+  - pull_request
+  - forked_pull_request
+  - tag
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -0,0 +1,62 @@
+# This file is managed by ServiceBot plugin - Semaphore. The content in this file is created using a common
+# template and configurations in service.yml.
+# Any modifications made to version, name, agent, and global_job_config will be overwritten by the generated
+# content in nightly runs. Code changes made to the remaining sections will not be affected.
+# For more information, please refer to the page:
+# https://confluentinc.atlassian.net/wiki/spaces/Foundations/pages/2871296194/Add+SemaphoreCI
+version: v1.0
+name: build-test-release
+agent:
+  machine:
+    type: s1-prod-ubuntu20-04-amd64-1
+
+auto_cancel:
+  running:
+    when: "branch != 'master'"
+
+execution_time_limit:
+  hours: 1
+
+queue:
+  - when: "branch != 'master'"
+    processing: parallel
+
+global_job_config:
+  prologue:
+    commands:
+      - checkout
+      - make show-args
+      - . vault-setup
+      - . vault-sem-get-secret cpd_gcloud
+      - . vault-sem-get-secret ci-reporting
+      - . vault-sem-get-secret v1/ci/kv/service-foundations/cc-mk-include
+      - make init-ci
+  epilogue:
+    always:
+      commands:
+        - make epilogue-ci
+
+blocks:
+  - name: "Build, Test, Release"
+    run:
+      # don't run the build or unit tests on non-functional changes...
+      when: "change_in('/', {exclude: ['/.deployed-versions/', '.github/']})"
+    task:
+       # You can customize your CI job here
+#      env_vars:
+#        # custom env_vars
+#      prologue:
+#        commands:
+#          # custom vault secrets
+#          # custom prologue commands
+      jobs:
+        - name: "Build, Test, Release"
+          commands:
+            - make build
+            - make test
+            - make release-ci
+      epilogue:
+        always:
+          commands:
+            - make epilogue-ci
+            - make testbreak-after
diff --git a/binding.gyp b/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",
diff --git a/deps/librdkafka.gyp b/deps/librdkafka.gyp
@@ -26,7 +26,7 @@
                   "librdkafka/config.h",
                 ],
                 "action": [
-                  "make", "-C", "librdkafka", "libs", "install"
+                  "make", "-j5", "-C", "librdkafka", "libs", "install"
                 ],
                 "conditions": [
                   [
diff --git a/librdkafka.js b/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;
diff --git a/package.json b/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}-{arch}.tar.gz",
     "host": "https://github.com/confluentinc/confluent-kafka-js/releases/download/",
diff --git a/service.yml b/service.yml
@@ -7,3 +7,5 @@ github:
   enable: true
 codeowners:
   enable: true
+semaphore:
+  enable: true
diff --git a/test/binding.spec.js b/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 = {
diff --git a/test/consumer.spec.js b/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;
diff --git a/util/configure.js b/util/configure.js
@@ -19,7 +19,10 @@ if (isWin) {
 var childProcess = require('child_process');
 
 try {
-  childProcess.execSync('./configure --install-deps --source-deps-only --disable-lz4-ext --enable-static --enable-strip --disable-gssapi --prefix=' + releaseDir + ' --libdir=' + releaseDir, {
+  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]
   });

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"librdkafka/config.h",`
`27`	`27`	`],`
`28`	`28`	`"action": [`
`29`		`- "make", "-C", "librdkafka", "libs", "install"`
	`29`	`+ "make", "-j5", "-C", "librdkafka", "libs", "install"`
`30`	`30`	`],`
`31`	`31`	`"conditions": [`
`32`	`32`	`[`