[#10776] Add /metricDef/userDefined api logic.

otlpmetric/otlpmetric-common/pom.xml

@@ -15,5 +15,12 @@
         <jdk.version>17</jdk.version>
         <jdk.home>${env.JAVA_17_HOME}</jdk.home>
     </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-commons-server</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
 </project>

otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/defined/AppMetricDefinition.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.navercorp.pinpoint.otlp.common.defined;
+
+import com.navercorp.pinpoint.common.server.util.StringPrecondition;
+
+/**
+ * @author minwoo-jung
+ */
+public class AppMetricDefinition {
+
+    public static final int SCHEMA_VERSION = 1;
+
+    private final String applicationName;
+    private final String id;
+    private final String title;
+    private final String metricGroupName;
+    private final String metricName;
+    private final String fieldName;
+    private final String tags;
+    private final String unit;
+    private final String chartType;
+
+
+    public AppMetricDefinition(String applicationName, String id, String title, String metricGroupName, String metricName, String fieldName, String tags, String unit, String chartType) {
+        this.applicationName = StringPrecondition.requireHasLength(applicationName, "applicationName");
+        this.id = StringPrecondition.requireHasLength(id, "id");
+        this.title = StringPrecondition.requireHasLength(title, "title");
+        this.metricGroupName = StringPrecondition.requireHasLength(metricGroupName, "metricGroupName");
+        this.metricName = StringPrecondition.requireHasLength(metricName, "metricName");
+        this.fieldName = "";
+        this.tags = StringPrecondition.requireHasLength(tags, "tags");
+        this.unit = StringPrecondition.requireHasLength(unit, "unit");
+        this.chartType = StringPrecondition.requireHasLength(chartType, "chartType");
+    }
+
+    public String getApplicationName() {
+        return applicationName;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getMetricGroupName() {
+        return metricGroupName;
+    }
+
+    public String getMetricName() {
+        return metricName;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public String getTags() {
+        return tags;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public String getChartType() {
+        return chartType;
+    }
+
+    public int getSchemaVersion() {
+        return SCHEMA_VERSION;
+    }
+
+}

otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/definition/Metric.java → otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/definition/property/Metric.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.otlp.common.definition;
+package com.navercorp.pinpoint.otlp.common.definition.property;
 
 import java.util.HashMap;
 import java.util.List;

otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/definition/MetricDefinitionProperty.java → otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/definition/property/MetricDefinitionProperty.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.otlp.common.definition;
+package com.navercorp.pinpoint.otlp.common.definition.property;
 
 import java.util.List;
 

otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/definition/MetricDescriptor.java → otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/definition/property/MetricDescriptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.otlp.common.definition;
+package com.navercorp.pinpoint.otlp.common.definition.property;
 
 /**
  * @author minwoo-jung

otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/definition/MetricGroup.java → otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/definition/property/MetricGroup.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.otlp.common.definition;
+package com.navercorp.pinpoint.otlp.common.definition.property;
 
 import java.util.HashMap;
 import java.util.List;

otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/definition/Tag.java → otlpmetric/otlpmetric-common/src/main/java/com/navercorp/pinpoint/otlp/common/definition/property/Tag.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.otlp.common.definition;
+package com.navercorp.pinpoint.otlp.common.definition.property;
 
 /**
  * @author minwoo-jung

otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/OtlpMetricWebConfig.java

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import com.navercorp.pinpoint.datasource.MainDataSourcePropertySource;
-import com.navercorp.pinpoint.otlp.web.config.OtlpMetricWebPinotDaoConfiguration;
+import com.navercorp.pinpoint.otlp.web.config.mysql.OtlpMetricWebMysqlDaoConfiguration;
+import com.navercorp.pinpoint.otlp.web.config.pinot.OtlpMetricWebPinotDaoConfiguration;
 import com.navercorp.pinpoint.pinot.config.PinotConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.ComponentScan;
@@ -30,7 +30,8 @@
 })
 @Import({
         PinotConfiguration.class,
-        OtlpMetricWebPinotDaoConfiguration.class
+        OtlpMetricWebPinotDaoConfiguration.class,
+        OtlpMetricWebMysqlDaoConfiguration.class
 })
 @ConditionalOnProperty(name = "pinpoint.modules.web.otlpmetric.enabled", havingValue = "true")
 public class OtlpMetricWebConfig {

otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/config/mysql/OtlpMetricMysqlRegistryHandler.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.navercorp.pinpoint.otlp.web.config.mysql;
+
+import com.navercorp.pinpoint.mybatis.MyBatisRegistryHandler;
+import com.navercorp.pinpoint.otlp.common.defined.AppMetricDefinition;
+import com.navercorp.pinpoint.otlp.web.dao.model.AppMetricDefDto;
+import org.apache.ibatis.type.TypeAliasRegistry;
+import org.apache.ibatis.type.TypeHandlerRegistry;
+
+/**
+ * @author minwoo-jung
+ */
+public class OtlpMetricMysqlRegistryHandler implements MyBatisRegistryHandler {
+    @Override
+    public void registerTypeAlias(TypeAliasRegistry typeAliasRegistry) {
+        typeAliasRegistry.registerAlias(AppMetricDefinition.class);
+        typeAliasRegistry.registerAlias(AppMetricDefDto.class);
+    }
+
+    @Override
+    public void registerTypeHandler(TypeHandlerRegistry typeHandlerRegistry) {
+
+    }
+}

otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/config/mysql/OtlpMetricWebMysqlDaoConfiguration.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.navercorp.pinpoint.otlp.web.config.mysql;
+
+import com.navercorp.pinpoint.mybatis.MyBatisConfigurationCustomizer;
+import com.navercorp.pinpoint.mybatis.MyBatisRegistryHandler;
+import com.navercorp.pinpoint.mybatis.plugin.BindingLogPlugin;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.io.Resource;
+
+import javax.sql.DataSource;
+
+/**
+ * @author minwoo-jung
+ */
+@org.springframework.context.annotation.Configuration
+public class OtlpMetricWebMysqlDaoConfiguration {
+
+    private final Logger logger = LogManager.getLogger(OtlpMetricWebMysqlDaoConfiguration.class);
+
+    @Bean
+    public FactoryBean<SqlSessionFactory> otlpMysqlSqlSessionFactory(
+            @Qualifier("myBatisConfigurationCustomizer") MyBatisConfigurationCustomizer customizer,
+            @Qualifier("dataSource") DataSource dataSource,
+            @Value("classpath*:otlp/web/mapper/mysql/*Mapper.xml") Resource[] mappers,
+            BindingLogPlugin bindingLogPlugin) {
+
+        for (Resource mapper : mappers) {
+            logger.info("Mapper location: {}", mapper.getDescription());
+        }
+
+        SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean();
+        sessionFactoryBean.setDataSource(dataSource);
+        sessionFactoryBean.setMapperLocations(mappers);
+
+        Configuration config = new Configuration();
+
+        sessionFactoryBean.setConfiguration(config);
+        sessionFactoryBean.setFailFast(true);
+        sessionFactoryBean.setPlugins(bindingLogPlugin);
+
+        MyBatisRegistryHandler myBatisRegistryHandler = new OtlpMetricMysqlRegistryHandler();
+        myBatisRegistryHandler.registerTypeAlias(config.getTypeAliasRegistry());
+        myBatisRegistryHandler.registerTypeHandler(config.getTypeHandlerRegistry());
+
+        return sessionFactoryBean;
+    }
+
+    @Bean
+    public SqlSessionTemplate otlpMysqlSqlSessionTemplate(
+            @Qualifier("otlpMysqlSqlSessionFactory") SqlSessionFactory sessionFactory) {
+        return new SqlSessionTemplate(sessionFactory);
+    }
+
+
+}

otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/config/OtlpMetricWebRegistryHandler.java → otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/config/pinot/OtlpMetricPinotRegistryHandler.java

@@ -1,15 +1,31 @@
-package com.navercorp.pinpoint.otlp.web.config;
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.navercorp.pinpoint.otlp.web.config.pinot;
 
 import com.navercorp.pinpoint.mybatis.MyBatisRegistryHandler;
-import com.navercorp.pinpoint.otlp.common.definition.MetricDescriptor;
+import com.navercorp.pinpoint.otlp.common.definition.property.MetricDescriptor;
 import com.navercorp.pinpoint.otlp.common.model.AggreFunc;
 import com.navercorp.pinpoint.otlp.common.model.DataType;
 import com.navercorp.pinpoint.otlp.web.vo.handler.FieldAttributeHandler;
 import com.navercorp.pinpoint.otlp.web.vo.*;
 import org.apache.ibatis.type.TypeAliasRegistry;
 import org.apache.ibatis.type.TypeHandlerRegistry;
 
-public class OtlpMetricWebRegistryHandler implements MyBatisRegistryHandler {
+public class OtlpMetricPinotRegistryHandler implements MyBatisRegistryHandler {
     @Override
     public void registerTypeAlias(TypeAliasRegistry typeAliasRegistry) {
         typeAliasRegistry.registerAlias(OtlpMetricGroupsQueryParam.class);

otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/config/OtlpMetricWebPinotDaoConfiguration.java → otlpmetric/otlpmetric-web/src/main/java/com/navercorp/pinpoint/otlp/web/config/pinot/OtlpMetricWebPinotDaoConfiguration.java

@@ -1,4 +1,20 @@
-package com.navercorp.pinpoint.otlp.web.config;
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.navercorp.pinpoint.otlp.web.config.pinot;
 
 import com.navercorp.pinpoint.mybatis.MyBatisConfigurationCustomizer;
 import com.navercorp.pinpoint.mybatis.MyBatisRegistryHandler;
@@ -47,7 +63,7 @@
     }
 
     private void registryHandler(org.apache.ibatis.session.Configuration config) {
-        MyBatisRegistryHandler registryHandler = new OtlpMetricWebRegistryHandler();
+        MyBatisRegistryHandler registryHandler = new OtlpMetricPinotRegistryHandler();
         registryHandler.registerTypeAlias(config.getTypeAliasRegistry());
         registryHandler.registerTypeHandler(config.getTypeHandlerRegistry());
     }