Renamed packages from com.alibaba to org.apache

Author: michaelkoepf

fluss-dist/pom.xml

@@ -91,9 +91,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.alibaba.fluss</groupId>
+            <groupId>org.apache.fluss</groupId>
             <artifactId>fluss-metrics-opentelemetry</artifactId>
-            <version>${project.version}</version>
+            <version>0.8-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 

fluss-metrics/fluss-metrics-opentelemetry/pom.xml

@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alibaba.fluss</groupId>
+        <groupId>org.apache.fluss</groupId>
         <artifactId>fluss-metrics</artifactId>
         <version>0.8-SNAPSHOT</version>
     </parent>
@@ -37,7 +37,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.alibaba.fluss</groupId>
+            <groupId>org.apache.fluss</groupId>
             <artifactId>fluss-common</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -63,12 +63,12 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>com.alibaba.fluss</groupId>
+            <groupId>org.apache.fluss</groupId>
             <artifactId>fluss-test-utils</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.alibaba.fluss</groupId>
+            <groupId>org.apache.fluss</groupId>
             <artifactId>fluss-common</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

…etrics/opentelemetry/MetricMetadata.java …etrics/opentelemetry/MetricMetadata.javafluss-metrics/fluss-metrics-opentelemetry/src/main/java/com/alibaba/fluss/metrics/opentelemetry/MetricMetadata.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/main/java/org/apache/fluss/metrics/opentelemetry/MetricMetadata.java fluss-metrics/fluss-metrics-opentelemetry/src/main/java/com/alibaba/fluss/metrics/opentelemetry/MetricMetadata.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/main/java/org/apache/fluss/metrics/opentelemetry/MetricMetadata.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.metrics.opentelemetry;
+package org.apache.fluss.metrics.opentelemetry;
 
-import com.alibaba.fluss.annotation.VisibleForTesting;
+import org.apache.fluss.annotation.VisibleForTesting;
 
 import java.util.Map;
 

…/opentelemetry/OpenTelemetryAdapter.java …/opentelemetry/OpenTelemetryAdapter.javafluss-metrics/fluss-metrics-opentelemetry/src/main/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryAdapter.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/main/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryAdapter.java fluss-metrics/fluss-metrics-opentelemetry/src/main/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryAdapter.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/main/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryAdapter.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.metrics.opentelemetry;
+package org.apache.fluss.metrics.opentelemetry;
 
-import com.alibaba.fluss.metrics.Gauge;
-import com.alibaba.fluss.metrics.Histogram;
-import com.alibaba.fluss.metrics.Meter;
+import org.apache.fluss.metrics.Gauge;
+import org.apache.fluss.metrics.Histogram;
+import org.apache.fluss.metrics.Meter;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
@@ -58,7 +58,7 @@ class OpenTelemetryAdapter {
     static final double[] HISTOGRAM_QUANTILES = {0.5, 0.75, 0.95, 0.99};
 
     static final InstrumentationScopeInfo INSTRUMENTATION_SCOPE_INFO =
-            InstrumentationScopeInfo.create("com.alibaba.fluss.metrics");
+            InstrumentationScopeInfo.create("org.apache.fluss.metrics");
 
     public static Optional<MetricData> convertCounter(
             CollectionMetadata collectionMetadata,

…opentelemetry/OpenTelemetryReporter.java …opentelemetry/OpenTelemetryReporter.javafluss-metrics/fluss-metrics-opentelemetry/src/main/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryReporter.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/main/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryReporter.java fluss-metrics/fluss-metrics-opentelemetry/src/main/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryReporter.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/main/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryReporter.java

@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.metrics.opentelemetry;
-
-import com.alibaba.fluss.annotation.VisibleForTesting;
-import com.alibaba.fluss.config.ConfigOptions;
-import com.alibaba.fluss.config.Configuration;
-import com.alibaba.fluss.exception.FlussRuntimeException;
-import com.alibaba.fluss.metrics.CharacterFilter;
-import com.alibaba.fluss.metrics.Counter;
-import com.alibaba.fluss.metrics.Gauge;
-import com.alibaba.fluss.metrics.Histogram;
-import com.alibaba.fluss.metrics.Meter;
-import com.alibaba.fluss.metrics.Metric;
-import com.alibaba.fluss.metrics.groups.MetricGroup;
-import com.alibaba.fluss.metrics.reporter.MetricReporter;
-import com.alibaba.fluss.metrics.reporter.ScheduledMetricReporter;
+package org.apache.fluss.metrics.opentelemetry;
+
+import org.apache.fluss.annotation.VisibleForTesting;
+import org.apache.fluss.config.ConfigOptions;
+import org.apache.fluss.config.Configuration;
+import org.apache.fluss.exception.FlussRuntimeException;
+import org.apache.fluss.metrics.CharacterFilter;
+import org.apache.fluss.metrics.Counter;
+import org.apache.fluss.metrics.Gauge;
+import org.apache.fluss.metrics.Histogram;
+import org.apache.fluss.metrics.Meter;
+import org.apache.fluss.metrics.Metric;
+import org.apache.fluss.metrics.groups.MetricGroup;
+import org.apache.fluss.metrics.reporter.MetricReporter;
+import org.apache.fluss.metrics.reporter.ScheduledMetricReporter;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter;

…lemetry/OpenTelemetryReporterPlugin.java …lemetry/OpenTelemetryReporterPlugin.javafluss-metrics/fluss-metrics-opentelemetry/src/main/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryReporterPlugin.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/main/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryReporterPlugin.java fluss-metrics/fluss-metrics-opentelemetry/src/main/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryReporterPlugin.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/main/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryReporterPlugin.java

@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.metrics.opentelemetry;
+package org.apache.fluss.metrics.opentelemetry;
 
 /* This file is based on source code of Apache Flink Project (https://flink.apache.org/), licensed by the Apache
  * Software Foundation (ASF) under the Apache License, Version 2.0. See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership. */
 
-import com.alibaba.fluss.config.ConfigOptions;
-import com.alibaba.fluss.config.Configuration;
-import com.alibaba.fluss.exception.IllegalConfigurationException;
-import com.alibaba.fluss.metrics.reporter.MetricReporter;
-import com.alibaba.fluss.metrics.reporter.MetricReporterPlugin;
+import org.apache.fluss.config.ConfigOptions;
+import org.apache.fluss.config.Configuration;
+import org.apache.fluss.exception.IllegalConfigurationException;
+import org.apache.fluss.metrics.reporter.MetricReporter;
+import org.apache.fluss.metrics.reporter.MetricReporterPlugin;
 
 import java.time.Duration;
 

…cs/opentelemetry/MetricMetadataTest.java …cs/opentelemetry/MetricMetadataTest.javafluss-metrics/fluss-metrics-opentelemetry/src/test/java/com/alibaba/fluss/metrics/opentelemetry/MetricMetadataTest.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/test/java/org/apache/fluss/metrics/opentelemetry/MetricMetadataTest.java fluss-metrics/fluss-metrics-opentelemetry/src/test/java/com/alibaba/fluss/metrics/opentelemetry/MetricMetadataTest.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/test/java/org/apache/fluss/metrics/opentelemetry/MetricMetadataTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.metrics.opentelemetry;
+package org.apache.fluss.metrics.opentelemetry;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;

…ntelemetry/OpenTelemetryAdapterTest.java …ntelemetry/OpenTelemetryAdapterTest.javafluss-metrics/fluss-metrics-opentelemetry/src/test/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryAdapterTest.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/test/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryAdapterTest.java fluss-metrics/fluss-metrics-opentelemetry/src/test/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryAdapterTest.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/test/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryAdapterTest.java

@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.metrics.opentelemetry;
+package org.apache.fluss.metrics.opentelemetry;
 
 /* This file is based on source code of Apache Flink Project (https://flink.apache.org/), licensed by the Apache
  * Software Foundation (ASF) under the Apache License, Version 2.0. See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership. */
 
-import com.alibaba.fluss.metrics.Counter;
-import com.alibaba.fluss.metrics.MeterView;
-import com.alibaba.fluss.metrics.SimpleCounter;
-import com.alibaba.fluss.metrics.util.TestHistogram;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.ImmutableMap;
+import org.apache.fluss.metrics.Counter;
+import org.apache.fluss.metrics.MeterView;
+import org.apache.fluss.metrics.SimpleCounter;
+import org.apache.fluss.metrics.util.TestHistogram;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.ImmutableMap;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;

…lemetry/OpenTelemetryReporterITCase.java …lemetry/OpenTelemetryReporterITCase.javafluss-metrics/fluss-metrics-opentelemetry/src/test/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryReporterITCase.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/test/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryReporterITCase.java fluss-metrics/fluss-metrics-opentelemetry/src/test/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryReporterITCase.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/test/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryReporterITCase.java

@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.metrics.opentelemetry;
-
-import com.alibaba.fluss.config.ConfigOptions;
-import com.alibaba.fluss.metrics.Gauge;
-import com.alibaba.fluss.metrics.Histogram;
-import com.alibaba.fluss.metrics.MeterView;
-import com.alibaba.fluss.metrics.SimpleCounter;
-import com.alibaba.fluss.metrics.groups.MetricGroup;
-import com.alibaba.fluss.metrics.util.TestHistogram;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import com.alibaba.fluss.testutils.common.TestLoggerExtension;
+package org.apache.fluss.metrics.opentelemetry;
+
+import org.apache.fluss.config.ConfigOptions;
+import org.apache.fluss.metrics.Gauge;
+import org.apache.fluss.metrics.Histogram;
+import org.apache.fluss.metrics.MeterView;
+import org.apache.fluss.metrics.SimpleCounter;
+import org.apache.fluss.metrics.groups.MetricGroup;
+import org.apache.fluss.metrics.util.TestHistogram;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.fluss.testutils.common.TestLoggerExtension;
 
 import org.assertj.core.data.Percentage;
 import org.junit.jupiter.api.BeforeEach;
@@ -84,7 +84,7 @@ public void testReport(ConfigOptions.OpenTelemetryExporter exporterType) throws
                     JsonNode scopeMetrics =
                             json.findPath("resourceMetrics").findPath("scopeMetrics");
                     assertThat(scopeMetrics.findPath("scope").findPath("name").asText())
-                            .isEqualTo("com.alibaba.fluss.metrics");
+                            .isEqualTo("org.apache.fluss.metrics");
                     JsonNode metrics = scopeMetrics.findPath("metrics");
 
                     List<String> metricNames = extractMetricNames(json);

…try/OpenTelemetryReporterITCaseBase.java …try/OpenTelemetryReporterITCaseBase.javafluss-metrics/fluss-metrics-opentelemetry/src/test/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryReporterITCaseBase.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/test/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryReporterITCaseBase.java fluss-metrics/fluss-metrics-opentelemetry/src/test/java/com/alibaba/fluss/metrics/opentelemetry/OpenTelemetryReporterITCaseBase.java renamed to fluss-metrics/fluss-metrics-opentelemetry/src/test/java/org/apache/fluss/metrics/opentelemetry/OpenTelemetryReporterITCaseBase.java

@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.metrics.opentelemetry;
+package org.apache.fluss.metrics.opentelemetry;
 
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
-import com.alibaba.fluss.testutils.common.AllCallbackWrapper;
-import com.alibaba.fluss.testutils.common.TestContainerExtension;
-import com.alibaba.fluss.testutils.common.TestLoggerExtension;
-import com.alibaba.fluss.utils.function.ThrowingConsumer;
-import com.alibaba.fluss.utils.function.ThrowingRunnable;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.fluss.testutils.common.AllCallbackWrapper;
+import org.apache.fluss.testutils.common.TestContainerExtension;
+import org.apache.fluss.testutils.common.TestLoggerExtension;
+import org.apache.fluss.utils.function.ThrowingConsumer;
+import org.apache.fluss.utils.function.ThrowingRunnable;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Order;
@@ -128,8 +128,12 @@ static void eventually(long deadline, ThrowingRunnable<Exception> runnable) thro
     }
 
     public static List<String> extractMetricNames(JsonNode json) {
-        return json.findPath("resourceMetrics").findPath("scopeMetrics").findPath("metrics")
-                .findValues("name").stream()
+        return json
+                .findPath("resourceMetrics")
+                .findPath("scopeMetrics")
+                .findPath("metrics")
+                .findValues("name")
+                .stream()
                 .map(JsonNode::asText)
                 .collect(Collectors.toList());
     }