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

Adds ActiveMQ 5.x transport #2639

Merged
merged 4 commits into from
Jun 24, 2019
Merged

Adds ActiveMQ 5.x transport #2639

merged 4 commits into from
Jun 24, 2019

Conversation

codefromthecrypt
Copy link
Member

@codefromthecrypt codefromthecrypt commented Jun 23, 2019

Due to popular demand, this adds support for ActiveMQ 5.x.
This is enabled when the env variable ACTIVEMQ_URL is set to a valid
broker. Thanks very much to @IAMTJW for early work towards this change.

Trying this change

This change has been merged, but as of 24 June, not yet released. In order to try this change, you can use jitpack https://jitpack.io/#openzipkin/zipkin or a one-off docker image built from this commit

Ex. simple usage against a local broker

TAG=master-SNAPSHOT
curl -sSL https://jitpack.io/com/github/openzipkin/zipkin/zipkin-server/${TAG}/zipkin-server-${TAG}-exec.jar > zipkin.jar
ACTIVEMQ_URL=tcp://localhost:61616 java -jar zipkin.jar

Ex. usage with docker against a remote AWS MQ failover group (using a temporary image)

docker run -d -p 9411:9411 -e ACTIVEMQ_URL='failover:(ssl://b-da18ebe4-54ff-4dfc-835f-3862a6c144b1-1.mq.ap-southeast-1.amazonaws.com:61617,ssl://b-da18ebe4-54ff-4dfc-835f-3862a6c144b1-2.mq.ap-southeast-1.amazonaws.com:61617)' -e ACTIVEMQ_USERNAME=zipkin -e ACTIVEMQ_PASSWORD=zipkin12345678 -e ACTIVEMQ_CONCURRENCY=8 adriancole/zipkin

Supercedes #2466
Fixes #1990

Due to popular demand, this adds support for ActiveMQ 5.x.
This is enabled when the env variable `ACTIVEMQ_URL` is set to a valid
broker. Thanks very much to @IAMTJW for early work towards this change.

To try this change, you can use jitpack https://jitpack.io/#openzipkin/zipkin

Ex.
```bash
TAG=activemq-SNAPSHOT
curl -sSL https://jitpack.io/com/github/openzipkin/zipkin/zipkin-server/${TAG}/zipkin-server-${TAG}-exec.jar > zipkin.jar
ACTIVEMQ_URL=tcp://localhost:61616 java -jar zipkin.jar
```

Supercedes #2466
Fixes #1990
@codefromthecrypt
Copy link
Member Author

cc @moekelley76 @Shatakshi26 @vlatk0o @thanhct

@codefromthecrypt
Copy link
Member Author

TODO: I want to try Amazon MQ to see if anything special is required to support this

Copy link
Contributor

@tian-junwei tian-junwei left a comment

Choose a reason for hiding this comment

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

ZipkinActiveMQPropertiesOverrideTest has wrong words(zapkin ->zipkin)

@codefromthecrypt
Copy link
Member Author

ZipkinActiveMQPropertiesOverrideTest has wrong words(zapkin ->zipkin)

this is intentional :) to make sure the default can be changed

@codefromthecrypt
Copy link
Member Author

I was able to connect to AWS MQ like this. I think similar to sqs and elasticsearch, we could add a helper in zipkin-aws to generate the config lines. cc @llinder @devinsba

ACTIVEMQ_URL='failover:(ssl://b-da18ebe4-54ff-4dfc-835f-3862a6c144b1-1.mq.ap-southeast-1.amazonaws.com:61617,ssl://b-da18ebe4-54ff-4dfc-835f-3862a6c144b1-2.mq.ap-southeast-1.amazonaws.com:61617)' ACTIVEMQ_USERNAME=zipkin ACTIVEMQ_PASSWORD=zipkin12345678 ACTIVEMQ_CONCURRENCY=8 java -jar ./zipkin-server/target/zipkin-server-*exec.jar --logging.level.zipkin2=DEBUG

@codefromthecrypt
Copy link
Member Author

I'm very confident in this change. I will merge so easier to try from snapshot and will also post a one-off docker image also. Any feedback post-merge is welcome also.

@codefromthecrypt codefromthecrypt merged commit 3e9e876 into master Jun 24, 2019
@codefromthecrypt codefromthecrypt deleted the activemq branch June 24, 2019 01:11
@codefromthecrypt
Copy link
Member Author

updated instructions on how to test

abesto pushed a commit to abesto/zipkin that referenced this pull request Sep 10, 2019
Due to popular demand, this adds support for ActiveMQ 5.x.
This is enabled when the env variable `ACTIVEMQ_URL` is set to a valid
broker. Thanks very much to @IAMTJW for early work towards this change.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Zipkin support for ActiveMQ as a collector
2 participants