Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 36 additions & 39 deletions bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -325,41 +325,38 @@ Apache Software License, Version 2.
- lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51]
- lib/org.hdrhistogram-HdrHistogram-2.1.10.jar [52]
- lib/com.carrotsearch-hppc-0.9.1.jar [53]
- lib/com.squareup.okhttp3-okhttp-4.12.0.jar [54]
- lib/com.squareup.okio-okio-3.6.0.jar [54]
- lib/com.squareup.okio-okio-jvm-3.6.0.jar [54]
- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-common-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.45.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-common-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.45.0.jar [55]
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.45.0-alpha.jar [55]
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.29.0-alpha.jar [55]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.33.6.jar [59]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.33.6-alpha.jar [59]
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-1.33.6-alpha.jar [59]
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
- lib/io.prometheus-prometheus-metrics-config-1.3.4.jar [60]
- lib/io.prometheus-prometheus-metrics-exporter-common-1.3.4.jar [60]
- lib/io.prometheus-prometheus-metrics-exporter-httpserver-1.3.4.jar [60]
- lib/io.prometheus-prometheus-metrics-exposition-formats-1.3.4.jar [60]
- lib/io.prometheus-prometheus-metrics-exposition-textformats-1.3.4.jar [60]
- lib/io.prometheus-prometheus-metrics-model-1.3.4.jar [60]
- lib/com.squareup.okhttp3-okhttp-jvm-5.3.1.jar [54]
- lib/com.squareup.okio-okio-jvm-3.16.3.jar [54]
- lib/io.opentelemetry-opentelemetry-api-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-api-incubator-1.56.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-common-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-context-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-common-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.56.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-common-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.56.0.jar [55]
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.52.0-alpha.jar [55]
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.37.0.jar [55]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-2.21.0.jar [59]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-incubator-2.21.0-alpha.jar [59]
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-2.21.0-alpha.jar [59]
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.36.0.jar [55]
- lib/io.prometheus-prometheus-metrics-config-1.3.10.jar [60]
- lib/io.prometheus-prometheus-metrics-exporter-common-1.3.10.jar [60]
- lib/io.prometheus-prometheus-metrics-exporter-httpserver-1.3.10.jar [60]
- lib/io.prometheus-prometheus-metrics-exposition-formats-no-protobuf-1.3.10.jar [60]
- lib/io.prometheus-prometheus-metrics-exposition-textformats-1.3.10.jar [60]
- lib/io.prometheus-prometheus-metrics-model-1.3.10.jar [60]
- lib/org.jetbrains-annotations-13.0.jar [56]
- lib/org.jetbrains.kotlin-kotlin-stdlib-1.8.21.jar [56]
- lib/org.jetbrains.kotlin-kotlin-stdlib-common-1.8.21.jar [56]
- lib/org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.8.21.jar [56]
- lib/org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.8.21.jar [56]
- lib/org.jetbrains.kotlin-kotlin-stdlib-2.2.21.jar [56]
- lib/com.lmax-disruptor-4.0.0.jar [57]

[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1
Expand Down Expand Up @@ -410,13 +407,13 @@ Apache Software License, Version 2.
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
[52] Source available at https://github.com/HdrHistogram/HdrHistogram/tree/HdrHistogram-2.1.10
[53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
[54] Source available at https://github.com/square/okio/releases/tag/parent-3.6.0
[55] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.45.0
[56] Source available at https://github.com/JetBrains/kotlin/releases/tag/v1.8.21
[54] Source available at https://github.com/square/okio/releases/tag/parent-3.16.3
[55] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.56.0
[56] Source available at https://github.com/JetBrains/kotlin/releases/tag/v2.2.21
[57] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0
[58] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
[59] Source available at https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v1.33.6
[60] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
[59] Source available at https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v2.21.0
[60] Source available at https://github.com/prometheus/client_java/tree/v1.3.10
[61] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
[62] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
------------------------------------------------------------------------------------
Expand Down
32 changes: 16 additions & 16 deletions bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -293,21 +293,21 @@ Apache Software License, Version 2.
- lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51]
- lib/com.carrotsearch-hppc-0.9.1.jar [52]
- lib/com.lmax-disruptor-4.0.0.jar [53]
- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-common-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.45.0.jar [55]
- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [55]
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.45.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.45.0.jar [55]
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
- lib/io.opentelemetry-opentelemetry-api-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-common-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-context-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-api-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-common-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-context-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-common-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.56.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.56.0.jar [55]
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.52.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.56.0.jar [55]
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.36.0.jar [54]

[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1
Expand Down Expand Up @@ -349,7 +349,7 @@ Apache Software License, Version 2.
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
[52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
[53] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.45.0
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.56.0
[55] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
[56] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
[57] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
Expand Down
75 changes: 36 additions & 39 deletions bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -321,41 +321,38 @@ Apache Software License, Version 2.
- lib/org.xerial.snappy-snappy-java-1.1.10.5.jar [50]
- lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51]
- lib/com.carrotsearch-hppc-0.9.1.jar [52]
- lib/com.squareup.okhttp3-okhttp-4.12.0.jar [53]
- lib/com.squareup.okio-okio-3.6.0.jar [53]
- lib/com.squareup.okio-okio-jvm-3.6.0.jar [53]
- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [54]
- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-common-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.45.0-alpha.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-common-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.45.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.45.0.jar [54]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.33.6.jar [58]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.33.6-alpha.jar [58]
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-1.33.6-alpha.jar [58]
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.45.0-alpha.jar [54]
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.29.0-alpha.jar [54]
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
- lib/io.prometheus-prometheus-metrics-config-1.3.4.jar [59]
- lib/io.prometheus-prometheus-metrics-exporter-common-1.3.4.jar [59]
- lib/io.prometheus-prometheus-metrics-exporter-httpserver-1.3.4.jar [59]
- lib/io.prometheus-prometheus-metrics-exposition-formats-1.3.4.jar [59]
- lib/io.prometheus-prometheus-metrics-exposition-textformats-1.3.4.jar [59]
- lib/io.prometheus-prometheus-metrics-model-1.3.4.jar [59]
- lib/com.squareup.okhttp3-okhttp-jvm-5.3.1.jar [53]
- lib/com.squareup.okio-okio-jvm-3.16.3.jar [53]
- lib/io.opentelemetry-opentelemetry-api-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-api-incubator-1.56.0-alpha.jar [54]
- lib/io.opentelemetry-opentelemetry-common-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-context-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-common-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.56.0-alpha.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-common-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.56.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.56.0.jar [54]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-2.21.0.jar [58]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-incubator-2.21.0-alpha.jar [58]
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-2.21.0-alpha.jar [58]
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.52.0-alpha.jar [54]
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.37.0.jar [54]
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.36.0.jar [54]
- lib/io.prometheus-prometheus-metrics-config-1.3.10.jar [59]
- lib/io.prometheus-prometheus-metrics-exporter-common-1.3.10.jar [59]
- lib/io.prometheus-prometheus-metrics-exporter-httpserver-1.3.10.jar [59]
- lib/io.prometheus-prometheus-metrics-exposition-formats-no-protobuf-1.3.10.jar [59]
- lib/io.prometheus-prometheus-metrics-exposition-textformats-1.3.10.jar [59]
- lib/io.prometheus-prometheus-metrics-model-1.3.10.jar [59]
- lib/org.jetbrains-annotations-13.0.jar [55]
- lib/org.jetbrains.kotlin-kotlin-stdlib-1.8.21.jar [55]
- lib/org.jetbrains.kotlin-kotlin-stdlib-common-1.8.21.jar [55]
- lib/org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.8.21.jar [55]
- lib/org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.8.21.jar [55]
- lib/org.jetbrains.kotlin-kotlin-stdlib-2.2.21.jar [55]
- lib/com.lmax-disruptor-4.0.0.jar [56]

[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1
Expand Down Expand Up @@ -405,13 +402,13 @@ Apache Software License, Version 2.
[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
[52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
[53] Source available at https://github.com/square/okio/releases/tag/parent-3.6.0
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.45.0
[55] Source available at https://github.com/JetBrains/kotlin/releases/tag/v1.8.21
[53] Source available at https://github.com/square/okio/releases/tag/parent-3.16.3
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.56.0
[55] Source available at https://github.com/JetBrains/kotlin/releases/tag/v2.2.21
[56] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0
[57] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
[58] Source available at https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v1.33.6
[59] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
[58] Source available at https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v2.21.0
[59] Source available at https://github.com/prometheus/client_java/tree/v1.3.10
[60] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
[61] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
------------------------------------------------------------------------------------
Expand Down
25 changes: 15 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,13 @@
<forkCount.variable>1</forkCount.variable>
<servlet-api.version>4.0.0</servlet-api.version>
<rxjava.version>3.0.1</rxjava.version>
<otel.version>1.45.0</otel.version>
<otel.instrumentation.version>1.33.6</otel.instrumentation.version>
<otel.semconv.version>1.29.0-alpha</otel.semconv.version>
<otel.version>1.56.0</otel.version>
<otel.instrumentation.version>2.21.0</otel.instrumentation.version>
<otel.semconv.version>1.37.0</otel.semconv.version>
<otel.contrib.version>1.52.0</otel.contrib.version>
<okhttp3.version>5.3.1</okhttp3.version>
<!-- use okio version that matches the okhttp3 version -->
<okio.version>3.16.3</okio.version>
<UBUNTU_MIRROR>http://archive.ubuntu.com/ubuntu/</UBUNTU_MIRROR>
<UBUNTU_SECURITY_MIRROR>http://security.ubuntu.com/ubuntu/</UBUNTU_SECURITY_MIRROR>
</properties>
Expand Down Expand Up @@ -474,21 +478,22 @@
<version>${failsafe.version}</version>
</dependency>

<!-- override otel's okhttp 4.11.0 for now, wait for otel update -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-bom</artifactId>
<version>4.12.0</version>
<version>${okhttp3.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- okhttp 4.12.0 use kotlin stdlib 1.8.21 -->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-common</artifactId>
<version>1.8.21</version>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-bom</artifactId>
<version>${okio.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>


<!-- rocksdb dependencies -->
<dependency>
<groupId>org.rocksdb</groupId>
Expand Down Expand Up @@ -666,7 +671,7 @@
<dependency>
<groupId>io.opentelemetry.contrib</groupId>
<artifactId>opentelemetry-gcp-resources</artifactId>
<version>${otel.version}-alpha</version>
<version>${otel.contrib.version}-alpha</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
Expand Down
Loading
Loading