Update base image to add logback jar (#105)

* Use the new data specification to handle span_layer * Add logback jar * Fix erda.yml parse faild
erda-project · Dec 27, 2021 · da61e63 · da61e63
1 parent 628e0d1
commit da61e63
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.erda.cloud/erda/erda-flink-1.12.5:20211216-0f4aa85
+FROM registry.erda.cloud/erda/erda-flink-1.12.7:20211222-c6d766b
 
 RUN echo "Asia/Shanghai" | tee /etc/timezone
 

diff --git a/analyzer-alert/pom.xml b/analyzer-alert/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>analyzer</artifactId>
         <groupId>cloud.erda</groupId>
-        <version>3.0.0</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/analyzer-common/pom.xml b/analyzer-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>analyzer</artifactId>
         <groupId>cloud.erda</groupId>
-        <version>3.0.0</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/analyzer-error-insight/pom.xml b/analyzer-error-insight/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>analyzer</artifactId>
         <groupId>cloud.erda</groupId>
-        <version>3.0.0</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/analyzer-metrics/pom.xml b/analyzer-metrics/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>analyzer</artifactId>
         <groupId>cloud.erda</groupId>
-        <version>3.0.0</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/analyzer-runtime/pom.xml b/analyzer-runtime/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>analyzer</artifactId>
         <groupId>cloud.erda</groupId>
-        <version>3.0.0</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/analyzer-tracing/pom.xml b/analyzer-tracing/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>analyzer</artifactId>
         <groupId>cloud.erda</groupId>
-        <version>3.0.0</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...ing/src/main/java/cloud/erda/analyzer/tracing/functions/SpanMetricCompatibleFunction.java b/...ing/src/main/java/cloud/erda/analyzer/tracing/functions/SpanMetricCompatibleFunction.java
@@ -33,7 +33,7 @@ public class SpanMetricCompatibleFunction implements MapFunction<Span, MetricEve
     public MetricEvent map(Span span) throws Exception {
         MetricEvent metricEvent = new MetricEvent();
         metricEvent.setName(SpanConstants.SPAN_METRIC_NAME);
-        metricEvent.setTimestamp(span.getStartTimeUnixNano());
+        metricEvent.setTimestamp(span.getEndTimeUnixNano());
         Map<String, String> tags = metricEvent.getTags();
         tags.put(SpanConstants.TRACE_ID, span.getTraceID());
         tags.put(SpanConstants.SPAN_ID, span.getSpanID());

diff --git a/erda.yml b/erda.yml
@@ -22,7 +22,7 @@ envs:
   TASK_MANAGER_MEMORY_JVM_METASPACE_SIZE: "256M"
   TASK_MANAGER_JVM_EXIT_OOM: "true"
 #  FLINK_ENV_JAVA_OPTS_TM: "-XX:+UseG1GC -XX:+TraceClassLoading -XX:+TraceClassUnloading -XX:+PrintGC -XX:+PrintGCDetails"
-  FLINK_ENV_JAVA_OPTS_TM: "-XX:+UseG1GC -XX:+PrintGC -XX:+PrintGCDetails"
+  FLINK_ENV_JAVA_OPTS_TM: "-XX:+UseG1GC"
   MONITOR_ADDR: "monitor:7096"
   EVENTBOX_ADDR: "eventbox:9528"
   ANALYZER_METRICS_ADDR: "analyzer-metrics:8081"

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>cloud.erda</groupId>
     <artifactId>analyzer</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0</version>
+    <version>1.0.0</version>
     <modules>
         <module>analyzer-common</module>
         <module>analyzer-runtime</module>
@@ -33,31 +33,91 @@
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-kafka_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-cassandra_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-core</artifactId>
             <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-clients_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -83,11 +143,31 @@
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-elasticsearch6_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-metrics-dropwizard</artifactId>
             <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.elasticsearch</groupId>