Skip to content

Commit e5e6a35

Browse files
martijnimhoffGaryWilberserj026garywilbaryamohanan
authored
Update our fork with upstream (#13)
* Use macos-14 for test workflow (Blizzard#1088) This resolve "The macOS-12 environment is deprecated, consider switching to macOS-13, macOS-14 (macos-latest) or macOS-15." errors * Cooperative Rebalance (Blizzard#1081) * Update librdkafka to 2.6.0 * Update librdkafka to 2.6.1 (Blizzard#1107) * Update librdkafka version in readme (Blizzard#1108) * Update librdkafka to 2.8.0 (Blizzard#1114) * Update librdkafka to 2.8.0 * add node 22 to test matrix --------- Co-authored-by: garywilb <garywilb+odspmdb@microsoft.com> * Fix submodule commit for 2.8.0 (Blizzard#1115) Co-authored-by: garywilb <garywilb+odspmdb@microsoft.com> * Add support for node 23 (Blizzard#1116) * fix: remove deprecated util.isError usage (Blizzard#1119) * v3.3.1 (Blizzard#1120) * Update librdkafka to 2.10.0 (Blizzard#1126) * Update librdkafka to 2.10.1 (Blizzard#1134) * Update librdkafka to 2.11.1 (Blizzard#1137) * Update librdkafka to 2.12.0 (Blizzard#1139) * Update nan to support node 24 (Blizzard#1140) * fix: update deps and remove duplicate method --------- Co-authored-by: Gary Wilber <41303831+GaryWilber@users.noreply.github.com> Co-authored-by: Serhii Franchuk <44800855+serj026@users.noreply.github.com> Co-authored-by: garywilb <garywilb+odspmdb@microsoft.com> Co-authored-by: Arya <arya.mohanan@ibm.com>
1 parent b924034 commit e5e6a35

20 files changed

Lines changed: 1002 additions & 589 deletions

.github/workflows/test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ jobs:
1010
build:
1111
strategy:
1212
matrix:
13-
node: [16, 18, 20, 22]
13+
node: [16, 18, 20, 21, 22, 23, 24]
1414
os: [ubuntu-22.04]
1515
include:
1616
# single mac test due to minute multipliers
1717
# https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions
18-
- node: 20
19-
os: macos-12
20-
# single windows test due to node.js 14 node-gyp / vs 2022 issues
21-
- node: 20
18+
- node: 24
19+
os: macos-14
20+
- node: 24
2221
os: windows-2022
2322
runs-on: ${{ matrix.os }}
2423
steps:

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ I am looking for *your* help to make this project even better! If you're interes
1717

1818
The `node-rdkafka` library is a high-performance NodeJS client for [Apache Kafka](http://kafka.apache.org/) that wraps the native [librdkafka](https://github.com/edenhill/librdkafka) library. All the complexity of balancing writes across partitions and managing (possibly ever-changing) brokers should be encapsulated in the library.
1919

20-
__This library currently uses `librdkafka` version `2.5.3`.__
20+
__This library currently uses `librdkafka` version `2.12.0`.__
2121

2222
## Reference Docs
2323

@@ -60,7 +60,7 @@ Using Alpine Linux? Check out the [docs](https://github.com/Blizzard/node-rdkafk
6060

6161
### Windows
6262

63-
Windows build **is not** compiled from `librdkafka` source but it is rather linked against the appropriate version of [NuGet librdkafka.redist](https://www.nuget.org/packages/librdkafka.redist/) static binary that gets downloaded from `https://globalcdn.nuget.org/packages/librdkafka.redist.2.5.3.nupkg` during installation. This download link can be changed using the environment variable `NODE_RDKAFKA_NUGET_BASE_URL` that defaults to `https://globalcdn.nuget.org/packages/` when it's no set.
63+
Windows build **is not** compiled from `librdkafka` source but it is rather linked against the appropriate version of [NuGet librdkafka.redist](https://www.nuget.org/packages/librdkafka.redist/) static binary that gets downloaded from `https://globalcdn.nuget.org/packages/librdkafka.redist.2.12.0.nupkg` during installation. This download link can be changed using the environment variable `NODE_RDKAFKA_NUGET_BASE_URL` that defaults to `https://globalcdn.nuget.org/packages/` when it's no set.
6464

6565
Requirements:
6666
* [node-gyp for Windows](https://github.com/nodejs/node-gyp#on-windows)
@@ -97,7 +97,7 @@ const Kafka = require('node-rdkafka');
9797

9898
## Configuration
9999

100-
You can pass many configuration options to `librdkafka`. A full list can be found in `librdkafka`'s [Configuration.md](https://github.com/edenhill/librdkafka/blob/v2.5.3/CONFIGURATION.md)
100+
You can pass many configuration options to `librdkafka`. A full list can be found in `librdkafka`'s [Configuration.md](https://github.com/edenhill/librdkafka/blob/v2.12.0/CONFIGURATION.md)
101101

102102
Configuration keys that have the suffix `_cb` are designated as callbacks. Some
103103
of these keys are informational and you can choose to opt-in (for example, `dr_cb`). Others are callbacks designed to
@@ -132,7 +132,7 @@ You can also get the version of `librdkafka`
132132
const Kafka = require('node-rdkafka');
133133
console.log(Kafka.librdkafkaVersion);
134134

135-
// #=> 2.5.3
135+
// #=> 2.12.0
136136
```
137137

138138
## Sending Messages
@@ -145,7 +145,7 @@ const producer = new Kafka.Producer({
145145
});
146146
```
147147

148-
A `Producer` requires only `metadata.broker.list` (the Kafka brokers) to be created. The values in this list are separated by commas. For other configuration options, see the [Configuration.md](https://github.com/edenhill/librdkafka/blob/v2.5.3/CONFIGURATION.md) file described previously.
148+
A `Producer` requires only `metadata.broker.list` (the Kafka brokers) to be created. The values in this list are separated by commas. For other configuration options, see the [Configuration.md](https://github.com/edenhill/librdkafka/blob/v2.12.0/CONFIGURATION.md) file described previously.
149149

150150
The following example illustrates a list with several `librdkafka` options set.
151151

binding.gyp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
}
4545
],
4646
'cflags_cc' : [
47-
'-std=c++17'
47+
'-std=c++20'
4848
],
4949
'msvs_settings': {
5050
'VCLinkerTool': {
@@ -123,7 +123,7 @@
123123
'OS=="linux"',
124124
{
125125
'cflags_cc' : [
126-
'-std=c++17'
126+
'-std=c++20'
127127
],
128128
'cflags_cc!': [
129129
'-fno-rtti'
@@ -141,7 +141,7 @@
141141
],
142142
'OTHER_CPLUSPLUSFLAGS': [
143143
'-I/usr/local/opt/openssl/include',
144-
'-std=c++17'
144+
'-std=c++20'
145145
],
146146
},
147147
}

0 commit comments

Comments
 (0)