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

Create javaagent dirs for all instrumentations #1668

Merged
merged 3 commits into from
Nov 29, 2020

Conversation

trask
Copy link
Member

@trask trask commented Nov 18, 2020

Closes #1638

#!/bin/bash -e

while read dir; do
  echo "$dir"
  name=$(basename $dir)
  module=$(echo $dir | sed 's|/|:|g')
  mkdir temp
  mv instrumentation/$dir/* temp
  mv temp instrumentation/$dir/javaagent
  mv instrumentation/$dir/javaagent/$name.gradle instrumentation/$dir/javaagent/$name-javaagent.gradle
  find -name '*.gradle' -type f | xargs sed -i "s/:instrumentation:$module/:instrumentation:$module:javaagent/"
done < list

list:

akka-actor-2.5
akka-http-10.0
apache-camel-2.20
apache-httpasyncclient-4.0
apache-httpclient/apache-httpclient-2.0
apache-httpclient/apache-httpclient-4.0
async-http-client-1.9
aws-sdk/aws-sdk-1.11
cassandra/cassandra-3.0
cassandra/cassandra-4.0
classloaders
couchbase/couchbase-2.0
couchbase/couchbase-2.6
dropwizard-views-0.7
elasticsearch/elasticsearch-rest-5.0
elasticsearch/elasticsearch-rest-6.4
elasticsearch/elasticsearch-rest-common
elasticsearch/elasticsearch-transport-5.0
elasticsearch/elasticsearch-transport-5.3
elasticsearch/elasticsearch-transport-6.0
elasticsearch/elasticsearch-transport-common
executors
external-annotations
finatra-2.9
geode-1.4
google-http-client-1.19
grizzly-2.0
guava-10.0
hibernate/hibernate-3.3
hibernate/hibernate-4.0
hibernate/hibernate-4.3
hibernate/hibernate-common
http-url-connection
hystrix-1.4
java-httpclient
jaxrs/jaxrs-1.0
jaxrs/jaxrs-2.0/jaxrs-2.0-common
jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0
jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0
jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1
jaxrs-client/jaxrs-client-1.1
jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common
jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0
jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0
jdbc
jedis/jedis-1.4
jedis/jedis-3.0
jetty-8.0
jms-1.1
jsp-2.3
kafka-clients-0.11
kafka-streams-0.11
khttp-0.1
kotlinx-coroutines
kubernetes-client-7.0
lettuce/lettuce-4.0
lettuce/lettuce-5.0
lettuce/lettuce-5.1
lettuce/lettuce-common
log4j/log4j-1.2
log4j/log4j-2.7
methods
mongo/mongo-3.1
mongo/mongo-3.7
mongo/mongo-async-3.3
mongo/mongo-common
netty/netty-3.8
netty/netty-4.0
netty/netty-4.1
okhttp/okhttp-2.2
okhttp/okhttp-3.0
opentelemetry-annotations-1.0
opentelemetry-api-1.0
play/play-2.3
play/play-2.4
play/play-2.6
play-ws/play-ws-1.0
play-ws/play-ws-2.0
play-ws/play-ws-2.1
play-ws/play-ws-common
rabbitmq-2.7
ratpack-1.4
reactor-3.1
reactor-netty-0.9
rediscala-1.8
redisson-3.0
rmi
scala-executors
servlet/servlet-2.2
servlet/servlet-3.0
servlet/servlet-common
spark-2.3
spring/spring-data-1.8
spring/spring-scheduling-3.1
spymemcached-2.12
twilio-6.6
vertx-reactive-3.5
vertx-web-3.0

@trask
Copy link
Member Author

trask commented Nov 20, 2020

fyi this PR has 3 commits. 2 small manual commits. 1 enORMOUS scripted commit (see above for the script).

settings.gradle Outdated Show resolved Hide resolved
@trask
Copy link
Member Author

trask commented Nov 22, 2020

planning to wait to merge this until #1643 is merged, as there are lots of conflicts with that PR, and this PR is easy to regenerate

@iNikem
Copy link
Contributor

iNikem commented Nov 23, 2020

@trask please rebase

@trask trask merged commit 5f26364 into open-telemetry:master Nov 29, 2020
@trask trask deleted the javaagent-dirs branch November 29, 2020 05:04
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.

Should we create javaagent subdir under each instrumentation?
3 participants