Skip to content

Commit 815c551

Browse files
authored
Revert moving off of LD SDK fork again (#36320)
See [incident-984](https://materializeinc.slack.com/archives/C0B0FUQ9NP7). There is a critical bug causing connections to be permanently broken quite often, which is fixed in our fork, but is not fixed upstream even on the latest version: launchdarkly/rust-server-sdk#116 LD test from Nightly: https://buildkite.com/materialize/nightly/builds/16253 (green)
1 parent b861406 commit 815c551

7 files changed

Lines changed: 90 additions & 320 deletions

File tree

Cargo.lock

Lines changed: 44 additions & 83 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,7 @@ junit-report = "0.8.3"
377377
k8s-controller = "0.10.0"
378378
k8s-openapi = { version = "0.27.0", features = ["schemars", "v1_32"] }
379379
kube = { version = "3.1.0", default-features = false, features = ["client", "derive", "openssl-tls", "runtime", "ws"] }
380-
launchdarkly-server-sdk = { version = "3.0.1", default-features = false, features = ["native-tls", "crypto-openssl"] }
381-
launchdarkly-sdk-transport = "0.1"
380+
launchdarkly-server-sdk = { version = "2.6.2", default-features = false }
382381
lgalloc = "0.6.0"
383382
libc = "0.2.184"
384383
lru = "0.16.3"
@@ -598,6 +597,9 @@ postgres_array = { git = "https://github.com/MaterializeInc/rust-postgres-array"
598597
# Waiting on https://github.com/MaterializeInc/serde-value/pull/35.
599598
serde-value = { git = "https://github.com/MaterializeInc/serde-value.git" }
600599

600+
# Waiting for resolution of https://github.com/launchdarkly/rust-server-sdk/issues/116
601+
launchdarkly-server-sdk = { git = "https://github.com/MaterializeInc/rust-server-sdk", rev = "3e0a0b98b09a2970f292577a07e1c9382b65b5da" }
602+
601603
# Waiting on https://github.com/edenhill/librdkafka/pull/4051.
602604
rdkafka = { git = "https://github.com/MaterializeInc/rust-rdkafka.git" }
603605
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka.git" }

deny.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ wrappers = [
178178
"globset",
179179
"launchdarkly-server-sdk",
180180
"launchdarkly-server-sdk-evaluation",
181-
"launchdarkly-sdk-transport",
182181
"native-tls",
183182
"opendal",
184183
"os_info",

src/adapter/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ governor.workspace = true
2828
hex.workspace = true
2929
imbl.workspace = true
3030
http.workspace = true
31+
hyper-tls = "0.5.0"
3132
ipnet.workspace = true
3233
itertools.workspace = true
3334
launchdarkly-server-sdk.workspace = true
34-
launchdarkly-sdk-transport.workspace = true
3535
maplit.workspace = true
3636
mz-adapter-types = { path = "../adapter-types" }
3737
mz-audit-log = { path = "../audit-log" }

0 commit comments

Comments
 (0)