Skip to content

Commit dac8a09

Browse files
Use GitHub action to inject Test Optimization (#2674)
* Bump Test Optimization version * Remove GHA run conditions for debugging purposes * Revert "Remove GHA run conditions for debugging purposes" This reverts commit fb04f7c. --------- Co-authored-by: skarimo <40482491+skarimo@users.noreply.github.com>
1 parent 75b3a11 commit dac8a09

File tree

5 files changed

+17
-112
lines changed

5 files changed

+17
-112
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,15 @@ jobs:
128128
java-version: ${{ matrix.java-version }}
129129
distribution: "temurin"
130130
cache: "maven"
131+
- name: Configure Datadog Test Optimization
132+
uses: datadog/test-visibility-github-action@v2
133+
with:
134+
languages: java
135+
api_key: ${{ secrets.DD_API_KEY }}
131136
- name: Test
132137
run: ./run-tests.sh
138+
env:
139+
DD_CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED: "false"
133140

134141
examples:
135142
runs-on: ubuntu-latest

.github/workflows/test_integration.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,23 @@ jobs:
6565
java-version: '16'
6666
distribution: 'temurin'
6767
cache: 'maven'
68+
- name: Configure Datadog Test Optimization
69+
uses: datadog/test-visibility-github-action@v2
70+
with:
71+
languages: java
72+
api_key: ${{ secrets.DD_API_KEY }}
6873
- name: Run integration tests
6974
run: ./run-tests.sh
7075
env:
7176
CI: "true"
72-
DD_AGENT_HOST: localhost
7377
DD_ENV: prod
7478
DD_HTTP_CLIENT_ERROR_STATUSES: "500-599"
75-
DD_INTEGRATION_JUNIT_ENABLED: "true"
76-
DD_LOGS_INJECTION: "true"
79+
DD_CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED: "false"
7780
DD_SERVICE: datadog-api-client-java
7881
DD_TAGS: "team:integrations-tools-and-libraries"
7982
DD_TEST_CLIENT_API_KEY: ${{ secrets.DD_CLIENT_API_KEY }}
8083
DD_TEST_CLIENT_APP_KEY: ${{ secrets.DD_CLIENT_APP_KEY }}
8184
DD_TRACE_ANALYTICS_ENABLED: "true"
82-
DD_CIVISIBILITY_ENABLED: "true"
8385
RECORD: "none"
8486
SLEEP_AFTER_REQUEST: "${{ vars.SLEEP_AFTER_REQUEST }}"
8587
- name: Post failure status check

pom.xml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<version>3.0.0-M5</version>
5555
<configuration>
5656
<runOrder>random</runOrder>
57-
<argLine>-Ddd.integration.junit.enabled=true -Ddd.prioritization.type=ENSURE_TRACE -Ddd.jmxfetch.enabled=false -javaagent:${basedir}/target/dd-java-agent-${dd-java-agent-version}.jar -Xms512m -Xmx3500m -DsurefireForkNumber=${surefire.forkNumber} --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED</argLine>
57+
<argLine>-Xms512m -Xmx3500m -DsurefireForkNumber=${surefire.forkNumber} --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED</argLine>
5858
</configuration>
5959
</plugin>
6060
</plugins>
@@ -177,7 +177,7 @@
177177
<version>3.0.0-M5</version>
178178
<configuration>
179179
<runOrder>random</runOrder>
180-
<argLine>-Ddd.integration.junit.enabled=true -Ddd.prioritization.type=ENSURE_TRACE -Ddd.jmxfetch.enabled=false -javaagent:${basedir}/target/dd-java-agent-${dd-java-agent-version}.jar -Xms512m -Xmx3500m -DsurefireForkNumber=${surefire.forkNumber}</argLine>
180+
<argLine>-Xms512m -Xmx3500m -DsurefireForkNumber=${surefire.forkNumber}</argLine>
181181
</configuration>
182182
</plugin>
183183
<plugin>
@@ -193,23 +193,6 @@
193193
<outputDirectory>${project.build.directory}/lib</outputDirectory>
194194
</configuration>
195195
</execution>
196-
<execution>
197-
<id>copy</id>
198-
<phase>process-resources</phase>
199-
<goals>
200-
<goal>copy</goal>
201-
</goals>
202-
<configuration>
203-
<artifactItems>
204-
<artifactItem>
205-
<groupId>com.datadoghq</groupId>
206-
<artifactId>dd-java-agent</artifactId>
207-
<version>${dd-java-agent-version}</version>
208-
<outputDirectory>${project.build.directory}</outputDirectory>
209-
</artifactItem>
210-
</artifactItems>
211-
</configuration>
212-
</execution>
213196
</executions>
214197
</plugin>
215198

@@ -635,7 +618,7 @@
635618
<jakarta-annotation-version>2.1.0</jakarta-annotation-version>
636619
<scribejava-version>8.3.1</scribejava-version>
637620
<junit-version>4.13.2</junit-version>
638-
<dd-java-agent-version>1.41.1</dd-java-agent-version>
621+
<dd-java-agent-version>1.45.2</dd-java-agent-version>
639622
<cucumber-version>7.2.3</cucumber-version>
640623
<project.scm.id>github</project.scm.id>
641624
</properties>

src/test/java/com/datadog/api/ScenariosTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
@RunWith(Cucumber.class)
1010
@CucumberOptions(
11-
plugin = {"pretty", "summary", "com.datadog.api.TracePlugin", "rerun:target/rerun.txt"},
11+
plugin = {"pretty", "summary", "rerun:target/rerun.txt"},
1212
snippets = CAMELCASE,
1313
tags = "not @skip and not @skip-java")
1414
public class ScenariosTest {}

src/test/java/com/datadog/api/TracePlugin.java

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)