Reorganize dependencies #373

Merged

lx merged 28 commits from improve-deps into main 2022-09-08 13:45:09 +00:00

Conversation 0 Commits 28 Files Changed 43 +1284 -939

lx commented 2022-09-05 10:21:19 +00:00

Owner

Copy Link

This PR includes work from @jirutka :

• Allow linking against system-provided libraries (libsodium, libsqlite, libzstd) #370
• Make OTLP exporter optional and allow building without Prometheus exporter (/metrics) #372

And also:

• Update .nix files
• Remove heed default-features
• Bump versions of all Garage crates to 0.8.0
• Make db engines (lmdb, sled, sqlite) optionnal
• Add documentation for available features
• Directly include code of previous versions used for migration in order to reduce dependencies
• Read variable GIT_VERSION from garage main instead of in crate garage_util to make builds faster
• Report features used in the build somewhere? (in garage --version or something)
• Check we warn! correctly if we try to use deactivated feature
• Allow not to launch S3 endpoint if not in config

This PR includes work from @jirutka : - [x] Allow linking against system-provided libraries (libsodium, libsqlite, libzstd) #370 - [x] Make OTLP exporter optional and allow building without Prometheus exporter (/metrics) #372 And also: - [x] Update `.nix` files - [x] Remove heed default-features - [x] Bump versions of all Garage crates to 0.8.0 - [x] Make db engines (lmdb, sled, sqlite) optionnal - [x] Add documentation for available features - [x] Directly include code of previous versions used for migration in order to reduce dependencies - [x] Read variable `GIT_VERSION` from garage main instead of in crate garage_util to make builds faster - [x] Report features used in the build somewhere? (in `garage --version` or something) - [x] Check we `warn!` correctly if we try to use deactivated feature - [x] Allow not to launch S3 endpoint if not in config

lx added 2 commits 2022-09-05 10:21:20 +00:00

a6e40b75ea Add feature "system-libs" to enable linking against system libraries ...

If this feature is enabled, libsodium-sys and zstd-sys will link
dynamically against system-provided libraries instead of building
and linking statically the bundled (possibly outdated and vulnerable)
copies of them. This feature is intended mainly for linux package
maintainers.

7511ba5530 Allow linking against system-provided libsqlite ...

Unfortunately, rusqlite uses the opposite logic for enabling/disabling
bundled libraries to others (libsodium-sys, zstd-sys). Cargo features
are very limited and doesn't allow to enable feature A in a dependency
iff feature B is disabled.

Note, lmdb-rkv-sys doesn't need any special treatment because it
automatically links against system liblmdb if found via pkgconf.

Linux distros should build garage with
`--no-default-features --features system-libs` to disable bundled-libs
and enable system-libs.

lx referenced this pull request 2022-09-05 10:22:46 +00:00

Make OTLP exporter optional and allow building without Prometheus exporter (/metrics) #372

lx added 1 commit 2022-09-05 14:40:29 +00:00

729a910e14

Remove Heed default features

lx added 4 commits 2022-09-06 13:11:34 +00:00

db72812f01 Use the new cargo feature resolver "2" ...

Garage currently uses the legacy resolver "1". The new one is used
by default if the root package specifies 'edition = 2021', which
Garage does not (yet).

The problem with the legacy resolver is, among others, that features
enabled by dev-dependencies are propagated to normal dependencies.
This affects e.g. hyper - one of the dev-dependencies enables "http2"
feature that adds many extra dependencies. If we build garage without
opentelemetry-otlp (this is enabled in the following commit), there's
no normal dependency enabling "http2" feature.

See https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2

e7af006c1c Make OTLP exporter optional via feature "telemetry-otlp" ...

opentelemetry-otlp add 48 (!) extra dependencies and increases the
size of the garage binary by ~11 % (with fat LTO).

ea36b9ff90 Allow building without Prometheus exporter (/metrics endpoint) ...

prometheus and opentelemetry-prometheus add 7 extra dependencies in
total and increases the size of the garage binary by ~7 % (with
fat LTO).

ed7796924b Merge pull request 'Make OTLP exporter optional and allow building without Prometheus exporter (/metrics)' (#372) from jirutka/garage:telemetry-and-metrics into improve-deps ...

Reviewed-on: #372
Reviewed-by: Alex <alex@adnab.me>

lx added 1 commit 2022-09-06 13:48:35 +00:00

454d8474ef

Fix clippy

lx force-pushed improve-deps from 32612455f5 to 8d77a76df1 2022-09-06 13:49:47 +00:00 Compare

lx added 1 commit 2022-09-06 14:42:18 +00:00

7de53a4d66

Force disable pkg-config for libsodum-sys and libzstd-sys

lx added 1 commit 2022-09-06 14:48:12 +00:00

48ffaaadfc

Bump versions to 0.8.0 (compatibility is broken already)

lx added 2 commits 2022-09-06 15:16:56 +00:00

b886c75450

Make all DB engines optional build features

bbb970965c

Document available build features

lx added 1 commit 2022-09-06 15:20:21 +00:00

2c2b93acdf

Update Nix files with optional db engines

lx added 1 commit 2022-09-06 15:25:55 +00:00

431dee050f

Remove opentelemetry-otlp dep in api/

lx added 1 commit 2022-09-06 15:29:59 +00:00

1e92e9f782

Disable k2v tests when feature is disabled

lx added 1 commit 2022-09-06 15:54:14 +00:00

0f5689c169

Include code from v0.5.1 directly to remove dependencies

lx added 1 commit 2022-09-06 15:59:47 +00:00

6f02c36a89

cargo fmt

lx added 1 commit 2022-09-07 10:00:16 +00:00

db61f41030

Move GIT_VERSION injection later in build chain to reduce build times

lx added 1 commit 2022-09-07 15:05:35 +00:00

28d86e7602

Report build features in garage --help

lx added 1 commit 2022-09-07 15:54:31 +00:00

2559f63e9b

Make all HTTP services optionnal

lx added 1 commit 2022-09-07 15:57:29 +00:00

2e00809af5

Error messages when system-libs XOR bundled-libs != 1

lx added 1 commit 2022-09-07 16:02:24 +00:00

1449204439

Add warnings when features are not included in build

lx added 1 commit 2022-09-07 16:10:28 +00:00

107853334b

Fix build error

lx added 2 commits 2022-09-07 16:16:07 +00:00

8adc654713

Merge branch 'main' into improve-deps

06df301de5

Fix merge

lx added 1 commit 2022-09-07 16:30:28 +00:00

f310fce34b

Inject GIT_VERSION even later

lx added 1 commit 2022-09-07 16:37:02 +00:00

ceb1f0229a

Move version back into util

lx changed title from WIP: Reorganize dependencies to Reorganize dependencies 2022-09-07 16:45:36 +00:00

lx merged commit 03c40a0b24 into main 2022-09-08 13:45:09 +00:00

lx referenced this issue from a commit 2022-09-08 13:45:09 +00:00

Merge pull request 'Reorganize dependencies' (#373) from improve-deps into main

lx referenced this pull request 2022-09-14 11:23:12 +00:00

`[s3_web]` and `[s3_api]` should not be mandatory #354

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

AdminAPI

Issues concerning the administration API

  

Bug

  

Check AWS

The behaviour should be checked against AWS S3

  

CI

Issues with Nix, Drone, Rust Compiler, etc.

  

Correctness

Issues of theoretical correctness that may impact edge-case scenarios

  

Critical

  

Documentation

  

Ideas

For abstract ideas/proposal to make Garage better, to better communicate our not yet achieved aims

  

Improvement

  

Low priority

For issues that we don't want to spend time on until made absolutely necessary

  

Newcomer

A bug that should be newcomer friendly.

  

Performance

  

S3 Compatibility

  

Testing

  

Usability

Propositions to make Garage easier to operate, by improving error reporting, CLI, etc.

No Label

AdminAPI

Bug

Check AWS

CI

Correctness

Critical

Documentation

Ideas

Improvement

Low priority

Newcomer

Performance

S3 Compatibility

Testing

Usability

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Deuxfleurs/garage#373

No description provided.