From 67da2defa63c20a71d18d8ef6d1098c3462fc97e Mon Sep 17 00:00:00 2001 From: Eduard Schander <66794307+EddeCCC@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:22:35 +0100 Subject: [PATCH] update dependencies (#1672) * update configuration server * Bump axios in /components/inspectit-ocelot-configurationserver-ui (#1670) Bumps [axios](https://github.com/axios/axios) from 1.6.2 to 1.7.4. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.6.2...v1.7.4) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump micromatch in /components/inspectit-ocelot-configurationserver-ui (#1664) Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8. - [Release notes](https://github.com/micromatch/micromatch/releases) - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8) --- updated-dependencies: - dependency-name: micromatch dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update agent * try fix java 21 workflow * revert bytebuddy * revert h2database * update configuration sever final * update agent final --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/agent_test.yml | 2 +- .../package.json | 2 +- .../yarn.lock | 28 ++++++------- gradle/configserverlibs.versions.toml | 34 ++++++++-------- gradle/libs.versions.toml | 40 ++++++++++--------- gradle/wrapper/gradle-wrapper.properties | 4 +- inspectit-ocelot-core/build.gradle | 1 - ...PropagationHttpExporterServiceIntTest.java | 7 ++-- 8 files changed, 60 insertions(+), 58 deletions(-) diff --git a/.github/workflows/agent_test.yml b/.github/workflows/agent_test.yml index 6dd65dcace..9742fb9c77 100644 --- a/.github/workflows/agent_test.yml +++ b/.github/workflows/agent_test.yml @@ -52,7 +52,7 @@ jobs: shell: bash run: | if [[ "${{ matrix.dockerimage }}" == "eclipse-temurin:21" ]]; then - sed -i 's/gradle-7.6.2-bin.zip/gradle-8.7-bin.zip/' gradle/wrapper/gradle-wrapper.properties + sed -i 's/gradle-7.6.4-bin.zip/gradle-8.7-bin.zip/' gradle/wrapper/gradle-wrapper.properties cat gradle/wrapper/gradle-wrapper.properties fi - name: Clean Gradle cache diff --git a/components/inspectit-ocelot-configurationserver-ui/package.json b/components/inspectit-ocelot-configurationserver-ui/package.json index 5e26b7e372..808b34ab8b 100644 --- a/components/inspectit-ocelot-configurationserver-ui/package.json +++ b/components/inspectit-ocelot-configurationserver-ui/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "ace-builds": "^1.13.2", - "axios": "^1.6.2", + "axios": "^1.7.4", "classnames": "^2.3.1", "dateformat": "^3.0.3", "eslint-config-next": "^14.2.5", diff --git a/components/inspectit-ocelot-configurationserver-ui/yarn.lock b/components/inspectit-ocelot-configurationserver-ui/yarn.lock index 9a1af9a389..9174c9c0c7 100644 --- a/components/inspectit-ocelot-configurationserver-ui/yarn.lock +++ b/components/inspectit-ocelot-configurationserver-ui/yarn.lock @@ -2265,12 +2265,12 @@ axe-core@=4.7.0: resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz" integrity sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ== -axios@^1.6.2: - version "1.6.2" - resolved "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz" - integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A== +axios@^1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2" + integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw== dependencies: - follow-redirects "^1.15.0" + follow-redirects "^1.15.6" form-data "^4.0.0" proxy-from-env "^1.1.0" @@ -2351,7 +2351,7 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@^3.0.2, braces@~3.0.2: +braces@^3.0.3, braces@~3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== @@ -3378,10 +3378,10 @@ flatted@^3.2.9: resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz" integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== -follow-redirects@^1.15.0: - version "1.15.6" - resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz" - integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== +follow-redirects@^1.15.6: + version "1.15.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" + integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== for-each@^0.3.3: version "0.3.3" @@ -4427,11 +4427,11 @@ merge2@^1.3.0, merge2@^1.4.1: integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + version "4.0.8" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" + integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== dependencies: - braces "^3.0.2" + braces "^3.0.3" picomatch "^2.3.1" mime-db@1.52.0: diff --git a/gradle/configserverlibs.versions.toml b/gradle/configserverlibs.versions.toml index a439b5c22e..3be07212a1 100644 --- a/gradle/configserverlibs.versions.toml +++ b/gradle/configserverlibs.versions.toml @@ -1,25 +1,25 @@ [versions] ioJsonwebtoken = "0.12.6" -orgEclipseJgit = "6.10.0.202406032230-r" -orgMockito = "5.12.0" -orgJunitJupiter = "5.10.3" -orgSpringframeworkBoot = { strictly = "3.3.1" } -orgSpringframeworkSecurity = "6.3.1" +orgEclipseJgit = "7.0.0.202409031743-r" +orgMockito = "5.14.2" +orgJunitJupiter = "5.11.3" +orgSpringframeworkBoot = { strictly = "3.3.5" } +orgSpringframeworkSecurity = "6.3.4" [libraries] comGoogleCodeGson = "com.google.code.gson:gson:2.11.0" -comGoogleGuava = { module = "com.google.guava:guava", version = { strictly = "33.2.1-jre" } } -comH2databaseH2 = "com.h2database:h2:2.2.224" -commonsIo = "commons-io:commons-io:2.16.1" +comGoogleGuava = { module = "com.google.guava:guava", version = { strictly = "33.3.1-jre" } } +comH2databaseH2 = "com.h2database:h2:2.3.232" +commonsIo = "commons-io:commons-io:2.17.0" ioJsonwebtokenJjwtApi = { module = "io.jsonwebtoken:jjwt-api", version.ref = "ioJsonwebtoken" } ioJsonwebtokenJjwtImpl = { module = "io.jsonwebtoken:jjwt-impl", version.ref = "ioJsonwebtoken" } ioJsonwebtokenJjwtJackson = { module = "io.jsonwebtoken:jjwt-jackson", version.ref = "ioJsonwebtoken" } -orgApacheCommonsCommonsLang3 = "org.apache.commons:commons-lang3:3.14.0" -orgAwaitility = "org.awaitility:awaitility:4.2.1" +orgApacheCommonsCommonsLang3 = "org.apache.commons:commons-lang3:3.17.0" +orgAwaitility = "org.awaitility:awaitility:4.2.2" orgEclipseJgitOrgEclipseJgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "orgEclipseJgit" } orgEclipseJgitOrgEclipseJgitSshApache= {module = "org.eclipse.jgit:org.eclipse.jgit.ssh.apache", version.ref = "orgEclipseJgit" } -orgFlywaydbFlywayCore = "org.flywaydb:flyway-core:10.15.2" -orgHibernateOrmHibernateCommunityDialects = "org.hibernate.orm:hibernate-community-dialects:6.5.2.Final" +orgFlywaydbFlywayCore = "org.flywaydb:flyway-core:10.21.0" +orgHibernateOrmHibernateCommunityDialects = "org.hibernate.orm:hibernate-community-dialects:6.6.2.Final" orgJunitJupiterJunitJupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "orgJunitJupiter" } orgJunitJupiterJunitJupiterApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "orgJunitJupiter" } orgJunitJupiterJunitJupiterEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "orgJunitJupiter" } @@ -29,15 +29,15 @@ orgSpringframeworkBootSpringBootStarterDataJpa = { module = "org.springframework orgSpringframeworkBootSpringBootStarterTest = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "orgSpringframeworkBoot" } orgSpringframeworkBootSpringBootStarterWeb = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "orgSpringframeworkBoot" } orgSpringframeworkBootSpringBootStartervalidation = { module = "org.springframework.boot:spring-boot-starter-validation", version.ref = "orgSpringframeworkBoot" } -orgSpringframeworkLdapSpringLdapCore = "org.springframework.ldap:spring-ldap-core:3.2.4" +orgSpringframeworkLdapSpringLdapCore = "org.springframework.ldap:spring-ldap-core:3.2.8" orgSpringframeworkSecuritySpringSecurityLdap = { module = "org.springframework.security:spring-security-ldap", version.ref = "orgSpringframeworkSecurity" } orgSpringframeworkSecuritySpringSecurityTest = { module = "org.springframework.security:spring-security-test", version.ref = "orgSpringframeworkSecurity" } orgSpringframeworkSecuritySpringSecurityWeb = { module = "org.springframework.security:spring-security-web", version.ref = "orgSpringframeworkSecurity" } orgSpringframeworksecuritySpringSecurityConfig = { module = "org.springframework.security:spring-security-config", version.ref = "orgSpringframeworkSecurity" } -chQosLogbackLogbackClassic = "ch.qos.logback:logback-classic:1.5.6" -chQosLogbackLogbackCore = "ch.qos.logback:logback-core:1.5.6" -orgXerialSqliteJdbc = "org.xerial:sqlite-jdbc:3.46.0.0" -orgYamlSnakeyaml = "org.yaml:snakeyaml:2.2" +chQosLogbackLogbackClassic = "ch.qos.logback:logback-classic:1.5.12" +chQosLogbackLogbackCore = "ch.qos.logback:logback-core:1.5.12" +orgXerialSqliteJdbc = "org.xerial:sqlite-jdbc:3.47.0.0" +orgYamlSnakeyaml = "org.yaml:snakeyaml:2.3" [bundles] jgit = [ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 834ecba261..134ae8aca2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,26 +1,26 @@ [versions] -comLinecorpArmeria = "1.29.2" +comLinecorpArmeria = "1.31.0" ioGithubNetmikeyLogunit = "2.0.0" -ioGrpc = "1.65.0" +ioGrpc = "1.68.1" # Ensure to adapt the netty version when changing the OpenCensus version # If you rename or move this variable to another file, adjust the release-workflow ioOpencensus = "0.31.1" ioOpentelemetry = "1.29.0" ioOpentelemetryAlpha = "1.29.0-alpha" -orgApacheLoggingLog4j = "2.23.1" +orgApacheLoggingLog4j = "2.24.1" # @pin last version to support Java 8 -orgEclipseJetty = "9.4.55.v20240627" +orgEclipseJetty = "9.4.56.v20240826" # @pin Starting with version 6.x requires Java 11 # 5.10.* is not running orgJunitJupiter = "5.9.3" # @pin mockito 5 requires Java 11 orgMockito = "4.11.0" -orgSlf4j = "2.0.13" +orgSlf4j = "2.0.16" # @pin 5.3.* is the last version to support Java 8 -orgSpringframework = "5.3.37" +orgSpringframework = "5.3.39" # @pin 2.7.18 is the latest release which runs on Java 8, this version marks the en of open source support for Sb 2.x orgSpringframeworkBoot = "2.7.18" -orgTestcontainers = "1.19.8" +orgTestcontainers = "1.20.3" [libraries] # @pin 1.3.* are the latest versions, which support java 8 @@ -32,14 +32,14 @@ comGithubTomakehurstWiremockJre8 = "com.github.tomakehurst:wiremock-jre8:2.35.2" # @pin ocelot-agent and ocelot-core cannot update guava, because of wiremock comGoogleGuava = { module = "com.google.guava:guava", version = { strictly = "31.1-jre" } } # @pin protobuf 4.* is not running -comGoogleProtobufProtobufJavaUtil = "com.google.protobuf:protobuf-java-util:3.25.3" +comGoogleProtobufProtobufJavaUtil = "com.google.protobuf:protobuf-java-util:3.25.5" +# Note: Updating to 2.3.* will break jmh tests comH2databaseH2 = "com.h2database:h2:2.2.224" comLinecorpArmeriaArmeriaGrpcProtocol = { module = "com.linecorp.armeria:armeria-grpc-protocol", version.ref = "comLinecorpArmeria" } comLinecorpArmeriaArmeriaJunit5 = { module = "com.linecorp.armeria:armeria-junit5", version.ref = "comLinecorpArmeria" } -comSquareupOkio = "com.squareup.okio:okio:3.9.0" +comSquareupOkio = "com.squareup.okio:okio:3.9.1" commonsBeanutils = "commons-beanutils:commons-beanutils:1.9.4" -commonsIo = "commons-io:commons-io:2.16.1" -ioApisenseEmbedInfluxEmbedInfluxDB = "io.apisense.embed.influx:embed-influxDB:1.3.1" +commonsIo = "commons-io:commons-io:2.17.0" ioGithubNetmikeyLogunitLogunitCore = { module = "io.github.netmikey.logunit:logunit-core", version.ref = "ioGithubNetmikeyLogunit" } ioGithubNetmikeyLogunitLogunitLogback = { module = "io.github.netmikey.logunit:logunit-logback", version.ref = "ioGithubNetmikeyLogunit" } # @pin resilience4j 2.* uses Java 17 APIs @@ -48,7 +48,7 @@ ioGrpcGrpcNettyShaded = { module = "io.grpc:grpc-netty-shaded", version.ref = "i ioGrpcGrpcStub = { module = "io.grpc:grpc-stub", version.ref = "ioGrpc" } # The following dependency is required for the OC-exporter to work correctly and must be matched against the grpc version # See https://github.com/census-instrumentation/opencensus-java/blob/master/exporters/trace/ocagent/README.md -ioNettyNettyTcnativeBoringsslStatic = "io.netty:netty-tcnative-boringssl-static:2.0.65.Final" +ioNettyNettyTcnativeBoringsslStatic = "io.netty:netty-tcnative-boringssl-static:2.0.69.Final" # Ensure to adapt the netty version when changing the OpenCensus version ioOpencensusOpencensusApi = { module = "io.opencensus:opencensus-api", version.ref = "ioOpencensus" } ioOpencensusOpencensusImpl = { module = "io.opencensus:opencensus-impl", version.ref = "ioOpencensus" } @@ -71,19 +71,21 @@ ioOpentelemetryOpentelemetrySemconv = { module = "io.opentelemetry:opentelemetry ioPrometheusSimpleclientHttpserver = "io.prometheus:simpleclient_httpserver:0.16.0" javaxAnnotationJavaxAnnotationApi = "javax.annotation:javax.annotation-api:1.3.2" log4j = "log4j:log4j:1.2.17" -netBytebuddyByteBuddy = "net.bytebuddy:byte-buddy:1.14.18" +# Note: Updating to 1.15.* will probably result in rewriting tests +netBytebuddyByteBuddy = "net.bytebuddy:byte-buddy:1.14.19" +# @pin logback 7.* is the last version for Java 8 netLogstashLogbackLogstashLogbackEncoder = "net.logstash.logback:logstash-logback-encoder:7.4" orgApacheCommonsCommonsCollections4 = "org.apache.commons:commons-collections4:4.4" -orgApacheCommonsCommonsLang3 = "org.apache.commons:commons-lang3:3.14.0" +orgApacheCommonsCommonsLang3 = "org.apache.commons:commons-lang3:3.17.0" orgApacheCommonsCommonsMath3 = "org.apache.commons:commons-math3:3.6.1" orgApacheHttpcomponentsHttpclient = "org.apache.httpcomponents:httpclient:4.5.14" orgApacheLoggingLog4jLog4jApi = { module = "org.apache.logging.log4j:log4j-api", version.ref = "orgApacheLoggingLog4j" } orgApacheLoggingLog4jLog4jCore = { module = "org.apache.logging.log4j:log4j-core", version.ref = "orgApacheLoggingLog4j" } # @pin Tomcat 9.0.* is the last version to support java 8 -orgApacheTomcatEmbedTomcatEmbedEl = "org.apache.tomcat.embed:tomcat-embed-el:9.0.91" +orgApacheTomcatEmbedTomcatEmbedEl = "org.apache.tomcat.embed:tomcat-embed-el:9.0.97" orgAssertjAssertjCore = "org.assertj:assertj-core:3.26.3" orgAssertjAssertjGuava = "org.assertj:assertj-guava:3.26.3" -orgAwaitility = "org.awaitility:awaitility:4.2.1" +orgAwaitility = "org.awaitility:awaitility:4.2.2" # @pin Jetty 9.4.* is the last version to support java 8 orgEclipseJettyJettyServer = { module = "org.eclipse.jetty:jetty-server", version.ref = "orgEclipseJetty" } # @pin HibernateValidator 6.* is the last version to support java 8 @@ -95,7 +97,7 @@ orgJunitJupiterJunitJupiterApi = { module = "org.junit.jupiter:junit-jupiter-api orgJunitJupiterJunitJupiterEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "orgJunitJupiter" } orgMockitoMockitoCore = { module = "org.mockito:mockito-core", version.ref = "orgMockito" } orgMockitoMockitoJunitJupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "orgMockito" } -orgProjectlombokLombok = "org.projectlombok:lombok:1.18.34" +orgProjectlombokLombok = "org.projectlombok:lombok:1.18.36" orgSlf4jJulToSlf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "orgSlf4j" } orgSlf4jslf4jApi = { module = "org.slf4j:slf4j-api", version.ref = "orgSlf4j" } orgSpringdocSpringdocOpenapiUi = "org.springdoc:springdoc-openapi-ui:1.8.0" @@ -124,13 +126,13 @@ opentelemetry = [ comGithubBenManesVersions = "com.github.ben-manes.versions:0.51.0" # @pin There is a newer version 2.1, but it is not Java 8 compatible comGithubJk1DependencyLicenseReport = "com.github.jk1.dependency-license-report:2.0" -comGithubNodeGradleNode = "com.github.node-gradle.node:7.0.2" +comGithubNodeGradleNode = "com.github.node-gradle.node:7.1.0" # @pin There is a newer Version 0.35.0, but it is not Java 8 compatible # For the Agent, this is currently provided via gradle.properties to make it dynamic. comPalantirDocker = "com.palantir.docker:0.34.0" ioSpringDependencyManagement = "io.spring.dependency-management:1.1.6" meChampeauJmh = "me.champeau.jmh:0.7.2" -nlLittlerobotsVersionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.4" +nlLittlerobotsVersionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.5" orgCyclonedxBom = "org.cyclonedx.bom:1.8.2" # @pin Last version to be compatible with java 1.8 orgOwaspDependencycheck = "org.owasp.dependencycheck:8.2.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 98debb84d5..1f9952793b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip +# You also need to update the gradle version in ".github/workflows/agent_test.yml" +# in the step "Upgrade Wrapper to 8.7 for Java 21" +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/inspectit-ocelot-core/build.gradle b/inspectit-ocelot-core/build.gradle index 82dcda3f47..9f116d4bba 100644 --- a/inspectit-ocelot-core/build.gradle +++ b/inspectit-ocelot-core/build.gradle @@ -148,7 +148,6 @@ dependencies { libs.ioGrpcGrpcNettyShaded, libs.ioGrpcGrpcStub, libs.orgInfluxdbInfluxdbJava, - libs.ioApisenseEmbedInfluxEmbedInfluxDB, // for docker test containers libs.orgTestcontainers, diff --git a/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/BrowserPropagationHttpExporterServiceIntTest.java b/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/BrowserPropagationHttpExporterServiceIntTest.java index dcaf7f9330..6c0e36d5c1 100644 --- a/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/BrowserPropagationHttpExporterServiceIntTest.java +++ b/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/BrowserPropagationHttpExporterServiceIntTest.java @@ -1,6 +1,5 @@ package rocks.inspectit.ocelot.core.exporter; -import de.flapdoodle.embed.process.runtime.Network; import org.apache.http.HttpEntity; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; @@ -14,7 +13,7 @@ import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.TestPropertySource; +import org.springframework.util.SocketUtils; import rocks.inspectit.ocelot.core.SpringTestBase; import rocks.inspectit.ocelot.core.instrumentation.browser.BrowserPropagationSessionStorage; @@ -51,8 +50,8 @@ void clearDataStorage() { sessionStorage.clearDataStorages(); } - void startServer() throws IOException { - int port = Network.getFreeServerPort(); + void startServer() { + int port = SocketUtils.findAvailableTcpPort(); BrowserPropagationServlet servlet = new BrowserPropagationServlet(sessionIDHeader, Collections.singletonList(allowedOrigin)); exporterService.startServer(host, port, path, servlet); url = "http://" + host + ":" + port + path;