File tree Expand file tree Collapse file tree 6 files changed +8
-9
lines changed
servlet-3.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_0
servlet-3.1/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_1
smoke-tests/src/test/java/org/hypertrace/agent/smoketest Expand file tree Collapse file tree 6 files changed +8
-9
lines changed Original file line number Diff line number Diff line change 1- [ ![ CircleCI] ( https://circleci.com/gh/hypertrace/opentelemetry- javaagent.svg?style=svg&circle-token=b562d40d95cc5906f445004c4a96b666250d260b )] ( https://circleci.com/gh/hypertrace/opentelemetry- javaagent )
1+ [ ![ CircleCI] ( https://circleci.com/gh/hypertrace/javaagent.svg?style=svg&circle-token=b562d40d95cc5906f445004c4a96b666250d260b )] ( https://circleci.com/gh/hypertrace/javaagent )
22
33# Hypertrace OpenTelemetry Java agent
44
Original file line number Diff line number Diff line change @@ -36,8 +36,8 @@ artifacts are being published.
3636
3737* Add SSH key
3838 * Generate SSH key ` ssh-keygen -t rsa -b 4096 -m PEM -C <email> ` without passphrase
39- * Add private key to CircleCI project settings with ` github.com ` domain: https://app.circleci.com/settings/project/github/hypertrace/opentelemetry- javaagent/ssh
40- * Add public key to Github project deploy keys and check "allow write access" https://github.com/hypertrace/opentelemetry- javaagent/settings/keys
39+ * Add private key to CircleCI project settings with ` github.com ` domain: https://app.circleci.com/settings/project/github/hypertrace/javaagent/ssh
40+ * Add public key to Github project deploy keys and check "allow write access" https://github.com/hypertrace/javaagent/settings/keys
4141 * Add fingerprint from CircleCI project settings to ` ./circleci/config.yml `
4242* Configure CI to release on ` release- ` tag or merge to the main branch.
4343* Configure CI to have access to bintray. E.g. add ` hypertrace-publishing ` context to the publish job.
Original file line number Diff line number Diff line change @@ -87,7 +87,7 @@ public String[] helperClassNames() {
8787 "io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer" ,
8888 "io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer" ,
8989 // TODO Add these to bootstrap classloader so they don't have to referenced in every
90- // instrumentation, see https://github.com/hypertrace/opentelemetry- javaagent/issues/17
90+ // instrumentation, see https://github.com/hypertrace/javaagent/issues/17
9191 "org.hypertrace.agent.blocking.BlockingProvider" ,
9292 "org.hypertrace.agent.blocking.BlockingEvaluator" ,
9393 "org.hypertrace.agent.blocking.BlockingResult" ,
Original file line number Diff line number Diff line change @@ -84,7 +84,7 @@ public String[] helperClassNames() {
8484 "io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer" ,
8585 "io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer" ,
8686 // TODO Add these to bootstrap classloader so they don't have to referenced in every
87- // instrumentation, see https://github.com/hypertrace/opentelemetry- javaagent/issues/17
87+ // instrumentation, see https://github.com/hypertrace/javaagent/issues/17
8888 "org.hypertrace.agent.blocking.BlockingProvider" ,
8989 "org.hypertrace.agent.blocking.BlockingEvaluator" ,
9090 "org.hypertrace.agent.blocking.BlockingResult" ,
Original file line number Diff line number Diff line change 1- rootProject.name = " hypertrace-otel- agent"
1+ rootProject.name = " hypertrace-agent"
22
33pluginManagement {
44 repositories {
Original file line number Diff line number Diff line change @@ -128,9 +128,8 @@ GenericContainer createAppUnderTest(int jdk) {
128128 .withExposedPorts (8080 )
129129 .withNetwork (network )
130130 .withLogConsumer (new Slf4jLogConsumer (log ))
131- .withCopyFileToContainer (
132- MountableFile .forHostPath (agentPath ), "/opentelemetry-javaagent.jar" )
133- .withEnv ("JAVA_TOOL_OPTIONS" , "-javaagent:/opentelemetry-javaagent.jar" )
131+ .withCopyFileToContainer (MountableFile .forHostPath (agentPath ), "/javaagent.jar" )
132+ .withEnv ("JAVA_TOOL_OPTIONS" , "-javaagent:/javaagent.jar" )
134133 .withEnv ("OTEL_BSP_MAX_EXPORT_BATCH" , "1" )
135134 .withEnv ("OTEL_BSP_SCHEDULE_DELAY" , "10" )
136135 .withEnv ("OTEL_EXPORTER_ZIPKIN_ENDPOINT" , OTEL_EXPORTER_ENDPOINT )
You can’t perform that action at this time.
0 commit comments