Skip to content

Commit

Permalink
Remove OTel executor service workaround.
Browse files Browse the repository at this point in the history
Signed-off-by: Ales Justin <[email protected]>
  • Loading branch information
alesj committed Jul 13, 2022
1 parent 6020d8b commit f4a4824
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 114 deletions.
11 changes: 5 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,11 @@
<artifactId>opentelemetry-exporter-jaeger</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-opentelemetry</artifactId>
<version>${vertx.version}</version>
</dependency>
<!-- Use gRPC as the transport -->
<dependency>
<groupId>io.grpc</groupId>
Expand Down Expand Up @@ -409,12 +414,6 @@
<version>${vertx.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-opentelemetry</artifactId>
<version>${vertx.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/io/strimzi/kafka/bridge/Application.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import io.micrometer.core.instrument.MeterRegistry;
import io.strimzi.kafka.bridge.amqp.AmqpBridge;
import io.strimzi.kafka.bridge.config.BridgeConfig;
import io.strimzi.kafka.bridge.config.BridgeExecutorServiceFactory;
import io.strimzi.kafka.bridge.http.HttpBridge;
import io.strimzi.kafka.bridge.tracing.TracingUtil;
import io.vertx.config.ConfigRetriever;
Expand All @@ -19,7 +18,6 @@
import io.vertx.core.Promise;
import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
import io.vertx.core.impl.VertxBuilder;
import io.vertx.core.json.JsonObject;
import io.vertx.micrometer.Label;
import io.vertx.micrometer.MetricsDomain;
Expand Down Expand Up @@ -74,9 +72,7 @@ public static void main(String[] args) {
vertxOptions.setMetricsOptions(metricsOptions());
jmxCollectorRegistry = getJmxCollectorRegistry();
}
VertxBuilder vertxBuilder = new VertxBuilder(vertxOptions)
.executorServiceFactory(new BridgeExecutorServiceFactory());
Vertx vertx = vertxBuilder.init().vertx();
Vertx vertx = Vertx.vertx(vertxOptions);
// MeterRegistry default instance is just null if metrics are not enabled in the VertxOptions instance
MeterRegistry meterRegistry = BackendRegistries.getDefaultNow();
MetricsReporter metricsReporter = new MetricsReporter(jmxCollectorRegistry, meterRegistry);
Expand Down

This file was deleted.

0 comments on commit f4a4824

Please sign in to comment.