Skip to content

bump grpc, pekko, opentelemetry #21822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: release/2.10.x
Choose a base branch
from
Draft

bump grpc, pekko, opentelemetry #21822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be0fdef
bump grpc, pekko, opentelemetry
remyhaemmerle-da Aug 29, 2025
26373c2
fixes
remyhaemmerle-da Sep 1, 2025
812e3b2
maven update
remyhaemmerle-da Sep 1, 2025
9718e02
gRPC update to 1.75.0
VolodymyrMarchenko-da Sep 16, 2025
11825b5
Set opentelemetry 1.12.0
VolodymyrMarchenko-da Sep 16, 2025
67fe851
Fix JvmMetricSet.scala
VolodymyrMarchenko-da Sep 17, 2025
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
22 changes: 11 additions & 11 deletions sdk/bazel-java-deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ version_specific = {
#
# 2. As recommended by https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty we use
# grpc-netty-shaded than embedded netty and netty-boringssl-tcnative (shaded)
grpc_version = "1.67.1"
grpc_version = "1.75.0"
protobuf_version = "3.25.5"
pekko_version = "1.1.2"
pekko_version = "1.1.5"
pekko_http_version = "1.1.0"

#gatling_version = "3.5.1"
Expand Down Expand Up @@ -163,26 +163,26 @@ def install_java_deps():
"io.grpc:grpc-services:{}".format(grpc_version),
"io.grpc:grpc-stub:{}".format(grpc_version),
"io.grpc:grpc-util:{}".format(grpc_version),
"io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:{}-alpha".format(opentelemetry_version),
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:{}-alpha".format(opentelemetry_version),
"io.opentelemetry.instrumentation:opentelemetry-runtime-metrics:{}-alpha".format(opentelemetry_version),
"io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:1.33.6-alpha",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.33.6",
"io.opentelemetry.instrumentation:opentelemetry-runtime-metrics:1.26.0-alpha",
"io.opentelemetry:opentelemetry-api:{}".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-context:{}".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-exporter-jaeger:{}".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-exporter-jaeger:1.34.1",
"io.opentelemetry:opentelemetry-exporter-otlp-common:{}".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-exporter-otlp-trace:{}".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-exporter-otlp-trace:1.14.0",
"io.opentelemetry:opentelemetry-exporter-prometheus:{}-alpha".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-exporter-zipkin:{}".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-sdk-common:{}".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:{}".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:{}-alpha".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-sdk-logs:{}-alpha".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-sdk-metrics-testing:{}-alpha".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-sdk-metrics-testing:1.13.0-alpha",
"io.opentelemetry:opentelemetry-sdk-metrics:{}-alpha".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-sdk-testing:{}".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-sdk-trace:{}".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-sdk:{}".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-semconv:{}-alpha".format(opentelemetry_version),
"io.opentelemetry:opentelemetry-semconv:1.30.1-alpha",
"io.prometheus:simpleclient:{}".format(prometheus_version),
"io.prometheus:simpleclient_dropwizard:{}".format(prometheus_version),
"io.prometheus:simpleclient_httpserver:{}".format(prometheus_version),
Expand Down Expand Up @@ -321,8 +321,8 @@ def install_java_deps():
artifacts = [
"io.gatling.highcharts:gatling-charts-highcharts:3.5.1",
"io.gatling:gatling-app:3.5.1",
"io.netty:netty.common:4.1.110.Final",
"io.netty:netty.transport:4.1.110.Final",
"io.netty:netty-common:4.1.110.Final",
"io.netty:netty-transport:4.1.110.Final",
],
repositories = [
"https://repo1.maven.org/maven2",
Expand Down
4 changes: 2 additions & 2 deletions ...unity/common/src/main/scala/com/digitalasset/canton/environment/CantonNodeBootstrap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import com.digitalasset.canton.util.{SimpleExecutionQueue, retry}
import com.digitalasset.canton.version.{ProtocolVersion, ReleaseProtocolVersion}
import com.digitalasset.canton.watchdog.WatchdogService
import io.grpc.ServerServiceDefinition
import io.grpc.protobuf.services.ProtoReflectionService
import io.grpc.protobuf.services.ProtoReflectionServiceV1
import io.opentelemetry.api.trace.Tracer
import org.apache.pekko.actor.ActorSystem
import org.slf4j.event.Level
Expand Down Expand Up @@ -232,7 +232,7 @@ abstract class CantonNodeBootstrapBase[
executionContext,
)
)
.addService(ProtoReflectionService.newInstance(), false)
.addService(ProtoReflectionServiceV1.newInstance(), false)
.addService(
ApiInfoServiceGrpc.bindService(
new GrpcApiInfoService(CantonGrpcUtil.ApiName.AdminApi),
Expand Down
4 changes: 2 additions & 2 deletions ...ton/community/common/src/main/scala/com/digitalasset/canton/health/GrpcHealthServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import com.digitalasset.canton.metrics.MetricHandle
import com.digitalasset.canton.networking.grpc.CantonServerBuilder
import com.digitalasset.canton.tracing.TracingConfig
import io.grpc.health.v1.HealthCheckResponse.ServingStatus
import io.grpc.protobuf.services.ProtoReflectionService
import io.grpc.protobuf.services.ProtoReflectionServiceV1

import java.util.concurrent.ExecutorService
import scala.annotation.nowarn
Expand Down Expand Up @@ -44,7 +44,7 @@ class GrpcHealthServer(
None,
NoOpTelemetry,
)
.addService(ProtoReflectionService.newInstance(), withLogging = false)
.addService(ProtoReflectionServiceV1.newInstance(), withLogging = false)
.addService(healthManager.getHealthService.bindService())
.build
.start()
Expand Down
4 changes: 2 additions & 2 deletions ...domain/src/main/scala/com/digitalasset/canton/domain/server/DynamicDomainGrpcServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import com.digitalasset.canton.logging.{NamedLoggerFactory, NamedLogging}
import com.digitalasset.canton.metrics.MetricHandle
import com.digitalasset.canton.networking.grpc.CantonServerBuilder
import com.digitalasset.canton.protocol.DomainParameters.MaxRequestSize
import io.grpc.protobuf.services.ProtoReflectionService
import io.grpc.protobuf.services.ProtoReflectionServiceV1

import scala.annotation.nowarn
import scala.concurrent.ExecutionContextExecutorService
Expand Down Expand Up @@ -80,7 +80,7 @@ class DynamicDomainGrpcServer(

serverBuilder
.addService(grpcDomainHealthManager.manager.getHealthService.bindService())
.addService(ProtoReflectionService.newInstance(), withLogging = false)
.addService(ProtoReflectionServiceV1.newInstance(), withLogging = false)
.discard[CantonServerBuilder]

(toCloseableServer(serverBuilder.build.start(), logger, "PublicServer"), registry)
Expand Down
4 changes: 2 additions & 2 deletions ...dger-api-core/src/main/scala/com/digitalasset/canton/platform/apiserver/ApiServices.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import com.digitalasset.canton.platform.services.time.TimeProviderType
import com.digitalasset.canton.platform.store.cache.PruningOffsetCache
import com.digitalasset.canton.tracing.TraceContext
import io.grpc.BindableService
import io.grpc.protobuf.services.ProtoReflectionService
import io.grpc.protobuf.services.ProtoReflectionServiceV1
import io.opentelemetry.api.trace.Tracer
import org.apache.pekko.stream.Materializer

Expand Down Expand Up @@ -274,7 +274,7 @@ object ApiServices {
checkOverloaded,
)

val apiReflectionService = ProtoReflectionService.newInstance()
val apiReflectionService = ProtoReflectionServiceV1.newInstance()

val apiHealthService = new GrpcHealthService(healthChecks, telemetry, loggerFactory)

Expand Down
6 changes: 3 additions & 3 deletions ...com/digitalasset/canton/platform/apiserver/ratelimiting/RateLimitingInterceptorSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import io.grpc.Status.Code
import io.grpc.*
import io.grpc.health.v1.health.{HealthCheckRequest, HealthCheckResponse, HealthGrpc}
import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder
import io.grpc.protobuf.services.ProtoReflectionService
import io.grpc.reflection.v1alpha.{
import io.grpc.protobuf.services.ProtoReflectionServiceV1
import io.grpc.reflection.v1.{
ServerReflectionGrpc,
ServerReflectionRequest,
ServerReflectionResponse,
Expand Down Expand Up @@ -102,7 +102,7 @@ final class RateLimitingInterceptorSpec
.meter(MetricRegistry.name(metrics.daml.lapi.threadpool.apiServices, "submitted"))
.mark(config.maxApiServicesQueueSize.toLong + 1) // Over limit

val protoService = ProtoReflectionService.newInstance()
val protoService = ProtoReflectionServiceV1.newInstance()

withChannel(metrics, protoService, config).use { channel =>
val methodDescriptor: MethodDescriptor[ServerReflectionRequest, ServerReflectionResponse] =
Expand Down
Loading
Loading