This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch rt-oal in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 2da7c38c4f8e26882cc6b9b8d3c9098795dc3ff2 Author: Wu Sheng <[email protected]> AuthorDate: Thu Jul 18 14:06:13 2019 +0800 Fix compile startup. --- apm-dist/src/main/assembly/binary.xml | 1 + .../src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java | 2 +- .../src/main/resources/code-templates/dispatcher/dispatch.ftl | 5 +++-- .../main/resources/code-templates/metrics-builder/data2Map.ftl | 3 ++- .../main/resources/code-templates/metrics-builder/map2Data.ftl | 6 +++--- oap-server/server-starter/src/main/assembly/assembly.xml | 10 +--------- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/apm-dist/src/main/assembly/binary.xml b/apm-dist/src/main/assembly/binary.xml index 45301c9..8e0cd0f 100644 --- a/apm-dist/src/main/assembly/binary.xml +++ b/apm-dist/src/main/assembly/binary.xml @@ -42,6 +42,7 @@ <include>*.yml</include> <include>*.xml</include> <include>*.properties</include> + <include>*.oal</include> </includes> </fileSet> <fileSet> diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java index 6f7b0c3..efc1cd3 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java @@ -93,7 +93,7 @@ public class OALRuntime implements OALEngine { private static final String SOURCE_PACKAGE = "org.apache.skywalking.oap.server.core.source."; private static final String METRICS_STREAM_PROCESSOR = "org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor"; private static final String[] METRICS_CLASS_METHODS = - {"id", "hashCode", "remoteHashCode", "equals", "serialize", "deserialize", "getMeta", "toDay"}; + {"id", "hashCode", "remoteHashCode", "equals", "serialize", "deserialize", "getMeta", "toHour", "toDay", "toMonth"}; private static final String[] METRICS_BUILDER_CLASS_METHODS = {"data2Map", "map2Data"}; private final ClassPool classPool; diff --git a/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/dispatch.ftl b/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/dispatch.ftl index c04c26e..89a3650 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/dispatch.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/dispatch.ftl @@ -1,5 +1,6 @@ -public void dispatch(org.apache.skywalking.oap.server.core.source.${source} source) { +public void dispatch(org.apache.skywalking.oap.server.core.source.Source source) { + org.apache.skywalking.oap.server.core.source.${source} _source = (org.apache.skywalking.oap.server.core.source.${source})source; <#list metrics as metrics> - do${metrics.metricsName}(source); + do${metrics.metricsName}(_source); </#list> } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/data2Map.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/data2Map.ftl index 1ee5df5..8dc79ad 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/data2Map.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/data2Map.ftl @@ -1,4 +1,5 @@ -public java.util.Map data2Map(org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics storageData) { +public java.util.Map data2Map(org.apache.skywalking.oap.server.core.storage.StorageData input) { + org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics storageData = (org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics)input; java.util.Map map = new java.util.HashMap(); <#list fieldsFromSource as field> <#if field.typeName == "long"> diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/map2Data.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/map2Data.ftl index 27f543a..1dfbf45 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/map2Data.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/map2Data.ftl @@ -1,5 +1,5 @@ -public org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics map2Data(java.util.Map dbMap) { -org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); +public org.apache.skywalking.oap.server.core.storage.StorageData map2Data(java.util.Map dbMap) { + org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); <#list fieldsFromSource as field> <#if field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> metrics.${field.fieldSetter}(((Number)dbMap.get("${field.columnName}")).${field.typeName}Value()); @@ -18,5 +18,5 @@ org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apa metrics.${field.fieldSetter}(new ${field.typeName}((String)dbMap.get("${field.columnName}"))); </#if> </#list> -return metrics; + return metrics; } \ No newline at end of file diff --git a/oap-server/server-starter/src/main/assembly/assembly.xml b/oap-server/server-starter/src/main/assembly/assembly.xml index 0758aa4..e2c30a7 100644 --- a/oap-server/server-starter/src/main/assembly/assembly.xml +++ b/oap-server/server-starter/src/main/assembly/assembly.xml @@ -40,8 +40,6 @@ <include>alarm-settings.yml</include> <include>alarm-settings-sample.yml</include> <include>datasource-settings.properties</include> - <include>official_analysis.oal</include> - <include>scope-meta.yml</include> </includes> </fileSet> <fileSet> @@ -49,15 +47,9 @@ <includes> <include>component-libraries.yml</include> <include>official_analysis.oal</include> + <include>scope-meta.yml</include> </includes> <outputDirectory>/config</outputDirectory> </fileSet> - <fileSet> - <directory>${project.basedir}/../apm-collector-instrument/target</directory> - <includes> - <include>collector-instrument-agent.jar</include> - </includes> - <outputDirectory>/agent</outputDirectory> - </fileSet> </fileSets> </assembly>
