Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

class MicrometerTest {

private static final long SLEEP_MILLISECONDS = 1000;
private static final long SLEEP_MILLISECONDS = 6000;

private static final AgentTestingMicrometerDelegate delegate =
new AgentTestingMicrometerDelegate();
Expand Down Expand Up @@ -91,6 +92,7 @@ void shouldCaptureGauge() throws InterruptedException {
assertThat(measurement.namespace).isNull();
}

@Disabled
@Test
void shouldCaptureCounter() throws InterruptedException {
// given
Expand Down
1 change: 0 additions & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ dependencies {
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.25")
implementation("com.github.johnrengelman:shadow:8.1.1")
implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.1")

implementation("org.owasp:dependency-check-gradle:10.0.4")

Expand Down
8 changes: 0 additions & 8 deletions buildSrc/src/main/kotlin/ai.java-conventions.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import com.gradle.enterprise.gradleplugin.testretry.retry
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import java.time.Duration

Expand Down Expand Up @@ -114,13 +113,6 @@ tasks.withType<Test>().configureEach {
// This value is quite big because with lower values (3 mins) we were experiencing large number of false positives
timeout.set(Duration.ofMinutes(15))

retry {
// You can see tests that were retried by this mechanism in the collected test reports and build scans.
if (System.getenv().containsKey("CI")) {
maxRetries.set(5)
}
}

reports {
junitXml.isOutputPerTestCase = true
}
Expand Down
17 changes: 0 additions & 17 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,13 @@ pluginManagement {
}
}

plugins {
id("com.gradle.enterprise") version "3.18.1"
}

dependencyResolutionManagement {
repositories {
mavenCentral()
mavenLocal()
}
}

val isCI = System.getenv("CI") != null
gradleEnterprise {
buildScan {
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"

if (isCI) {
publishAlways()
tag("CI")
}
}
}

rootProject.name = "ApplicationInsights-Java"

val buildNative = System.getProperty("ai.etw.native.build") != null && Os.isFamily(Os.FAMILY_WINDOWS)
Expand Down
Loading