From ae15d717ad86bf1b675dbeb3de8098422f655feb Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 5 Feb 2020 13:45:26 -0800 Subject: [PATCH] Change prefix in couple of other places (#127) --- .circleci/config.yml | 8 ++++---- .../main/java/io/opentelemetry/auto/bootstrap/Agent.java | 2 +- testing/testing.gradle | 2 +- trace-java.gradle | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dfd3fcb334..a49e8b9555 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ jobs: - run: 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: name: Collect Libs @@ -67,7 +67,7 @@ jobs: - run: 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: name: Collect Reports @@ -156,7 +156,7 @@ jobs: - run: 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: name: Collect Reports @@ -178,7 +178,7 @@ jobs: - run: 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: key: trace-java-muzzle-{{ checksum "trace-java.gradle" }} diff --git a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/Agent.java b/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/Agent.java index c360160cb6..a2cae85bfc 100644 --- a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/Agent.java +++ b/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/Agent.java @@ -264,7 +264,7 @@ public class Agent { * @return true if we detect a custom log manager being used. */ 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 customLogManagerEnv = System.getenv(tracerCustomLogManSysprop.replace('.', '_').toUpperCase()); diff --git a/testing/testing.gradle b/testing/testing.gradle index db114b0320..88d65da207 100644 --- a/testing/testing.gradle +++ b/testing/testing.gradle @@ -64,7 +64,7 @@ tasks.withType(Test).configureEach { } 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" } test.dependsOn(testDisabledFieldInjection) diff --git a/trace-java.gradle b/trace-java.gradle index a797aa385e..999d9b5313 100644 --- a/trace-java.gradle +++ b/trace-java.gradle @@ -44,8 +44,8 @@ wrapper { allprojects { tasks.withType(JavaForkOptions).configureEach { - maxHeapSize = System.properties["io.opentelemetry.auto.forkedMaxHeapSize"] - minHeapSize = System.properties["io.opentelemetry.auto.forkedMinHeapSize"] + maxHeapSize = System.properties["ota.forkedMaxHeapSize"] + minHeapSize = System.properties["ota.forkedMinHeapSize"] jvmArgs "-XX:ErrorFile=/tmp/hs_err_pid%p.log" } }