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
52 changes: 29 additions & 23 deletions bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -327,29 +327,33 @@ Apache Software License, Version 2.
- 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.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-api-events-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-api-logs-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-common-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-extension-incubator-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-common-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-semconv-1.26.0-alpha.jar [55]
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.40.0-alpha.jar [55]
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.28.0-alpha.jar [55]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.26.0.jar [55]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.26.0-alpha.jar [55]
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-metrics-1.26.0-alpha.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/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]
Expand Down Expand Up @@ -406,10 +410,12 @@ Apache Software License, Version 2.
[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.26.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
[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

------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies
Expand Down
34 changes: 15 additions & 19 deletions bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -292,24 +292,20 @@ 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.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-api-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-api-events-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-api-logs-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-extension-incubator-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-common-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-semconv-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-api-incubator-1.43.0-alpha.jar [55]
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.40.0-alpha.jar [55]
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.28.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.43.0.jar [55]
- 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]

[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1
Expand Down Expand Up @@ -352,7 +348,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.26.0
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.45.0
[55] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies
Expand Down
52 changes: 29 additions & 23 deletions bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -323,29 +323,33 @@ Apache Software License, Version 2.
- 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.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-api-events-1.26.0-alpha.jar [54]
- lib/io.opentelemetry-opentelemetry-api-logs-1.26.0-alpha.jar [54]
- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-common-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.26.0-alpha.jar [54]
- lib/io.opentelemetry-opentelemetry-extension-incubator-1.26.0-alpha.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-common-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.26.0-alpha.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.26.0-alpha.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-semconv-1.26.0-alpha.jar [54]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.26.0.jar [54]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.26.0-alpha.jar [54]
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-metrics-1.26.0-alpha.jar [54]
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.40.0-alpha.jar [54]
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.28.0-alpha.jar [54]
- 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/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]
Expand Down Expand Up @@ -401,10 +405,12 @@ 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/square/okio/releases/tag/parent-3.6.0
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.26.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
[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

------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies
Expand Down
35 changes: 34 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@
<forkCount.variable>1</forkCount.variable>
<servlet-api.version>4.0.0</servlet-api.version>
<rxjava.version>3.0.1</rxjava.version>
<otel.version>1.26.0</otel.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>
<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 @@ -649,6 +651,37 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry.contrib</groupId>
<artifactId>opentelemetry-gcp-resources</artifactId>
<version>${otel.version}-alpha</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom-alpha</artifactId>
<version>${otel.version}-alpha</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-instrumentation-bom</artifactId>
<version>${otel.instrumentation.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
<version>${otel.instrumentation.version}-alpha</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
<version>${otel.semconv.version}</version>
</dependency>

<!-- http-client -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,18 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-prometheus</artifactId>
<version>${otel.version}-alpha</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-runtime-metrics</artifactId>
<version>${otel.version}-alpha</version>
<artifactId>opentelemetry-runtime-telemetry-java8</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
<version>${otel.version}-alpha</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.metrics.Meter;
import io.opentelemetry.instrumentation.runtimemetrics.BufferPools;
import io.opentelemetry.instrumentation.runtimemetrics.Classes;
import io.opentelemetry.instrumentation.runtimemetrics.Cpu;
import io.opentelemetry.instrumentation.runtimemetrics.GarbageCollector;
import io.opentelemetry.instrumentation.runtimemetrics.MemoryPools;
import io.opentelemetry.instrumentation.runtimemetrics.Threads;
import io.opentelemetry.instrumentation.runtimemetrics.java8.BufferPools;
import io.opentelemetry.instrumentation.runtimemetrics.java8.Classes;
import io.opentelemetry.instrumentation.runtimemetrics.java8.Cpu;
import io.opentelemetry.instrumentation.runtimemetrics.java8.GarbageCollector;
import io.opentelemetry.instrumentation.runtimemetrics.java8.MemoryPools;
import io.opentelemetry.instrumentation.runtimemetrics.java8.Threads;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import io.opentelemetry.sdk.metrics.Aggregation;
import io.opentelemetry.sdk.metrics.InstrumentSelector;
Expand Down