Move PulsarWorkerOpenTelemetry to org.apache.pulsar.functions.worker

apache · Feb 8, 2024 · 17c844d · 17c844d
1 parent c5e4ae2
commit 17c844d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 23 deletions.
diff --git a/...rker/stats/PulsarWorkerOpenTelemetry.java → ...ons/worker/PulsarWorkerOpenTelemetry.java b/...rker/stats/PulsarWorkerOpenTelemetry.java → ...ons/worker/PulsarWorkerOpenTelemetry.java
@@ -16,14 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pulsar.functions.worker.stats;
+package org.apache.pulsar.functions.worker;
 
 import io.opentelemetry.api.metrics.Meter;
 import java.io.Closeable;
 import lombok.Getter;
 import org.apache.pulsar.PulsarVersion;
 import org.apache.pulsar.opentelemetry.OpenTelemetryService;
-import org.apache.pulsar.functions.worker.WorkerConfig;
 
 public class PulsarWorkerOpenTelemetry implements Closeable {
 
@@ -42,6 +41,7 @@ public PulsarWorkerOpenTelemetry(WorkerConfig workerConfig) {
         meter = openTelemetryService.getOpenTelemetry().getMeter("org.apache.pulsar.function_worker");
     }
 
+    @Override
     public void close() {
         openTelemetryService.close();
     }

diff --git a/...unctions/worker/src/main/java/org/apache/pulsar/functions/worker/PulsarWorkerService.java b/...unctions/worker/src/main/java/org/apache/pulsar/functions/worker/PulsarWorkerService.java
@@ -67,7 +67,6 @@
 import org.apache.pulsar.functions.worker.service.api.Sinks;
 import org.apache.pulsar.functions.worker.service.api.Sources;
 import org.apache.pulsar.functions.worker.service.api.Workers;
-import org.apache.pulsar.functions.worker.stats.PulsarWorkerOpenTelemetry;
 import org.apache.pulsar.metadata.api.MetadataStoreException.AlreadyExistsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...functions/worker/src/main/java/org/apache/pulsar/functions/worker/stats/package-info.java b/...functions/worker/src/main/java/org/apache/pulsar/functions/worker/stats/package-info.java
diff --git a/...on/src/test/java/org/apache/pulsar/tests/integration/metrics/OpenTelemetrySanityTest.java b/...on/src/test/java/org/apache/pulsar/tests/integration/metrics/OpenTelemetrySanityTest.java
@@ -29,7 +29,7 @@
 import org.apache.pulsar.PulsarVersion;
 import org.apache.pulsar.broker.stats.PulsarBrokerOpenTelemetry;
 import org.apache.pulsar.broker.stats.prometheus.PrometheusMetricsClient;
-import org.apache.pulsar.functions.worker.stats.PulsarWorkerOpenTelemetry;
+import org.apache.pulsar.functions.worker.PulsarWorkerOpenTelemetry;
 import org.apache.pulsar.proxy.stats.PulsarProxyOpenTelemetry;
 import org.apache.pulsar.tests.integration.containers.ChaosContainer;
 import org.apache.pulsar.tests.integration.containers.OpenTelemetryCollectorContainer;