open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change prefix in couple of other places (#127)

This commit is contained in:
Trask Stalnaker 2020-02-05 13:45:26 -08:00 committed by GitHub
parent 1440d95fb5
commit ae15d717ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@ -25,7 +25,7 @@ jobs:
- run: - run:
name: Build Project name: Build Project
command: GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms64M' -Dio.opentelemetry.auto.forkedMaxHeapSize=1G -Dio.opentelemetry.auto.forkedMinHeapSize=64M" ./gradlew clean :java-agent:shadowJar compileTestGroovy compileLatestDepTestGroovy compileTestScala compileLatestDepTestScala compileTestJava compileLatestDepTestJava --build-cache --parallel --stacktrace --no-daemon --max-workers=8 command: GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms64M' -Dota.forkedMaxHeapSize=1G -Dota.forkedMinHeapSize=64M" ./gradlew clean :java-agent:shadowJar compileTestGroovy compileLatestDepTestGroovy compileTestScala compileLatestDepTestScala compileTestJava compileLatestDepTestJava --build-cache --parallel --stacktrace --no-daemon --max-workers=8
- run: - run:
name: Collect Libs name: Collect Libs
@ -67,7 +67,7 @@ jobs:
- run: - run:
name: Run Tests name: Run Tests
command: GRADLE_OPTS="-Dio.opentelemetry.auto.forkedMaxHeapSize=4G -Dio.opentelemetry.auto.forkedMinHeapSize=64M" ./gradlew $TEST_TASK --build-cache --parallel --stacktrace --no-daemon --max-workers=6 command: GRADLE_OPTS="-Dota.forkedMaxHeapSize=4G -Dota.forkedMinHeapSize=64M" ./gradlew $TEST_TASK --build-cache --parallel --stacktrace --no-daemon --max-workers=6
- run: - run:
name: Collect Reports name: Collect Reports
@ -156,7 +156,7 @@ jobs:
- run: - run:
name: Build Project name: Build Project
command: GRADLE_OPTS="-Dio.opentelemetry.auto.forkedMaxHeapSize=4G -Dio.opentelemetry.auto.forkedMinHeapSize=64M" ./gradlew check -PskipTests --build-cache --parallel --stacktrace --no-daemon --max-workers=8 command: GRADLE_OPTS="-Dota.forkedMaxHeapSize=4G -Dota.forkedMinHeapSize=64M" ./gradlew check -PskipTests --build-cache --parallel --stacktrace --no-daemon --max-workers=8
- run: - run:
name: Collect Reports name: Collect Reports
@ -178,7 +178,7 @@ jobs:
- run: - run:
name: Verify Muzzle name: Verify Muzzle
command: SKIP_BUILDSCAN="true" GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx4G -Xms64M' -Dio.opentelemetry.auto.forkedMaxHeapSize=4G -Dio.opentelemetry.auto.forkedMinHeapSize=64M" ./gradlew muzzle --parallel --stacktrace --no-daemon --max-workers=16 command: SKIP_BUILDSCAN="true" GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx4G -Xms64M' -Dota.forkedMaxHeapSize=4G -Dota.forkedMinHeapSize=64M" ./gradlew muzzle --parallel --stacktrace --no-daemon --max-workers=16
- save_cache: - save_cache:
key: trace-java-muzzle-{{ checksum "trace-java.gradle" }} key: trace-java-muzzle-{{ checksum "trace-java.gradle" }}

2
agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/Agent.java
View File

@ -264,7 +264,7 @@ public class Agent {
* @return true if we detect a custom log manager being used. * @return true if we detect a custom log manager being used.
*/ */
private static boolean isAppUsingCustomLogManager() { private static boolean isAppUsingCustomLogManager() {
final String tracerCustomLogManSysprop = "opentelemetry.auto.app.customlogmanager"; final String tracerCustomLogManSysprop = "ota.app.customlogmanager";
final String customLogManagerProp = System.getProperty(tracerCustomLogManSysprop); final String customLogManagerProp = System.getProperty(tracerCustomLogManSysprop);
final String customLogManagerEnv = final String customLogManagerEnv =
System.getenv(tracerCustomLogManSysprop.replace('.', '_').toUpperCase()); System.getenv(tracerCustomLogManSysprop.replace('.', '_').toUpperCase());

2
testing/testing.gradle
View File

@ -64,7 +64,7 @@ tasks.withType(Test).configureEach {
} }
tasks.register("testDisabledFieldInjection", Test) { tasks.register("testDisabledFieldInjection", Test) {
systemProperties "opentelemetry.auto.trace.runtime.context.field.injection": "false" systemProperties "ota.trace.runtime.context.field.injection": "false"
include "context/FieldBackedProviderFieldInjectionDisabledTest.class" include "context/FieldBackedProviderFieldInjectionDisabledTest.class"
} }
test.dependsOn(testDisabledFieldInjection) test.dependsOn(testDisabledFieldInjection)

4
trace-java.gradle
View File

@ -44,8 +44,8 @@ wrapper {
allprojects { allprojects {
tasks.withType(JavaForkOptions).configureEach { tasks.withType(JavaForkOptions).configureEach {
maxHeapSize = System.properties["io.opentelemetry.auto.forkedMaxHeapSize"] maxHeapSize = System.properties["ota.forkedMaxHeapSize"]
minHeapSize = System.properties["io.opentelemetry.auto.forkedMinHeapSize"] minHeapSize = System.properties["ota.forkedMinHeapSize"]
jvmArgs "-XX:ErrorFile=/tmp/hs_err_pid%p.log" jvmArgs "-XX:ErrorFile=/tmp/hs_err_pid%p.log"
} }
} }