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
d9668fe4
Commit
d9668fe4
authored
Jan 09, 2020
by
杨锐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
done.
parent
2a7e8d6f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
42 deletions
+33
-42
ElasticJobAspect.java
...ava/cn/quantgroup/tech/brave/aspect/ElasticJobAspect.java
+0
-42
BraveAutoConfiguration.java
...roup/tech/brave/configuration/BraveAutoConfiguration.java
+33
-0
No files found.
brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/aspect/ElasticJobAspect.java
deleted
100644 → 0
View file @
2a7e8d6f
package
cn
.
quantgroup
.
tech
.
brave
.
aspect
;
import
brave.Tracer
;
import
brave.Tracing
;
import
com.dangdang.ddframe.job.api.ElasticJob
;
import
org.aspectj.lang.ProceedingJoinPoint
;
import
org.aspectj.lang.annotation.Around
;
import
org.aspectj.lang.annotation.Aspect
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
;
import
org.springframework.context.annotation.Configuration
;
import
javax.annotation.Resource
;
@Aspect
@Configuration
@ConditionalOnClass
(
ElasticJob
.
class
)
@ConditionalOnProperty
(
prefix
=
"tech.brave"
,
name
=
"enabled"
,
havingValue
=
"true"
,
matchIfMissing
=
true
)
public
class
ElasticJobAspect
{
@Resource
private
Tracing
tracing
;
@Around
(
"target(com.dangdang.ddframe.job.api.ElasticJob)"
)
public
Object
dynamicTrace
(
ProceedingJoinPoint
pjp
)
throws
Throwable
{
Tracer
tracer
=
tracing
.
tracer
();
/* 防止应用层非法使用(上下文中存在span),不生成root span。 */
if
(
tracer
.
currentSpan
()
==
null
)
{
brave
.
Span
span
=
tracer
.
newTrace
();
try
(
Tracer
.
SpanInScope
ws
=
tracer
.
withSpanInScope
(
span
))
{
return
pjp
.
proceed
();
// note: try-with-resources closes the scope *before* the catch block
}
catch
(
RuntimeException
|
Error
e
)
{
span
.
error
(
e
);
throw
e
;
}
finally
{
span
.
finish
();
}
}
return
pjp
.
proceed
();
}
}
brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/configuration/BraveAutoConfiguration.java
View file @
d9668fe4
package
cn
.
quantgroup
.
tech
.
brave
.
configuration
;
package
cn
.
quantgroup
.
tech
.
brave
.
configuration
;
import
brave.Tracer
;
import
brave.Tracing
;
import
brave.Tracing
;
import
brave.http.HttpTracing
;
import
brave.http.HttpTracing
;
import
brave.httpclient.TracingHttpClientBuilder
;
import
brave.httpclient.TracingHttpClientBuilder
;
...
@@ -14,11 +15,15 @@ import cn.quantgroup.tech.brave.properties.ServiceProperties;
...
@@ -14,11 +15,15 @@ import cn.quantgroup.tech.brave.properties.ServiceProperties;
import
cn.quantgroup.tech.brave.service.*
;
import
cn.quantgroup.tech.brave.service.*
;
import
cn.quantgroup.tech.brave.service.impl.*
;
import
cn.quantgroup.tech.brave.service.impl.*
;
import
cn.quantgroup.tech.brave.slf4j.MDCCurrentTraceContext
;
import
cn.quantgroup.tech.brave.slf4j.MDCCurrentTraceContext
;
import
com.dangdang.ddframe.job.api.ElasticJob
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
okhttp3.Dispatcher
;
import
okhttp3.Dispatcher
;
import
okhttp3.OkHttpClient
;
import
okhttp3.OkHttpClient
;
import
org.apache.http.client.HttpClient
;
import
org.apache.http.client.HttpClient
;
import
org.apache.http.impl.client.HttpClientBuilder
;
import
org.apache.http.impl.client.HttpClientBuilder
;
import
org.aspectj.lang.ProceedingJoinPoint
;
import
org.aspectj.lang.annotation.Around
;
import
org.aspectj.lang.annotation.Aspect
;
import
org.springframework.amqp.rabbit.core.RabbitTemplate
;
import
org.springframework.amqp.rabbit.core.RabbitTemplate
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
...
@@ -414,6 +419,34 @@ public class BraveAutoConfiguration {
...
@@ -414,6 +419,34 @@ public class BraveAutoConfiguration {
return
new
TechExecutorServiceBuilderTrace
();
return
new
TechExecutorServiceBuilderTrace
();
}
}
}
}
@Aspect
@Configuration
@ConditionalOnClass
(
ElasticJob
.
class
)
@ConditionalOnProperty
(
prefix
=
"tech.brave"
,
name
=
"enabled"
,
havingValue
=
"true"
,
matchIfMissing
=
true
)
public
class
ElasticJobAspect
{
@Around
(
"target(com.dangdang.ddframe.job.api.ElasticJob)"
)
public
Object
dynamicTrace
(
ProceedingJoinPoint
pjp
)
throws
Throwable
{
try
{
Tracer
tracer
=
tracing
().
tracer
();
/* 防止应用层非法使用(上下文中存在span),不生成root span。 */
if
(
tracer
.
currentSpan
()
==
null
)
{
brave
.
Span
span
=
tracer
.
newTrace
();
try
(
Tracer
.
SpanInScope
ws
=
tracer
.
withSpanInScope
(
span
))
{
// note: try-with-resources closes the scope *before* the catch block
}
catch
(
RuntimeException
|
Error
e
)
{
span
.
error
(
e
);
throw
e
;
}
finally
{
span
.
finish
();
}
}
}
finally
{
return
pjp
.
proceed
();
}
}
}
}
}
}
}
...
...
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