Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
commons
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DevOps
commons
Commits
5660fd0b
Commit
5660fd0b
authored
Apr 22, 2022
by
王亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix influxdb line protocol escape bugs.
parent
2733ebb7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
71 additions
and
9 deletions
+71
-9
pom.xml
pom.xml
+1
-1
pom.xml
qg-application-dependencies/pom.xml
+1
-1
CharacterEnum.java
...ntgroup/boot/micrometer/register/kafka/CharacterEnum.java
+44
-0
ElementEnum.java
...uantgroup/boot/micrometer/register/kafka/ElementEnum.java
+8
-0
KafkaMeterRegistry.java
...up/boot/micrometer/register/kafka/KafkaMeterRegistry.java
+17
-7
No files found.
pom.xml
View file @
5660fd0b
...
...
@@ -16,7 +16,7 @@
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<!-- <maven.test.skip>true</maven.test.skip>-->
<maven.javadoc.skip>
true
</maven.javadoc.skip>
<revision>
2.6.3.
4
</revision>
<revision>
2.6.3.
5
</revision>
<maven-compiler-plugin.version>
3.8.1
</maven-compiler-plugin.version>
<maven-source-plugin.version>
3.2.1
</maven-source-plugin.version>
<maven-javadoc-plugin.version>
3.3.1
</maven-javadoc-plugin.version>
...
...
qg-application-dependencies/pom.xml
View file @
5660fd0b
...
...
@@ -11,7 +11,7 @@
<packaging>
pom
</packaging>
<properties>
<revision>
2.6.3.
4
</revision>
<revision>
2.6.3.
5
</revision>
<spring-boot.version>
2.6.3
</spring-boot.version>
<spring-cloud.version>
2021.0.1
</spring-cloud.version>
<spring-cloud-alibaba.version>
2021.0.1.0
</spring-cloud-alibaba.version>
...
...
qg-micrometer-register-kafka-starter/src/main/java/cn/quantgroup/boot/micrometer/register/kafka/CharacterEnum.java
0 → 100644
View file @
5660fd0b
package
cn
.
quantgroup
.
boot
.
micrometer
.
register
.
kafka
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.List
;
/**
* Influxdb line protocol special characters.
*/
public
enum
CharacterEnum
{
Comma
(
","
,
Arrays
.
asList
(
ElementEnum
.
Measurement
,
ElementEnum
.
FieldKey
,
ElementEnum
.
TagKey
,
ElementEnum
.
TagValue
),
"\\,"
),
Space
(
" "
,
Arrays
.
asList
(
ElementEnum
.
Measurement
,
ElementEnum
.
FieldKey
,
ElementEnum
.
TagKey
,
ElementEnum
.
TagValue
),
"\\ "
),
EqualsSign
(
"="
,
Arrays
.
asList
(
ElementEnum
.
FieldKey
,
ElementEnum
.
TagKey
,
ElementEnum
.
TagValue
),
"\\="
),
DoubleQuote
(
"\""
,
Collections
.
singletonList
(
ElementEnum
.
FieldValue
),
"\\\""
),
BackSlash
(
"\\"
,
Collections
.
singletonList
(
ElementEnum
.
FieldValue
),
"\\\\"
);
CharacterEnum
(
String
value
,
List
<
ElementEnum
>
element
,
String
elapsedValue
)
{
this
.
value
=
value
;
this
.
element
=
element
;
this
.
elapsedValue
=
elapsedValue
;
}
//Escape characters
private
final
String
value
;
//Element
private
final
List
<
ElementEnum
>
element
;
//Escaped characters
private
final
String
elapsedValue
;
public
String
getValue
()
{
return
value
;
}
public
List
<
ElementEnum
>
getElement
()
{
return
element
;
}
public
String
getElapsedValue
()
{
return
elapsedValue
;
}
}
qg-micrometer-register-kafka-starter/src/main/java/cn/quantgroup/boot/micrometer/register/kafka/ElementEnum.java
0 → 100644
View file @
5660fd0b
package
cn
.
quantgroup
.
boot
.
micrometer
.
register
.
kafka
;
/**
* influx db v2 element enum.
*/
public
enum
ElementEnum
{
Measurement
,
TagKey
,
TagValue
,
FieldKey
,
FieldValue
}
qg-micrometer-register-kafka-starter/src/main/java/cn/quantgroup/boot/micrometer/register/kafka/KafkaMeterRegistry.java
View file @
5660fd0b
...
...
@@ -15,10 +15,12 @@ import io.micrometer.core.instrument.util.MeterPartition;
import
io.micrometer.core.instrument.util.NamedThreadFactory
;
import
io.micrometer.core.instrument.util.StringUtils
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Properties
;
import
java.util.concurrent.ThreadFactory
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.atomic.AtomicReference
;
import
java.util.stream.Stream
;
import
org.apache.kafka.clients.producer.KafkaProducer
;
import
org.apache.kafka.clients.producer.ProducerConfig
;
...
...
@@ -31,10 +33,10 @@ public class KafkaMeterRegistry extends StepMeterRegistry {
private
static
final
ThreadFactory
DEFAULT_THREAD_FACTORY
=
new
NamedThreadFactory
(
"kafka-metrics-publisher"
);
private
final
KafkaConfig
config
;
private
KafkaProducer
<
String
,
String
>
kafkaProducer
;
private
final
KafkaProducer
<
String
,
String
>
kafkaProducer
;
private
final
String
key
;
private
ApplicationContext
applicationContext
;
private
final
ApplicationContext
applicationContext
;
public
KafkaMeterRegistry
(
KafkaConfig
config
,
Clock
clock
,
ApplicationContext
applicationContext
)
{
...
...
@@ -92,12 +94,14 @@ public class KafkaMeterRegistry extends StepMeterRegistry {
private
String
influxLineProtocol
(
Meter
.
Id
id
,
String
metricType
,
Stream
<
Field
>
fields
)
{
String
tags
=
getConventionTags
(
id
).
stream
().
filter
(
t
->
StringUtils
.
isNotBlank
(
t
.
getValue
()))
.
map
(
t
->
","
+
escapeField
(
t
.
getKey
())
+
"="
+
escapeField
(
t
.
getValue
()))
.
map
(
t
->
","
+
escapeLine
(
ElementEnum
.
TagKey
,
t
.
getKey
())
+
"="
+
escapeLine
(
ElementEnum
.
TagValue
,
t
.
getValue
()))
.
collect
(
joining
(
""
));
String
ip
=
applicationContext
.
getEnvironment
().
getProperty
(
"spring.cloud.client.ip-address"
);
tags
=
tags
+
(
",ip="
+
ip
);
return
getConventionName
(
id
)
+
tags
+
",metric_type="
+
metricType
+
" "
+
fields
.
map
(
return
getConventionName
(
id
)
+
tags
+
",metric_type="
+
escapeLine
(
ElementEnum
.
Measurement
,
metricType
)
+
" "
+
fields
.
map
(
Field:
:
toString
).
collect
(
joining
(
","
))
+
" "
+
clock
.
wallTime
();
}
...
...
@@ -117,7 +121,7 @@ public class KafkaMeterRegistry extends StepMeterRegistry {
@Override
public
String
toString
()
{
return
escape
Field
(
key
)
+
"="
+
DoubleFormat
.
decimalOrNan
(
value
);
return
escape
Line
(
ElementEnum
.
FieldKey
,
key
)
+
"="
+
DoubleFormat
.
decimalOrNan
(
value
);
}
}
...
...
@@ -184,8 +188,14 @@ public class KafkaMeterRegistry extends StepMeterRegistry {
}
private
static
String
escapeField
(
String
names
)
{
return
names
.
replace
(
" "
,
"\\ "
).
replace
(
","
,
"\\,"
);
private
static
String
escapeLine
(
ElementEnum
elementEnum
,
String
line
)
{
AtomicReference
<
String
>
result
=
new
AtomicReference
<>(
""
);
Arrays
.
stream
(
CharacterEnum
.
values
()).
filter
(
i
->
i
.
getElement
().
contains
(
elementEnum
))
.
forEach
(
i
->
{
result
.
set
(
line
.
replace
(
i
.
getValue
(),
i
.
getElapsedValue
()));
});
return
result
.
get
();
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment