Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Agent] Add plugin for ActiveMQ 5.x #1513

Merged
merged 34 commits into from
Aug 4, 2018
Merged

[Agent] Add plugin for ActiveMQ 5.x #1513

merged 34 commits into from
Aug 4, 2018

Conversation

withlin
Copy link
Member

@withlin withlin commented Aug 1, 2018

Please answer these questions before submitting pull request

  • Why submit this pull request?

  • Bug fix

  • New feature provided

  • Improve performance

  • Related issues


Bug fix

  • Bug description.

  • How to fix?


New feature or improvement

  • Describe the details and related test reports.

@wu-sheng
Copy link
Member

wu-sheng commented Aug 1, 2018

@withlin CI is still broken.

@ascrutae Please run this pr with test case pr: SkyAPMTest/agent-auto-integration-testcases#20

@withlin
Copy link
Member Author

withlin commented Aug 1, 2018

hi, I have solved the project file, but CI still reported the same error.


import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
import org.apache.activemq.ActiveMQSession;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You imported a class, which is not forbidden to exist in Instrument class.


import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
import org.apache.activemq.ActiveMQSession;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same import issue

@withlin withlin changed the title [Agent] Add plugin for Activemq 5.x [Agent] Add plugin for ActiveMQ 5.x Aug 2, 2018
@coveralls
Copy link

coveralls commented Aug 2, 2018

Coverage Status

Coverage increased (+0.09%) to 24.672% when pulling 32e9024 on WithLin:master into 20cee98 on apache:master.

@withlin withlin closed this Aug 2, 2018
@withlin withlin reopened this Aug 2, 2018
@wu-sheng wu-sheng added agent Language agent related. feature New feature labels Aug 3, 2018
@ascrutae
Copy link
Member

ascrutae commented Aug 3, 2018

Here is the test report and log

@peng-yongsheng
Copy link
Member

The newest test report looks very good.
Just 2 version(5.13.4, 5.10.0) tested fail. @withlin Do you want to fix them or after this PR merge?

@withlin
Copy link
Member Author

withlin commented Aug 4, 2018

@peng-yongsheng After the merger, it will take time to repair it.

Copy link
Member

@wu-sheng wu-sheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, still waiting @ascrutae review.

@wu-sheng wu-sheng added this to the 5.0.0-RC milestone Aug 4, 2018
@wu-sheng wu-sheng merged commit 1d39614 into apache:master Aug 4, 2018
String url = (String) objInst.getSkyWalkingDynamicField();
MessageDispatch messageDispatch = (MessageDispatch) allArguments[0];
AbstractSpan activeSpan = null;
if (messageDispatch.getDestination().getDestinationType() == 1 || messageDispatch.getDestination().getDestinationType() == 5) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The magic number make me confuse. Could you change those number to constant number?

@wu-sheng
Copy link
Member

wu-sheng commented Aug 4, 2018

I suggest you send a new pr to change the number to Constant with meaning name. Such as destination type.

wu-sheng pushed a commit that referenced this pull request Aug 4, 2018
* add activemq-plugin

* fix  update ActiveMQConsumerInstrumentation Enhance another class

* refacor ActiveMQConsumerInstrumentation code

* support both  topic and queue

* clear the code

* add UnitTest add fix bug

* fix obtain url  bug

* Refactor the ActiveMQProducerInstrumentation code

* fix bug

* fix ConstructorInterceptor BUG

* add Licensed

* Update application.yml

Restore configuration

* Restore configuration

* perfect test

* fix

* fix License

* fix  Project Files

* fix import class in instrumentation

* fix test case

* fix java doc

* fix  Trigger CI

* fix ActiveMQConsumerAndProducerConstructorInterceptorTest

* delete unit test

* fix

* fix

* fix  folder directory problem

* Delete ActiveMQConsumerInstrumentation.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
agent Language agent related. feature New feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants