From 1c839a53094bacd024022782ea735398e88479ab Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Mon, 3 Feb 2025 08:28:09 +0100 Subject: [PATCH 01/14] update OpenTelemetry and guava --- gradle/configserverlibs.versions.toml | 2 +- gradle/libs.versions.toml | 15 ++++++++------- inspectit-ocelot-agent/build.gradle | 7 +------ .../OpenTelemetryControllerImpl.java | 11 +++++++---- .../ExporterServiceIntegrationTestBase.java | 2 +- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/gradle/configserverlibs.versions.toml b/gradle/configserverlibs.versions.toml index c0cf1b759f..19d1ecac58 100644 --- a/gradle/configserverlibs.versions.toml +++ b/gradle/configserverlibs.versions.toml @@ -8,7 +8,7 @@ orgSpringframeworkSecurity = "6.3.4" [libraries] comGoogleCodeGson = "com.google.code.gson:gson:2.11.0" -comGoogleGuava = { module = "com.google.guava:guava", version = { strictly = "33.3.1-jre" } } +comGoogleGuava = { module = "com.google.guava:guava", version = { strictly = "33.4.0-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" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0909d55e6c..7453d2b708 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,8 +5,10 @@ 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" +# Update to latest OTel in next release - Delay due to jaeger-exporter deprecation notice +ioOpentelemetry = "1.34.1" +ioOpentelemetryAlpha = "1.34.1-alpha" +ioOpentelemetrySemconv = "1.29.0-alpha" orgApacheLoggingLog4j = "2.24.1" # @pin last version to support Java 8 orgEclipseJetty = "9.4.56.v20240826" @@ -31,8 +33,7 @@ chQosLogbackLogbackClassic = "ch.qos.logback:logback-classic:1.2.13" comFasterxmlJacksonCoreJacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:2.13.5" # @pin Wiremock 3.* doesn't support java 8 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" } } +comGoogleGuava = { module = "com.google.guava:guava", version = { strictly = "33.4.0-jre" } } # @pin protobuf 4.* is not running comGoogleProtobufProtobufJavaUtil = "com.google.protobuf:protobuf-java-util:3.25.5" # Note: Updating to 2.3.* will break jmh tests @@ -69,7 +70,7 @@ ioOpentelemetryOpentelemetryProto = { module = "io.opentelemetry:opentelemetry-p ioOpentelemetryOpentelemetrySdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "ioOpentelemetry" } ioOpentelemetryOpentelemetrySdkMetrics = { module = "io.opentelemetry:opentelemetry-sdk-metrics", version.ref = "ioOpentelemetry" } ioOpentelemetryOpentelemetrySdkTesting = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "ioOpentelemetry" } -ioOpentelemetryOpentelemetrySemconv = { module = "io.opentelemetry:opentelemetry-semconv", version.ref = "ioOpentelemetryAlpha" } +ioOpentelemetryOpentelemetrySemconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv", version.ref = "ioOpentelemetrySemconv" } ioPrometheusSimpleclientHttpserver = "io.prometheus:simpleclient_httpserver:0.16.0" javaxAnnotationJavaxAnnotationApi = "javax.annotation:javax.annotation-api:1.3.2" log4j = "log4j:log4j:1.2.17" @@ -85,8 +86,8 @@ orgApacheLoggingLog4jLog4jApi = { module = "org.apache.logging.log4j:log4j-api", 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.97" -orgAssertjAssertjCore = "org.assertj:assertj-core:3.26.3" -orgAssertjAssertjGuava = "org.assertj:assertj-guava:3.26.3" +orgAssertjAssertjCore = "org.assertj:assertj-core:3.27.3" +orgAssertjAssertjGuava = "org.assertj:assertj-guava:3.27.3" 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" } diff --git a/inspectit-ocelot-agent/build.gradle b/inspectit-ocelot-agent/build.gradle index 596254b914..3976349059 100644 --- a/inspectit-ocelot-agent/build.gradle +++ b/inspectit-ocelot-agent/build.gradle @@ -47,6 +47,7 @@ dependencies { libs.ioOpentelemetryOpentelemetrySdk, libs.ioOpentelemetryOpentelemetryOpencensusShim, libs.ioOpencensusOpencensusImpl, + libs.ioOpentelemetryOpentelemetrySemconv, libs.comGoogleGuava ) annotationProcessor libs.orgProjectlombokLombok @@ -56,12 +57,6 @@ dependencies { libs.chQosLogbackLogbackClassic, ) testRuntimeOnly libs.orgJunitJupiterJunitJupiterEngine - - constraints { - opentelemetry(libs.comGoogleGuava) { - because 'security issues' - } - } } task copyAgent(type: Copy) { diff --git a/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/opentelemetry/OpenTelemetryControllerImpl.java b/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/opentelemetry/OpenTelemetryControllerImpl.java index 28b5f46060..eeb7f96cd3 100644 --- a/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/opentelemetry/OpenTelemetryControllerImpl.java +++ b/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/opentelemetry/OpenTelemetryControllerImpl.java @@ -4,7 +4,7 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.opencensusshim.metrics.OpenCensusMetrics; +import io.opentelemetry.opencensusshim.OpenCensusMetricProducer; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder; @@ -14,7 +14,7 @@ import io.opentelemetry.sdk.trace.SpanProcessor; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; import io.opentelemetry.sdk.trace.export.SpanExporter; -import io.opentelemetry.semconv.resource.attributes.ResourceAttributes; +import io.opentelemetry.semconv.ResourceAttributes; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -431,11 +431,14 @@ synchronized SdkMeterProvider configureMeterProvider() { Resource metricServiceNameResource = Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, env.getCurrentConfig() .getServiceName())); - SdkMeterProviderBuilder builder = SdkMeterProvider.builder().setResource(metricServiceNameResource); + SdkMeterProviderBuilder builder = SdkMeterProvider.builder() + // register OC metric producer, so the OTel SDK can use OC metrics + .registerMetricProducer(OpenCensusMetricProducer.create()) + .setResource(metricServiceNameResource); // register metric reader for each service for (DynamicallyActivatableMetricsExporterService metricsExportService : registeredMetricExporterServices.values()) { - builder.registerMetricReader(OpenCensusMetrics.attachTo(metricsExportService.getNewMetricReader())); + builder.registerMetricReader(metricsExportService.getNewMetricReader()); } return builder.build(); diff --git a/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/ExporterServiceIntegrationTestBase.java b/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/ExporterServiceIntegrationTestBase.java index 5701a2912c..a1325bb586 100644 --- a/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/ExporterServiceIntegrationTestBase.java +++ b/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/ExporterServiceIntegrationTestBase.java @@ -22,7 +22,7 @@ import io.opentelemetry.proto.common.v1.AnyValue; import io.opentelemetry.proto.common.v1.KeyValue; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.resource.attributes.ResourceAttributes; +import io.opentelemetry.semconv.ResourceAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; From e6695cf8f49ba82126b21d687e816cf9e1da2c14 Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Mon, 3 Feb 2025 08:30:14 +0100 Subject: [PATCH 02/14] update workflow --- .github/workflows/agent_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/agent_test.yml b/.github/workflows/agent_test.yml index cb122d3c2c..1e31696553 100644 --- a/.github/workflows/agent_test.yml +++ b/.github/workflows/agent_test.yml @@ -64,7 +64,7 @@ jobs: - name: systemTest run: ./gradlew -P${{ steps.determine-jdk.outputs.gradle_property }} :inspectit-ocelot-agent:systemTest - name: upload test results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ failure() }} with: name: 'test-results' From 19e17b5b525dff361da2c8e394298369099cf5af Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Mon, 3 Feb 2025 08:44:04 +0100 Subject: [PATCH 03/14] add deprecation notice --- .../core/exporter/JaegerExporterService.java | 5 ++ .../docs/tracing/trace-exporters.md | 54 ++++++++++--------- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/exporter/JaegerExporterService.java b/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/exporter/JaegerExporterService.java index 997e2e4c5d..d8dcd65768 100644 --- a/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/exporter/JaegerExporterService.java +++ b/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/exporter/JaegerExporterService.java @@ -20,9 +20,13 @@ /** * Service for the {@link JaegerThriftSpanExporter}. * Can be dynamically started and stopped using the exporters.trace.jaeger.enabled configuration. + * + * @deprecated After we update OTel once more, the Jaeger exporter will no longer be supported. + * Use {@link OtlpTraceExporterService} instead. */ @Component @Slf4j +@Deprecated public class JaegerExporterService extends DynamicallyActivatableService { private final List SUPPORTED_PROTOCOLS = Arrays.asList(TransportProtocol.GRPC, TransportProtocol.HTTP_THRIFT); @@ -93,6 +97,7 @@ protected boolean checkEnabledForConfig(InspectitConfig conf) { @Override protected boolean doEnable(InspectitConfig configuration) { + log.warn("Jaeger Exporter is deprecated and will be removed soon. Please use the OTLP Trace Exporter instead"); try { JaegerExporterSettings settings = configuration.getExporters().getTracing().getJaeger(); diff --git a/inspectit-ocelot-documentation/docs/tracing/trace-exporters.md b/inspectit-ocelot-documentation/docs/tracing/trace-exporters.md index 53147bae30..43899c32d4 100644 --- a/inspectit-ocelot-documentation/docs/tracing/trace-exporters.md +++ b/inspectit-ocelot-documentation/docs/tracing/trace-exporters.md @@ -8,9 +8,9 @@ Tracing exporters are responsible for passing the recorded tracing data to a cor inspectIT Ocelot currently supports the following trace exporters: * [Logging (Traces)](#logging-exporter-traces) [[Homepage](https://github.com/open-telemetry/opentelemetry-java/blob/main/exporters/logging/src/main/java/io/opentelemetry/exporter/logging/LoggingSpanExporter.java)] -* [Zipkin](#zipkin-exporter) [[Homepage](https://zipkin.io/)] -* [Jaeger](#jaeger-exporter) [[Homepage](https://www.jaegertracing.io/)] * [OTLP (Traces)](#otlp-exporter-traces) [[Homepage](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/otlp/trace)] +* [Zipkin](#zipkin-exporter) [[Homepage](https://zipkin.io/)] +* [Jaeger](#jaeger-exporter) (**Deprecated**) [[Homepage](https://www.jaegertracing.io/)] >**Important note**: Starting with version `2.0.0`, inspectIT Ocelot moved from OpenCensus to OpenTelemetry. As a result, the `OpenCensus Agent Exporter` is no longer supported and has been removed. > Additionally, with OpenTelemetry, inspectIT Ocelot does not support the `service-name` property for individual exporter services anymore. Thus, we removed the `service-name` property from the Jaeger and Zipkin exporter. This property can now be set for all trace exporters in `inspectit.exporters.tracing.service-name`. @@ -36,6 +36,30 @@ To make inspectIT Ocelot write the spans to the system log, the following JVM pr `-Dinspectit.exporters.tracing.logging.enabled=ENABLED` +## OTLP Exporter (Traces) + +The OpenTelemetry Protocol (OTLP) exporters export the Traces in OTLP to the desired endpoint at a specified interval. +By default, the OTLP exporters are enabled but the URL endpoint needed for the exporter to actually start is set to `null`. + +The following properties are nested properties below the `inspectit.exporters.tracing.otlp` property: + +| Property | Default | Description | +|----------------|-----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `.enabled` | `IF_CONFIGURED` | If `ENABLED` or `IF_CONFIGURED`, the inspectIT Ocelot agent will try to start the OTLP gRPC trace exporter. | +| `.endpoint` | `null` | Target to which the exporter is going to send traces, e.g. `http://localhost:4317` | +| `.protocol` | `null` | The transport protocol, see [OTEL documentation](https://opentelemetry.io/docs/reference/specification/protocol/exporter/). Supported protocols are `grpc` and `http/protobuf`. | +| `.headers` | `null` | Key-value pairs to be used as headers associated with gRPC or HTTP requests, see [OTEL documentation](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md). | +| `.compression` | `NONE` | The compression method, see [OTEL documentation](https://opentelemetry.io/docs/reference/specification/protocol/exporter/). Supported compression methods are `gzip` and `none`. | +| `.timeout` | `10s` | Maximum time the OTLP exporter will wait for each batch export, see [OTEL documentation](https://opentelemetry.io/docs/reference/specification/protocol/exporter/). | + +To make inspectIT Ocelot push the spans via OTLP to, e.g. an OpenTelemetry Collector running on the same machine as the agent, the following JVM property can be used: + +``` +-Dinspectit.exporters.tracing.otlp.endpoint=http://127.0.0.1:4317 +-Dinspectit.exporters.tracing.otlp.protocol=grpc +``` + + ## Zipkin Exporter The Zipkin exporter exports Traces in Zipkin v2 format to a Zipkin server or other compatible servers. @@ -55,7 +79,9 @@ To make inspectIT Ocelot push the spans to a Zipkin server running on the same m -Dinspectit.exporters.tracing.zipkin.url=http://127.0.0.1:9411/api/v2/spans ``` -## Jaeger Exporter +## Jaeger Exporter (Deprecated) + +**This exporter is deprecated and will be removed soon. Please use the OTLP exporter instead.** The Jaeger exports works exactly the same way as the [Zipkin Exporter](#zipkin-exporter). InspectIT Ocelot supports thrift and gRPC Jaeger exporter. @@ -77,25 +103,3 @@ To make inspectIT Ocelot push the spans to a Jaeger server running on the same m -Dinspectit.exporters.tracing.jaeger.endpoint=http://127.0.0.1:14268/api/traces ``` -## OTLP Exporter (Traces) - -The OpenTelemetry Protocol (OTLP) exporters export the Traces in OTLP to the desired endpoint at a specified interval. -By default, the OTLP exporters are enabled but the URL endpoint needed for the exporter to actually start is set to `null`. - -The following properties are nested properties below the `inspectit.exporters.tracing.otlp` property: - -| Property | Default | Description | -|----------------|-----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `.enabled` | `IF_CONFIGURED` | If `ENABLED` or `IF_CONFIGURED`, the inspectIT Ocelot agent will try to start the OTLP gRPC trace exporter. | -| `.endpoint` | `null` | Target to which the exporter is going to send traces, e.g. `http://localhost:4317` | -| `.protocol` | `null` | The transport protocol, see [OTEL documentation](https://opentelemetry.io/docs/reference/specification/protocol/exporter/). Supported protocols are `grpc` and `http/protobuf`. | -| `.headers` | `null` | Key-value pairs to be used as headers associated with gRPC or HTTP requests, see [OTEL documentation](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md). | -| `.compression` | `NONE` | The compression method, see [OTEL documentation](https://opentelemetry.io/docs/reference/specification/protocol/exporter/). Supported compression methods are `gzip` and `none`. | -| `.timeout` | `10s` | Maximum time the OTLP exporter will wait for each batch export, see [OTEL documentation](https://opentelemetry.io/docs/reference/specification/protocol/exporter/). | - -To make inspectIT Ocelot push the spans via OTLP to, e.g. an OpenTelemetry Collector running on the same machine as the agent, the following JVM property can be used: - -``` --Dinspectit.exporters.tracing.otlp.endpoint=http://127.0.0.1:4317 --Dinspectit.exporters.tracing.otlp.protocol=grpc -``` From 047b4f8f708caa4da16e896fc9771661d8e92642 Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Mon, 3 Feb 2025 08:50:37 +0100 Subject: [PATCH 04/14] update agent dependencies --- gradle/libs.versions.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7453d2b708..4cacc23f92 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -comLinecorpArmeria = "1.31.0" +comLinecorpArmeria = "1.31.3" ioGithubNetmikeyLogunit = "2.0.0" -ioGrpc = "1.68.1" +ioGrpc = "1.70.0" # 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" @@ -10,8 +10,8 @@ ioOpentelemetry = "1.34.1" ioOpentelemetryAlpha = "1.34.1-alpha" ioOpentelemetrySemconv = "1.29.0-alpha" orgApacheLoggingLog4j = "2.24.1" -# @pin last version to support Java 8 -orgEclipseJetty = "9.4.56.v20240826" +# @pin 10+ does not support Java 8 - Maintain latest 9 version +orgEclipseJetty = "9.4.57.v20241219" # @pin Starting with version 6.x requires Java 11 # 5.10.* is not running orgJunitJupiter = "5.9.3" @@ -22,7 +22,7 @@ orgSlf4j = "2.0.16" 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.20.3" +orgTestcontainers = "1.20.4" # @pin resilience4j 2.* uses Java 17 APIs ioGithubResilience4j = "1.7.1" @@ -40,9 +40,9 @@ comGoogleProtobufProtobufJavaUtil = "com.google.protobuf:protobuf-java-util:3.25 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.1" +comSquareupOkio = "com.squareup.okio:okio:3.10.2" commonsBeanutils = "commons-beanutils:commons-beanutils:1.9.4" -commonsIo = "commons-io:commons-io:2.17.0" +commonsIo = "commons-io:commons-io:2.18.0" ioGithubNetmikeyLogunitLogunitCore = { module = "io.github.netmikey.logunit:logunit-core", version.ref = "ioGithubNetmikeyLogunit" } ioGithubNetmikeyLogunitLogunitLogback = { module = "io.github.netmikey.logunit:logunit-logback", version.ref = "ioGithubNetmikeyLogunit" } ioGithubResilience4jResilience4jRetry = { module = "io.github.resilience4j:resilience4j-retry", version.ref = "ioGithubResilience4j" } @@ -85,7 +85,7 @@ 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.97" +orgApacheTomcatEmbedTomcatEmbedEl = "org.apache.tomcat.embed:tomcat-embed-el:9.0.98" orgAssertjAssertjCore = "org.assertj:assertj-core:3.27.3" orgAssertjAssertjGuava = "org.assertj:assertj-guava:3.27.3" orgAwaitility = "org.awaitility:awaitility:4.2.2" @@ -133,7 +133,7 @@ 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" +ioSpringDependencyManagement = "io.spring.dependency-management:1.1.7" meChampeauJmh = "me.champeau.jmh:0.7.2" nlLittlerobotsVersionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.5" orgCyclonedxBom = "org.cyclonedx.bom:1.8.2" From 2ba59e33d7d492b438d6572b9a4dc3ee0ea5b1cc Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Mon, 3 Feb 2025 11:42:37 +0100 Subject: [PATCH 05/14] add removed jaeger-exporter to EUM docs --- .../eum-server-configuration.md | 33 ++++--------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/inspectit-ocelot-documentation/docs/enduser-monitoring/eum-server-configuration.md b/inspectit-ocelot-documentation/docs/enduser-monitoring/eum-server-configuration.md index 7b98f5e915..fd201d5ae9 100644 --- a/inspectit-ocelot-documentation/docs/enduser-monitoring/eum-server-configuration.md +++ b/inspectit-ocelot-documentation/docs/enduser-monitoring/eum-server-configuration.md @@ -582,32 +582,7 @@ These settings apply to all trace exporters and can set below the `inspectit-eum |-----------------|-----------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | `.service-name` | `${inspectit.service-name}` | The value of this property will be used to identify the service a trace came from. Please note that changes of this property only take effect after restarting the agent. | -##### Jaeger -InspectIT EUM Server supports thrift and gRPC Jaeger exporter. - -By default, the Jaeger exporter is enabled, but it is not active since the `endpoint` property is not set. - -The following configuration snippet makes the Jaeger exporter send traces to a Jaeger instance avialable under `localhost:14250`. - -```YAML -inspectit-eum-server: - exporters: - tracing: - jaeger: - # If jaeger exporter for the OT received spans is enabled. - enabled: ENABLED - - # Location of the jaeger gRPC API. - # Either a valid NameResolver-compliant URI, or an authority string. - # If this property is not set, the jaeger-exporter will not be started. - endpoint: localhost:14250 - # the transport protocol, e.g., 'grpc' or 'http/protobuf' - protocol: grpc - # service name for all exported spans. - service-name: browser-js -``` - -##### OTLP (tracing) +##### OTLP (Tracing) By default, the OTLP exporter is enabled, but is not active as the `endpoint`-property is not set. The property can be set via `inspectit-eum-server.exporters.tracing.otlp.endpoint`. @@ -624,6 +599,12 @@ inspectit-eum-server: # the transport protocol, e.g., 'http/thrift' or 'grpc' protocol: grpc ``` + +##### Jaeger (**Removed**) + +Since version 2.6.2 the EUM Server does no longer support the Jaeger exporter for traces. +Please use the OTLP Exporter instead. + #### Additional Span Attributes The EUM server is able to enrich a received span with additional attributes. From 9f365982e639d7f495a8af62036c0cdcc323749c Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Tue, 4 Feb 2025 10:52:42 +0100 Subject: [PATCH 06/14] refactor tests --- gradle/libs.versions.toml | 4 +-- .../OpenTelemetryControllerImpl.java | 8 ++--- .../ExporterServiceIntegrationTestBase.java | 11 +++---- .../OtlpMetricsExporterServiceIntTest.java | 33 ++----------------- .../src/test/resources/otel-config.yaml | 10 +++--- 5 files changed, 18 insertions(+), 48 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4cacc23f92..a633684931 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,8 +6,8 @@ ioGrpc = "1.70.0" # If you rename or move this variable to another file, adjust the release-workflow ioOpencensus = "0.31.1" # Update to latest OTel in next release - Delay due to jaeger-exporter deprecation notice -ioOpentelemetry = "1.34.1" -ioOpentelemetryAlpha = "1.34.1-alpha" +ioOpentelemetry = "1.30.0" +ioOpentelemetryAlpha = "1.30.0-alpha" ioOpentelemetrySemconv = "1.29.0-alpha" orgApacheLoggingLog4j = "2.24.1" # @pin 10+ does not support Java 8 - Maintain latest 9 version diff --git a/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/opentelemetry/OpenTelemetryControllerImpl.java b/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/opentelemetry/OpenTelemetryControllerImpl.java index eeb7f96cd3..2ede7f7be3 100644 --- a/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/opentelemetry/OpenTelemetryControllerImpl.java +++ b/inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/opentelemetry/OpenTelemetryControllerImpl.java @@ -4,7 +4,7 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.opencensusshim.OpenCensusMetricProducer; +import io.opentelemetry.opencensusshim.metrics.OpenCensusMetrics; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder; @@ -432,13 +432,13 @@ synchronized SdkMeterProvider configureMeterProvider() { Resource metricServiceNameResource = Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, env.getCurrentConfig() .getServiceName())); SdkMeterProviderBuilder builder = SdkMeterProvider.builder() - // register OC metric producer, so the OTel SDK can use OC metrics - .registerMetricProducer(OpenCensusMetricProducer.create()) + // TODO Update OTel + //.registerMetricProducer(OpenCensusMetricProducer.create()) .setResource(metricServiceNameResource); // register metric reader for each service for (DynamicallyActivatableMetricsExporterService metricsExportService : registeredMetricExporterServices.values()) { - builder.registerMetricReader(metricsExportService.getNewMetricReader()); + builder.registerMetricReader(OpenCensusMetrics.attachTo(metricsExportService.getNewMetricReader())); } return builder.build(); diff --git a/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/ExporterServiceIntegrationTestBase.java b/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/ExporterServiceIntegrationTestBase.java index a1325bb586..3830e1e3d8 100644 --- a/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/ExporterServiceIntegrationTestBase.java +++ b/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/ExporterServiceIntegrationTestBase.java @@ -37,6 +37,8 @@ import rocks.inspectit.ocelot.core.config.InspectitEnvironment; import java.io.UncheckedIOException; +import java.time.Duration; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -60,7 +62,7 @@ @Testcontainers(disabledWithoutDocker = true) public abstract class ExporterServiceIntegrationTestBase extends SpringTestBase { - static final String COLLECTOR_TAG = "0.58.0"; + static final String COLLECTOR_TAG = "0.100.0"; static final String COLLECTOR_IMAGE = "otel/opentelemetry-collector-contrib:" + COLLECTOR_TAG; @@ -88,11 +90,6 @@ public abstract class ExporterServiceIntegrationTestBase extends SpringTestBase static final String INSTRUMENTATION_VERSION = "0.0.1"; - static final Resource RESOURCE = Resource.getDefault() - .toBuilder() - .put(ResourceAttributes.SERVICE_NAME, "OTEL integration test") - .build(); - private static final Logger LOGGER = Logger.getLogger(ExporterServiceIntegrationTestBase.class.getName()); /** @@ -129,7 +126,7 @@ static void startCollector() { .withExposedPorts(COLLECTOR_OTLP_GRPC_PORT, COLLECTOR_OTLP_HTTP_PORT, COLLECTOR_HEALTH_CHECK_PORT, COLLECTOR_JAEGER_THRIFT_HTTP_PORT, COLLECTOR_JAEGER_THRIFT_BINARY_PORT, COLLECTOR_JAEGER_THRIFT_COMPACT_PORT, COLLECTOR_JAEGER_GRPC_PORT, COLLECTOR_PROMETHEUS_PORT, COLLECTOR_INFLUX_DB1_PORT, COLLECTOR_ZIPKIN_PORT) .waitingFor(Wait.forHttp("/").forPort(COLLECTOR_HEALTH_CHECK_PORT)); - // collector.withStartupTimeout(Duration.of(1, ChronoUnit.MINUTES)); + //collector.withStartupTimeout(Duration.of(1, ChronoUnit.MINUTES)); // note: in case you receive the 'Caused by: org.testcontainers.containers.ContainerLaunchException: Timed out waiting for container port to open' exception, // uncomment the above line. The exception is probably caused by Docker Desktop hiccups and should only appear locally. collector.start(); diff --git a/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/OtlpMetricsExporterServiceIntTest.java b/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/OtlpMetricsExporterServiceIntTest.java index a344d4beb3..e9711ad06a 100644 --- a/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/OtlpMetricsExporterServiceIntTest.java +++ b/inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/OtlpMetricsExporterServiceIntTest.java @@ -15,7 +15,6 @@ import rocks.inspectit.ocelot.core.config.InspectitEnvironment; import java.time.Duration; -import java.time.temporal.ChronoUnit; import java.util.HashMap; import java.util.concurrent.TimeUnit; @@ -111,6 +110,7 @@ void testNoProtocolSet() { warnLogs.assertContains("'protocol'"); } + @DirtiesContext @Test void defaultSettings() { AssertionsForClassTypes.assertThat(service.isEnabled()).isFalse(); @@ -140,20 +140,7 @@ void testAggregationTemporalityCumulative(){ recordMetricsAndFlush(measure, 1, "key", "val"); recordMetricsAndFlush(measure, 2, "key", "val"); - await().atMost(30, TimeUnit.SECONDS) - .untilAsserted(() -> assertThat(grpcServer.metricRequests.stream()).anyMatch(mReq -> mReq.getResourceMetricsList() - .stream() - .anyMatch(rm -> - // check for the "my-counter" metrics - rm.getInstrumentationLibraryMetrics(0).getMetrics(0).getName().equals("my-counter") - // check for the specific attribute and value - && rm.getInstrumentationLibraryMetrics(0) - .getMetricsList() - .stream() - .anyMatch(metric -> metric.getSum() - .getDataPointsList() - .stream() - .anyMatch(d -> d.getAsInt() == 3))))); + awaitMetricsExported(measure, 3, "key", "val"); } @DirtiesContext @@ -172,21 +159,7 @@ void testAggregationTemporalityDelta(){ recordMetricsAndFlush(measure, 1, "key", "val"); recordMetricsAndFlush(measure, 2, "key", "val"); - await().atMost(30, TimeUnit.SECONDS) - .untilAsserted(() -> assertThat(grpcServer.metricRequests.stream()).anyMatch(mReq -> mReq.getResourceMetricsList() - .stream() - .anyMatch(rm -> - // check for the "my-counter" metrics - rm.getInstrumentationLibraryMetrics(0).getMetrics(0).getName().equals("my-counter") - // check for the specific attribute and value - && rm.getInstrumentationLibraryMetrics(0) - .getMetricsList() - .stream() - .anyMatch(metric -> metric.getSum() - .getDataPointsList() - .stream() - .anyMatch(d -> d.getAsInt() == 2))))); - + awaitMetricsExported(measure, 2, "key", "val"); } @DirtiesContext diff --git a/inspectit-ocelot-core/src/test/resources/otel-config.yaml b/inspectit-ocelot-core/src/test/resources/otel-config.yaml index 6684ac30fc..a5ae3b00a7 100644 --- a/inspectit-ocelot-core/src/test/resources/otel-config.yaml +++ b/inspectit-ocelot-core/src/test/resources/otel-config.yaml @@ -32,26 +32,26 @@ receivers: zipkin: exporters: - logging: - logLevel: $LOGGING_EXPORTER_LOG_lEVEL otlp: endpoint: $OTLP_EXPORTER_ENDPOINT tls: insecure: true compression: none + debug: + verbosity: detailed service: extensions: [health_check] pipelines: metrics: receivers: [otlp, prometheus, influxdb] - exporters: [logging, otlp] + exporters: [debug, otlp] traces: receivers: [otlp, jaeger, zipkin] - exporters: [logging, otlp] + exporters: [debug, otlp] logs: receivers: [otlp] - exporters: [logging, otlp] + exporters: [debug, otlp] telemetry: logs: level: "info" From 0e68b2e95c1b5075a8f60c0a0b109eff03d3fd0c Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Tue, 4 Feb 2025 11:15:39 +0100 Subject: [PATCH 07/14] update config server dependencies --- .../build.gradle | 34 +++++-------------- .../kapacitor/KapacitorErrorHandler.java | 4 +-- gradle/configserverlibs.versions.toml | 28 +++++++-------- gradle/libs.versions.toml | 12 +++---- 4 files changed, 31 insertions(+), 47 deletions(-) diff --git a/components/inspectit-ocelot-configdocsgenerator/build.gradle b/components/inspectit-ocelot-configdocsgenerator/build.gradle index 94d580d624..42e14cbc94 100644 --- a/components/inspectit-ocelot-configdocsgenerator/build.gradle +++ b/components/inspectit-ocelot-configdocsgenerator/build.gradle @@ -1,58 +1,42 @@ plugins { // Apply the application plugin to add support for building a CLI application in Java. id 'application' - // spring dependency manager - alias(libs.plugins.orgSpringframeworkBoot) + alias(configServerLibs.plugins.orgSpringframeworkBoot) } apply plugin: 'io.spring.dependency-management' dependencies { - // Use JUnit Jupiter for testing. testImplementation( - libs.orgJunitJupiterJunitJupiter, - libs.ioOpencensusOpencensusApi, - libs.ioOpentelemetryOpentelemetryApi, + configServerLibs.orgJunitJupiterJunitJupiter, - libs.orgMockitoMockitoJunitJupiter, + configServerLibs.orgMockitoMockitoJunitJupiter, + configServerLibs.comGoogleGuava, libs.orgAssertjAssertjCore, - libs.comGoogleGuava ) - // This dependency is used by the application. implementation( project(':inspectit-ocelot-config'), - libs.chQosLogbackLogbackClassic, + configServerLibs.chQosLogbackLogbackClassic, libs.orgApacheCommonsCommonsLang3, libs.commonsBeanutils, // Update dependency, due to Out-of-Support libs.orgApacheCommonsCommonsCollections4, - libs.orgSpringframeworkBootSpringBootStarterWeb, - libs.orgYamlSnakeyaml + configServerLibs.orgSpringframeworkBootSpringBootStarterWeb, + configServerLibs.orgYamlSnakeyaml ) - constraints { - implementation(libs.orgYamlSnakeyaml) { - because 'vulnerabilities in v1.29 used by the SpringBoot version used in this module' - } - testImplementation(libs.comGoogleGuava) { - because 'security issues' - } - } compileOnly libs.orgProjectlombokLombok annotationProcessor libs.orgProjectlombokLombok } application { - // Define the main class for the application. mainClass = 'inspectit.ocelot.configuration.docs.App' } test { - // Use JUnit Platform for unit tests. useJUnitPlatform() } -//to guarantee that the Configuration Server is compatible with Java 8 runtime environments -sourceCompatibility = 1.8 // Java version compatibility to use when compiling Java source. -targetCompatibility = 1.8 // Java version to generate classes for. +sourceCompatibility = 17 +targetCompatibility = 17 diff --git a/components/inspectit-ocelot-configurationserver/src/main/java/rocks/inspectit/ocelot/rest/alert/kapacitor/KapacitorErrorHandler.java b/components/inspectit-ocelot-configurationserver/src/main/java/rocks/inspectit/ocelot/rest/alert/kapacitor/KapacitorErrorHandler.java index f22311b700..ed926272a5 100644 --- a/components/inspectit-ocelot-configurationserver/src/main/java/rocks/inspectit/ocelot/rest/alert/kapacitor/KapacitorErrorHandler.java +++ b/components/inspectit-ocelot-configurationserver/src/main/java/rocks/inspectit/ocelot/rest/alert/kapacitor/KapacitorErrorHandler.java @@ -14,7 +14,7 @@ public class KapacitorErrorHandler extends DefaultResponseErrorHandler { @Override - protected void handleError(ClientHttpResponse response, HttpStatusCode statusCode) throws IOException { + public void handleError(ClientHttpResponse response) throws IOException { String message = "Unknown Kapacitor Error"; try { ObjectMapper mapper = new ObjectMapper(); @@ -22,6 +22,6 @@ protected void handleError(ClientHttpResponse response, HttpStatusCode statusCod } catch (Exception e) { log.debug("Failed to decode Kapacitor message", e); } - throw new KapacitorServerException(message, HttpStatus.valueOf(statusCode.value())); + throw new KapacitorServerException(message, HttpStatus.valueOf(response.getStatusCode().value())); } } diff --git a/gradle/configserverlibs.versions.toml b/gradle/configserverlibs.versions.toml index 19d1ecac58..d2e3ef5180 100644 --- a/gradle/configserverlibs.versions.toml +++ b/gradle/configserverlibs.versions.toml @@ -1,16 +1,16 @@ [versions] ioJsonwebtoken = "0.12.6" -orgEclipseJgit = "7.0.0.202409031743-r" -orgMockito = "5.14.2" -orgJunitJupiter = "5.10.5" -orgSpringframeworkBoot = { strictly = "3.3.5" } -orgSpringframeworkSecurity = "6.3.4" +orgEclipseJgit = "7.1.0.202411261347-r" +orgMockito = "5.15.2" +orgJunitJupiter = "5.11.4" +orgSpringframeworkBoot = { strictly = "3.4.2" } +orgSpringframeworkSecurity = "6.4.2" [libraries] -comGoogleCodeGson = "com.google.code.gson:gson:2.11.0" +comGoogleCodeGson = "com.google.code.gson:gson:2.12.1" comGoogleGuava = { module = "com.google.guava:guava", version = { strictly = "33.4.0-jre" } } comH2databaseH2 = "com.h2database:h2:2.3.232" -commonsIo = "commons-io:commons-io:2.17.0" +commonsIo = "commons-io:commons-io:2.18.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" } @@ -18,8 +18,8 @@ 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.21.0" -orgHibernateOrmHibernateCommunityDialects = "org.hibernate.orm:hibernate-community-dialects:6.6.2.Final" +orgFlywaydbFlywayCore = "org.flywaydb:flyway-core:11.3.0" +orgHibernateOrmHibernateCommunityDialects = "org.hibernate.orm:hibernate-community-dialects:6.6.6.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,14 +29,14 @@ 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.8" +orgSpringframeworkLdapSpringLdapCore = "org.springframework.ldap:spring-ldap-core:3.2.10" 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.12" -chQosLogbackLogbackCore = "ch.qos.logback:logback-core:1.5.12" -orgXerialSqliteJdbc = "org.xerial:sqlite-jdbc:3.47.0.0" +chQosLogbackLogbackClassic = "ch.qos.logback:logback-classic:1.5.16" +chQosLogbackLogbackCore = "ch.qos.logback:logback-core:1.5.16" +orgXerialSqliteJdbc = "org.xerial:sqlite-jdbc:3.48.0.0" orgYamlSnakeyaml = "org.yaml:snakeyaml:2.3" [bundles] @@ -51,5 +51,5 @@ jsonwebtoken = [ ] [plugins] -ioSpringDependencyManagement = "io.spring.dependency-management:1.1.6" +ioSpringDependencyManagement = "io.spring.dependency-management:1.1.7" orgSpringframeworkBoot = { id = "org.springframework.boot", version.ref = "orgSpringframeworkBoot" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a633684931..a6e1ba4e25 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ ioOpencensus = "0.31.1" ioOpentelemetry = "1.30.0" ioOpentelemetryAlpha = "1.30.0-alpha" ioOpentelemetrySemconv = "1.29.0-alpha" -orgApacheLoggingLog4j = "2.24.1" +orgApacheLoggingLog4j = "2.24.3" # @pin 10+ does not support Java 8 - Maintain latest 9 version orgEclipseJetty = "9.4.57.v20241219" # @pin Starting with version 6.x requires Java 11 @@ -20,7 +20,7 @@ orgMockito = "4.11.0" orgSlf4j = "2.0.16" # @pin 5.3.* is the last version to support Java 8 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 +# @pin 2.7.18 is the latest release which runs on Java 8, this version marks the end of open source support for SB 2.x orgSpringframeworkBoot = "2.7.18" orgTestcontainers = "1.20.4" # @pin resilience4j 2.* uses Java 17 APIs @@ -35,13 +35,13 @@ comFasterxmlJacksonCoreJacksonDatabind = "com.fasterxml.jackson.core:jackson-dat comGithubTomakehurstWiremockJre8 = "com.github.tomakehurst:wiremock-jre8:2.35.2" comGoogleGuava = { module = "com.google.guava:guava", version = { strictly = "33.4.0-jre" } } # @pin protobuf 4.* is not running -comGoogleProtobufProtobufJavaUtil = "com.google.protobuf:protobuf-java-util:3.25.5" +comGoogleProtobufProtobufJavaUtil = "com.google.protobuf:protobuf-java-util:3.25.6" # 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.10.2" -commonsBeanutils = "commons-beanutils:commons-beanutils:1.9.4" +commonsBeanutils = "commons-beanutils:commons-beanutils:1.10.0" commonsIo = "commons-io:commons-io:2.18.0" ioGithubNetmikeyLogunitLogunitCore = { module = "io.github.netmikey.logunit:logunit-core", version.ref = "ioGithubNetmikeyLogunit" } ioGithubNetmikeyLogunitLogunitLogback = { module = "io.github.netmikey.logunit:logunit-logback", version.ref = "ioGithubNetmikeyLogunit" } @@ -134,9 +134,9 @@ comGithubNodeGradleNode = "com.github.node-gradle.node:7.1.0" # 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.7" -meChampeauJmh = "me.champeau.jmh:0.7.2" +meChampeauJmh = "me.champeau.jmh:0.7.3" nlLittlerobotsVersionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.5" -orgCyclonedxBom = "org.cyclonedx.bom:1.8.2" +orgCyclonedxBom = "org.cyclonedx.bom:2.0.0" # @pin Dependency-Check 11.* requires Java 11, 10.0.4 does not work with Gradle 7 orgOwaspDependencycheck = "org.owasp.dependencycheck:10.0.3" orgSpringframeworkBoot = { id = "org.springframework.boot", version.ref = "orgSpringframeworkBoot" } From 7ba71344db71e23878d6127691490e24b71ffc86 Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Tue, 4 Feb 2025 11:32:33 +0100 Subject: [PATCH 08/14] update config server ui --- .../package.json | 10 +- .../yarn.lock | 507 +++++++++--------- 2 files changed, 258 insertions(+), 259 deletions(-) diff --git a/components/inspectit-ocelot-configurationserver-ui/package.json b/components/inspectit-ocelot-configurationserver-ui/package.json index af9c2d14c8..4089fab8fb 100644 --- a/components/inspectit-ocelot-configurationserver-ui/package.json +++ b/components/inspectit-ocelot-configurationserver-ui/package.json @@ -35,7 +35,7 @@ "jszip": "^3.10.0", "jwt-decode": "^3.1.2", "lodash": "^4.17.21", - "next": "^14.2.15", + "next": "^14.2.23", "primeflex": "^3.2.1", "primeicons": "^5.0.0", "primereact": "^8.5.0", @@ -71,10 +71,10 @@ "@babel/helper-string-parser": "^7.18.10", "@babel/preset-react": "^7.18.6", "@next/eslint-plugin-next": "^14.0.4", - "@storybook/addon-actions": "^7.6.4", - "@storybook/addon-essentials": "^7.6.4", - "@storybook/addon-links": "^7.6.4", - "@storybook/react": "^7.6.4", + "@storybook/addon-actions": "^7.6.19", + "@storybook/addon-essentials": "^7.6.19", + "@storybook/addon-links": "^7.6.19", + "@storybook/react": "^7.6.19", "babel-loader": "^9.1.3", "eslint": "8.55.0", "eslint-config-prettier": "^9.1.0", diff --git a/components/inspectit-ocelot-configurationserver-ui/yarn.lock b/components/inspectit-ocelot-configurationserver-ui/yarn.lock index 50b51482e3..81905bc3ed 100644 --- a/components/inspectit-ocelot-configurationserver-ui/yarn.lock +++ b/components/inspectit-ocelot-configurationserver-ui/yarn.lock @@ -712,10 +712,10 @@ "@types/mdx" "^2.0.0" "@types/react" ">=16" -"@next/env@14.2.15": - version "14.2.15" - resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.15.tgz#06d984e37e670d93ddd6790af1844aeb935f332f" - integrity sha512-S1qaj25Wru2dUpcIZMjxeMVSwkt8BK4dmWHHiBuRstcIyOsMapqT4A4jSB6onvqeygkSSmOkyny9VVx8JIGamQ== +"@next/env@14.2.23": + version "14.2.23" + resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.23.tgz#3003b53693cbc476710b856f83e623c8231a6be9" + integrity sha512-CysUC9IO+2Bh0omJ3qrb47S8DtsTKbFidGm6ow4gXIG6reZybqxbkH2nhdEm1tC8SmgzDdpq3BIML0PWsmyUYA== "@next/eslint-plugin-next@14.2.5": version "14.2.5" @@ -731,50 +731,50 @@ dependencies: glob "7.1.7" -"@next/swc-darwin-arm64@14.2.15": - version "14.2.15" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.15.tgz#6386d585f39a1c490c60b72b1f76612ba4434347" - integrity sha512-Rvh7KU9hOUBnZ9TJ28n2Oa7dD9cvDBKua9IKx7cfQQ0GoYUwg9ig31O2oMwH3wm+pE3IkAQ67ZobPfEgurPZIA== - -"@next/swc-darwin-x64@14.2.15": - version "14.2.15" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.15.tgz#b7baeedc6a28f7545ad2bc55adbab25f7b45cb89" - integrity sha512-5TGyjFcf8ampZP3e+FyCax5zFVHi+Oe7sZyaKOngsqyaNEpOgkKB3sqmymkZfowy3ufGA/tUgDPPxpQx931lHg== - -"@next/swc-linux-arm64-gnu@14.2.15": - version "14.2.15" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.15.tgz#fa13c59d3222f70fb4cb3544ac750db2c6e34d02" - integrity sha512-3Bwv4oc08ONiQ3FiOLKT72Q+ndEMyLNsc/D3qnLMbtUYTQAmkx9E/JRu0DBpHxNddBmNT5hxz1mYBphJ3mfrrw== - -"@next/swc-linux-arm64-musl@14.2.15": - version "14.2.15" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.15.tgz#30e45b71831d9a6d6d18d7ac7d611a8d646a17f9" - integrity sha512-k5xf/tg1FBv/M4CMd8S+JL3uV9BnnRmoe7F+GWC3DxkTCD9aewFRH1s5rJ1zkzDa+Do4zyN8qD0N8c84Hu96FQ== - -"@next/swc-linux-x64-gnu@14.2.15": - version "14.2.15" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.15.tgz#5065db17fc86f935ad117483f21f812dc1b39254" - integrity sha512-kE6q38hbrRbKEkkVn62reLXhThLRh6/TvgSP56GkFNhU22TbIrQDEMrO7j0IcQHcew2wfykq8lZyHFabz0oBrA== - -"@next/swc-linux-x64-musl@14.2.15": - version "14.2.15" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.15.tgz#3c4a4568d8be7373a820f7576cf33388b5dab47e" - integrity sha512-PZ5YE9ouy/IdO7QVJeIcyLn/Rc4ml9M2G4y3kCM9MNf1YKvFY4heg3pVa/jQbMro+tP6yc4G2o9LjAz1zxD7tQ== - -"@next/swc-win32-arm64-msvc@14.2.15": - version "14.2.15" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.15.tgz#fb812cc4ca0042868e32a6a021da91943bb08b98" - integrity sha512-2raR16703kBvYEQD9HNLyb0/394yfqzmIeyp2nDzcPV4yPjqNUG3ohX6jX00WryXz6s1FXpVhsCo3i+g4RUX+g== - -"@next/swc-win32-ia32-msvc@14.2.15": - version "14.2.15" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.15.tgz#ec26e6169354f8ced240c1427be7fd485c5df898" - integrity sha512-fyTE8cklgkyR1p03kJa5zXEaZ9El+kDNM5A+66+8evQS5e/6v0Gk28LqA0Jet8gKSOyP+OTm/tJHzMlGdQerdQ== - -"@next/swc-win32-x64-msvc@14.2.15": - version "14.2.15" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.15.tgz#18d68697002b282006771f8d92d79ade9efd35c4" - integrity sha512-SzqGbsLsP9OwKNUG9nekShTwhj6JSB9ZLMWQ8g1gG6hdE5gQLncbnbymrwy2yVmH9nikSLYRYxYMFu78Ggp7/g== +"@next/swc-darwin-arm64@14.2.23": + version "14.2.23" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.23.tgz#6d83f03e35e163e8bbeaf5aeaa6bf55eed23d7a1" + integrity sha512-WhtEntt6NcbABA8ypEoFd3uzq5iAnrl9AnZt9dXdO+PZLACE32z3a3qA5OoV20JrbJfSJ6Sd6EqGZTrlRnGxQQ== + +"@next/swc-darwin-x64@14.2.23": + version "14.2.23" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.23.tgz#e02abc35d5e36ce1550f674f8676999f293ba54f" + integrity sha512-vwLw0HN2gVclT/ikO6EcE+LcIN+0mddJ53yG4eZd0rXkuEr/RnOaMH8wg/sYl5iz5AYYRo/l6XX7FIo6kwbw1Q== + +"@next/swc-linux-arm64-gnu@14.2.23": + version "14.2.23" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.23.tgz#f13516ad2d665950951b59e7c239574bb8504d63" + integrity sha512-uuAYwD3At2fu5CH1wD7FpP87mnjAv4+DNvLaR9kiIi8DLStWSW304kF09p1EQfhcbUI1Py2vZlBO2VaVqMRtpg== + +"@next/swc-linux-arm64-musl@14.2.23": + version "14.2.23" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.23.tgz#10d05a1c161dc8426d54ccf6d9bbed6953a3252a" + integrity sha512-Mm5KHd7nGgeJ4EETvVgFuqKOyDh+UMXHXxye6wRRFDr4FdVRI6YTxajoV2aHE8jqC14xeAMVZvLqYqS7isHL+g== + +"@next/swc-linux-x64-gnu@14.2.23": + version "14.2.23" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.23.tgz#7f5856df080f58ba058268b30429a2ab52500536" + integrity sha512-Ybfqlyzm4sMSEQO6lDksggAIxnvWSG2cDWnG2jgd+MLbHYn2pvFA8DQ4pT2Vjk3Cwrv+HIg7vXJ8lCiLz79qoQ== + +"@next/swc-linux-x64-musl@14.2.23": + version "14.2.23" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.23.tgz#d494ebdf26421c91be65f9b1d095df0191c956d8" + integrity sha512-OSQX94sxd1gOUz3jhhdocnKsy4/peG8zV1HVaW6DLEbEmRRtUCUQZcKxUD9atLYa3RZA+YJx+WZdOnTkDuNDNA== + +"@next/swc-win32-arm64-msvc@14.2.23": + version "14.2.23" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.23.tgz#62786e7ba4822a20b6666e3e03e5a389b0e7eb3b" + integrity sha512-ezmbgZy++XpIMTcTNd0L4k7+cNI4ET5vMv/oqNfTuSXkZtSA9BURElPFyarjjGtRgZ9/zuKDHoMdZwDZIY3ehQ== + +"@next/swc-win32-ia32-msvc@14.2.23": + version "14.2.23" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.23.tgz#ef028af91e1c40a4ebba0d2c47b23c1eeb299594" + integrity sha512-zfHZOGguFCqAJ7zldTKg4tJHPJyJCOFhpoJcVxKL9BSUHScVDnMdDuOU1zPPGdOzr/GWxbhYTjyiEgLEpAoFPA== + +"@next/swc-win32-x64-msvc@14.2.23": + version "14.2.23" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.23.tgz#c81838f02f2f16a321b7533890fb63c1edec68e1" + integrity sha512-xCtq5BD553SzOgSZ7UH5LH+OATQihydObTrCTvVzOro8QiWYKdBVwcB2Mn2MLMo6DGW9yH1LSPw7jS7HhgJgjw== "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" @@ -1121,141 +1121,141 @@ resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz" integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== -"@storybook/addon-actions@7.6.4", "@storybook/addon-actions@^7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-7.6.4.tgz" - integrity sha512-91UD5KPDik74VKVioPMcbwwvDXN/non8p1wArYAHCHCmd/Pts5MJRiFueSdfomSpNjUtjtn6eSXtwpIL3XVOfQ== +"@storybook/addon-actions@7.6.20", "@storybook/addon-actions@^7.6.19": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.6.20.tgz#4264d1fba6e889f28f717ebb23c55b7d774a2f60" + integrity sha512-c/GkEQ2U9BC/Ew/IMdh+zvsh4N6y6n7Zsn2GIhJgcu9YEAa5aF2a9/pNgEGBMOABH959XE8DAOMERw/5qiLR8g== dependencies: - "@storybook/core-events" "7.6.4" + "@storybook/core-events" "7.6.20" "@storybook/global" "^5.0.0" "@types/uuid" "^9.0.1" dequal "^2.0.2" polished "^4.2.2" uuid "^9.0.0" -"@storybook/addon-backgrounds@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-7.6.4.tgz" - integrity sha512-gNy3kIkHSr+Lg/jVDHwbZjIe1po5SDGZNVe39vrJwnqGz8T1clWes9WHCL6zk/uaCDA3yUna2Nt/KlOFAWDSoQ== +"@storybook/addon-backgrounds@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-7.6.20.tgz#a84758c07b236181f2d67966a7c159d0b3bc1abb" + integrity sha512-a7ukoaXT42vpKsMxkseIeO3GqL0Zst2IxpCTq5dSlXiADrcemSF/8/oNpNW9C4L6F1Zdt+WDtECXslEm017FvQ== dependencies: "@storybook/global" "^5.0.0" memoizerific "^1.11.3" ts-dedent "^2.0.0" -"@storybook/addon-controls@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-7.6.4.tgz" - integrity sha512-k4AtZfazmD/nL3JAtLGAB7raPhkhUo0jWnaZWrahd9h1Fm13mBU/RW+JzTRhCw3Mp2HPERD7NI5Qcd2fUP6WDA== +"@storybook/addon-controls@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-7.6.20.tgz#5487064259a71f10b0aab04a4b7745ecf948e4cc" + integrity sha512-06ZT5Ce1sZW52B0s6XuokwjkKO9GqHlTUHvuflvd8wifxKlCmRvNUxjBvwh+ccGJ49ZS73LbMSLFgtmBEkCxbg== dependencies: - "@storybook/blocks" "7.6.4" + "@storybook/blocks" "7.6.20" lodash "^4.17.21" ts-dedent "^2.0.0" -"@storybook/addon-docs@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-7.6.4.tgz" - integrity sha512-PbFMbvC9sK3sGdMhwmagXs9TqopTp9FySji+L8O7W9SHRC6wSmdwoWWPWybkOYxr/z/wXi7EM0azSAX7yQxLbw== +"@storybook/addon-docs@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-7.6.20.tgz#0bff85bdbdca58c9535384a4ded69dadb2fe7e4e" + integrity sha512-XNfYRhbxH5JP7B9Lh4W06PtMefNXkfpV39Gaoih5HuqngV3eoSL4RikZYOMkvxRGQ738xc6axySU3+JKcP1OZg== dependencies: "@jest/transform" "^29.3.1" "@mdx-js/react" "^2.1.5" - "@storybook/blocks" "7.6.4" - "@storybook/client-logger" "7.6.4" - "@storybook/components" "7.6.4" - "@storybook/csf-plugin" "7.6.4" - "@storybook/csf-tools" "7.6.4" + "@storybook/blocks" "7.6.20" + "@storybook/client-logger" "7.6.20" + "@storybook/components" "7.6.20" + "@storybook/csf-plugin" "7.6.20" + "@storybook/csf-tools" "7.6.20" "@storybook/global" "^5.0.0" "@storybook/mdx2-csf" "^1.0.0" - "@storybook/node-logger" "7.6.4" - "@storybook/postinstall" "7.6.4" - "@storybook/preview-api" "7.6.4" - "@storybook/react-dom-shim" "7.6.4" - "@storybook/theming" "7.6.4" - "@storybook/types" "7.6.4" + "@storybook/node-logger" "7.6.20" + "@storybook/postinstall" "7.6.20" + "@storybook/preview-api" "7.6.20" + "@storybook/react-dom-shim" "7.6.20" + "@storybook/theming" "7.6.20" + "@storybook/types" "7.6.20" fs-extra "^11.1.0" remark-external-links "^8.0.0" remark-slug "^6.0.0" ts-dedent "^2.0.0" -"@storybook/addon-essentials@^7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-7.6.4.tgz" - integrity sha512-J+zPmP4pbuuFxQ3pjLRYQRnxEtp7jF3xRXGFO8brVnEqtqoxwJ6j3euUrRLe0rpGAU3AD7dYfaaFjd3xkENgTw== - dependencies: - "@storybook/addon-actions" "7.6.4" - "@storybook/addon-backgrounds" "7.6.4" - "@storybook/addon-controls" "7.6.4" - "@storybook/addon-docs" "7.6.4" - "@storybook/addon-highlight" "7.6.4" - "@storybook/addon-measure" "7.6.4" - "@storybook/addon-outline" "7.6.4" - "@storybook/addon-toolbars" "7.6.4" - "@storybook/addon-viewport" "7.6.4" - "@storybook/core-common" "7.6.4" - "@storybook/manager-api" "7.6.4" - "@storybook/node-logger" "7.6.4" - "@storybook/preview-api" "7.6.4" +"@storybook/addon-essentials@^7.6.19": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-7.6.20.tgz#149c22b51a7abd8977acaaf2e1941c5b5dcb2fd5" + integrity sha512-hCupSOiJDeOxJKZSgH0x5Mb2Xqii6mps21g5hpxac1XjhQtmGflShxi/xOHhK3sNqrbgTSbScfpUP3hUlZO/2Q== + dependencies: + "@storybook/addon-actions" "7.6.20" + "@storybook/addon-backgrounds" "7.6.20" + "@storybook/addon-controls" "7.6.20" + "@storybook/addon-docs" "7.6.20" + "@storybook/addon-highlight" "7.6.20" + "@storybook/addon-measure" "7.6.20" + "@storybook/addon-outline" "7.6.20" + "@storybook/addon-toolbars" "7.6.20" + "@storybook/addon-viewport" "7.6.20" + "@storybook/core-common" "7.6.20" + "@storybook/manager-api" "7.6.20" + "@storybook/node-logger" "7.6.20" + "@storybook/preview-api" "7.6.20" ts-dedent "^2.0.0" -"@storybook/addon-highlight@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-7.6.4.tgz" - integrity sha512-0kvjDzquoPwWWU61QYmEtcSGWXufnV7Z/bfBTYh132uxvV/X9YzDFcXXrxGL7sBJkK32gNUUBDuiTOxs5NxyOQ== +"@storybook/addon-highlight@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/addon-highlight/-/addon-highlight-7.6.20.tgz#d118e4cce549238d866bbbe4d49b9509afda01a7" + integrity sha512-7/x7xFdFyqCki5Dm3uBePldUs9l98/WxJ7rTHQuYqlX7kASwyN5iXPzuhmMRUhlMm/6G6xXtLabIpzwf1sFurA== dependencies: "@storybook/global" "^5.0.0" -"@storybook/addon-links@^7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-7.6.4.tgz" - integrity sha512-TEhxYdMhJO28gD84ej1FCwLv9oLuCPt77bRXip9ndaNPRTdHYdWv6IP94dhbuDi8eHux7Z4A/mllciFuDFrnCw== +"@storybook/addon-links@^7.6.19": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-7.6.20.tgz#c6bedc7bdc0112ce4cb3f1bfc701445df696598d" + integrity sha512-iomSnBD90CA4MinesYiJkFX2kb3P1Psd/a1Y0ghlFEsHD4uMId9iT6sx2s16DYMja0SlPkrbWYnGukqaCjZpRw== dependencies: "@storybook/csf" "^0.1.2" "@storybook/global" "^5.0.0" ts-dedent "^2.0.0" -"@storybook/addon-measure@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/addon-measure/-/addon-measure-7.6.4.tgz" - integrity sha512-73wsJ8PALsgWniR3MA/cmxcFuU6cRruWdIyYzOMgM8ife2Jm3xSkV7cTTXAqXt2H9Uuki4PGnuMHWWFLpPeyVA== +"@storybook/addon-measure@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-7.6.20.tgz#c764009ce3e980b5b67e462ad0de5986c38cdfab" + integrity sha512-i2Iq08bGfI7gZbG6Lb8uF/L287tnaGUR+2KFEmdBjH6+kgjWLiwfpanoPQpy4drm23ar0gUjX+L3Ri03VI5/Xg== dependencies: "@storybook/global" "^5.0.0" tiny-invariant "^1.3.1" -"@storybook/addon-outline@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/addon-outline/-/addon-outline-7.6.4.tgz" - integrity sha512-CFxGASRse/qeFocetDKFNeWZ3Aa2wapVtRciDNa4Zx7k1wCnTjEsPIm54waOuCaNVcrvO+nJUAZG5WyiorQvcg== +"@storybook/addon-outline@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-7.6.20.tgz#0ebe829b6d8d269f691a110f3b34884b1df8ee74" + integrity sha512-TdsIQZf/TcDsGoZ1XpO+9nBc4OKqcMIzY4SrI8Wj9dzyFLQ37s08gnZr9POci8AEv62NTUOVavsxcafllkzqDQ== dependencies: "@storybook/global" "^5.0.0" ts-dedent "^2.0.0" -"@storybook/addon-toolbars@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-7.6.4.tgz" - integrity sha512-ENMQJgU4sRCLLDVXYfa+P3cQVV9PC0ZxwVAKeM3NPYPNH/ODoryGNtq+Q68LwHlM4ObCE2oc9MzaQqPxloFcCw== +"@storybook/addon-toolbars@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-7.6.20.tgz#c1cd31c6a8f98d3ec4853157134ca143d065d31a" + integrity sha512-5Btg4i8ffWTDHsU72cqxC8nIv9N3E3ObJAc6k0llrmPBG/ybh3jxmRfs8fNm44LlEXaZ5qrK/petsXX3UbpIFg== -"@storybook/addon-viewport@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-7.6.4.tgz" - integrity sha512-SoTcHIoqybhYD28v7QExF1EZnl7FfxuP74VDhtze5LyMd2CbqmVnUfwewLCz/3IvCNce0GqdNyg1m6QJ7Eq1uw== +"@storybook/addon-viewport@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-7.6.20.tgz#882571f4b0f405e1cf2cfad9a1f74b30d22f9a93" + integrity sha512-i8mIw8BjLWAVHEQsOTE6UPuEGQvJDpsu1XZnOCkpfTfPMz73m+3td/PmLG7mMT2wPnLu9IZncKLCKTAZRbt/YQ== dependencies: memoizerific "^1.11.3" -"@storybook/blocks@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/blocks/-/blocks-7.6.4.tgz" - integrity sha512-iXinXXhTUBtReREP1Jifpu35DnGg7FidehjvCM8sM4E4aymfb8czdg9DdvG46T2UFUPUct36nnjIdMLWOya8Bw== +"@storybook/blocks@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/blocks/-/blocks-7.6.20.tgz#1cc142f1c238616f0f3a9f900965c651e7ee7c52" + integrity sha512-xADKGEOJWkG0UD5jbY4mBXRlmj2C+CIupDL0/hpzvLvwobxBMFPKZIkcZIMvGvVnI/Ui+tJxQxLSuJ5QsPthUw== dependencies: - "@storybook/channels" "7.6.4" - "@storybook/client-logger" "7.6.4" - "@storybook/components" "7.6.4" - "@storybook/core-events" "7.6.4" + "@storybook/channels" "7.6.20" + "@storybook/client-logger" "7.6.20" + "@storybook/components" "7.6.20" + "@storybook/core-events" "7.6.20" "@storybook/csf" "^0.1.2" - "@storybook/docs-tools" "7.6.4" + "@storybook/docs-tools" "7.6.20" "@storybook/global" "^5.0.0" - "@storybook/manager-api" "7.6.4" - "@storybook/preview-api" "7.6.4" - "@storybook/theming" "7.6.4" - "@storybook/types" "7.6.4" + "@storybook/manager-api" "7.6.20" + "@storybook/preview-api" "7.6.20" + "@storybook/theming" "7.6.20" + "@storybook/types" "7.6.20" "@types/lodash" "^4.14.167" color-convert "^2.0.1" dequal "^2.0.2" @@ -1269,57 +1269,57 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/channels@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/channels/-/channels-7.6.4.tgz" - integrity sha512-Z4PY09/Czl70ap4ObmZ4bgin+EQhPaA3HdrEDNwpnH7A9ttfEO5u5KThytIjMq6kApCCihmEPDaYltoVrfYJJA== +"@storybook/channels@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.6.20.tgz#33d8292b1b16d7f504bf751c57a792477d1c3a9e" + integrity sha512-4hkgPSH6bJclB2OvLnkZOGZW1WptJs09mhQ6j6qLjgBZzL/ZdD6priWSd7iXrmPiN5TzUobkG4P4Dp7FjkiO7A== dependencies: - "@storybook/client-logger" "7.6.4" - "@storybook/core-events" "7.6.4" + "@storybook/client-logger" "7.6.20" + "@storybook/core-events" "7.6.20" "@storybook/global" "^5.0.0" qs "^6.10.0" telejson "^7.2.0" tiny-invariant "^1.3.1" -"@storybook/client-logger@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-7.6.4.tgz" - integrity sha512-vJwMShC98tcoFruRVQ4FphmFqvAZX1FqZqjFyk6IxtFumPKTVSnXJjlU1SnUIkSK2x97rgdUMqkdI+wAv/tugQ== +"@storybook/client-logger@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.6.20.tgz#1d6e93443091cccd50e269371aa786172d0c4659" + integrity sha512-NwG0VIJQCmKrSaN5GBDFyQgTAHLNishUPLW1NrzqTDNAhfZUoef64rPQlinbopa0H4OXmlB+QxbQIb3ubeXmSQ== dependencies: "@storybook/global" "^5.0.0" -"@storybook/components@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/components/-/components-7.6.4.tgz" - integrity sha512-K5RvEObJAnX+SbGJbkM1qrZEk+VR2cUhRCSrFnlfMwsn8/60T3qoH7U8bCXf8krDgbquhMwqev5WzDB+T1VV8g== +"@storybook/components@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-7.6.20.tgz#09d044923142d2e087a1c4a43dec6731a42d2871" + integrity sha512-0d8u4m558R+W5V+rseF/+e9JnMciADLXTpsILrG+TBhwECk0MctIWW18bkqkujdCm8kDZr5U2iM/5kS1Noy7Ug== dependencies: "@radix-ui/react-select" "^1.2.2" "@radix-ui/react-toolbar" "^1.0.4" - "@storybook/client-logger" "7.6.4" + "@storybook/client-logger" "7.6.20" "@storybook/csf" "^0.1.2" "@storybook/global" "^5.0.0" - "@storybook/theming" "7.6.4" - "@storybook/types" "7.6.4" + "@storybook/theming" "7.6.20" + "@storybook/types" "7.6.20" memoizerific "^1.11.3" use-resize-observer "^9.1.0" util-deprecate "^1.0.2" -"@storybook/core-client@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/core-client/-/core-client-7.6.4.tgz" - integrity sha512-0msqdGd+VYD1dRgAJ2StTu4d543Wveb7LVVujX3PwD/QCxmCaVUHuAoZrekM/H7jZLw546ZIbLZo0xWrADAUMw== +"@storybook/core-client@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.6.20.tgz#831681d64194e4d604a859ed3eb452981f6824c5" + integrity sha512-upQuQQinLmlOPKcT8yqXNtwIucZ4E4qegYZXH5HXRWoLAL6GQtW7sUVSIuFogdki8OXRncr/dz8OA+5yQyYS4w== dependencies: - "@storybook/client-logger" "7.6.4" - "@storybook/preview-api" "7.6.4" + "@storybook/client-logger" "7.6.20" + "@storybook/preview-api" "7.6.20" -"@storybook/core-common@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/core-common/-/core-common-7.6.4.tgz" - integrity sha512-qes4+mXqINu0kCgSMFjk++GZokmYjb71esId0zyJsk0pcIPkAiEjnhbSEQkMhbUfcvO1lztoaQTBW2P7Rd1tag== +"@storybook/core-common@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.6.20.tgz#3a2a3ae570bd13dc34726178c0eb36cf6a64e2a4" + integrity sha512-8H1zPWPjcmeD4HbDm4FDD0WLsfAKGVr566IZ4hG+h3iWVW57II9JW9MLBtiR2LPSd8u7o0kw64lwRGmtCO1qAw== dependencies: - "@storybook/core-events" "7.6.4" - "@storybook/node-logger" "7.6.4" - "@storybook/types" "7.6.4" + "@storybook/core-events" "7.6.20" + "@storybook/node-logger" "7.6.20" + "@storybook/types" "7.6.20" "@types/find-cache-dir" "^3.2.1" "@types/node" "^18.0.0" "@types/node-fetch" "^2.6.4" @@ -1341,32 +1341,32 @@ resolve-from "^5.0.0" ts-dedent "^2.0.0" -"@storybook/core-events@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/core-events/-/core-events-7.6.4.tgz" - integrity sha512-i3xzcJ19ILSy4oJL5Dz9y0IlyApynn5RsGhAMIsW+mcfri+hGfeakq1stNCo0o7jW4Y3A7oluFTtIoK8DOxQdQ== +"@storybook/core-events@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.6.20.tgz#6648d661d1c96841a4c2a710a35759b01b6a06a1" + integrity sha512-tlVDuVbDiNkvPDFAu+0ou3xBBYbx9zUURQz4G9fAq0ScgBOs/bpzcRrFb4mLpemUViBAd47tfZKdH4MAX45KVQ== dependencies: ts-dedent "^2.0.0" -"@storybook/csf-plugin@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-7.6.4.tgz" - integrity sha512-7g9p8s2ITX+Z9iThK5CehPhJOcusVN7JcUEEW+gVF5PlYT+uk/x+66gmQno+scQuNkV9+8UJD6RLFjP+zg2uCA== +"@storybook/csf-plugin@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-7.6.20.tgz#0e79e58d5ed47dfb472b1dc202b0e754c21ec33b" + integrity sha512-dzBzq0dN+8WLDp6NxYS4G7BCe8+vDeDRBRjHmM0xb0uJ6xgQViL8SDplYVSGnk3bXE/1WmtvyRzQyTffBnaj9Q== dependencies: - "@storybook/csf-tools" "7.6.4" + "@storybook/csf-tools" "7.6.20" unplugin "^1.3.1" -"@storybook/csf-tools@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-7.6.4.tgz" - integrity sha512-6sLayuhgReIK3/QauNj5BW4o4ZfEMJmKf+EWANPEM/xEOXXqrog6Un8sjtBuJS9N1DwyhHY6xfkEiPAwdttwqw== +"@storybook/csf-tools@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-7.6.20.tgz#fdd9fa9459720a627e83e31d3839721dbc655f22" + integrity sha512-rwcwzCsAYh/m/WYcxBiEtLpIW5OH1ingxNdF/rK9mtGWhJxXRDV8acPkFrF8rtFWIVKoOCXu5USJYmc3f2gdYQ== dependencies: "@babel/generator" "^7.23.0" "@babel/parser" "^7.23.0" "@babel/traverse" "^7.23.2" "@babel/types" "^7.23.0" "@storybook/csf" "^0.1.2" - "@storybook/types" "7.6.4" + "@storybook/types" "7.6.20" fs-extra "^11.1.0" recast "^0.23.1" ts-dedent "^2.0.0" @@ -1378,14 +1378,14 @@ dependencies: type-fest "^2.19.0" -"@storybook/docs-tools@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/docs-tools/-/docs-tools-7.6.4.tgz" - integrity sha512-2eGam43aD7O3cocA72Z63kRi7t/ziMSpst0qB218QwBWAeZjT4EYDh8V6j/Xhv6zVQL3msW7AglrQP5kCKPvPA== +"@storybook/docs-tools@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.6.20.tgz#2a6dd402c880e24ec6bec8411beee89cfe69f932" + integrity sha512-Bw2CcCKQ5xGLQgtexQsI1EGT6y5epoFzOINi0FSTGJ9Wm738nRp5LH3dLk1GZLlywIXcYwOEThb2pM+pZeRQxQ== dependencies: - "@storybook/core-common" "7.6.4" - "@storybook/preview-api" "7.6.4" - "@storybook/types" "7.6.4" + "@storybook/core-common" "7.6.20" + "@storybook/preview-api" "7.6.20" + "@storybook/types" "7.6.20" "@types/doctrine" "^0.0.3" assert "^2.1.0" doctrine "^3.0.0" @@ -1396,23 +1396,22 @@ resolved "https://registry.npmjs.org/@storybook/global/-/global-5.0.0.tgz" integrity sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ== -"@storybook/manager-api@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-7.6.4.tgz" - integrity sha512-RFb/iaBJfXygSgXkINPRq8dXu7AxBicTGX7MxqKXbz5FU7ANwV7abH6ONBYURkSDOH9//TQhRlVkF5u8zWg3bw== +"@storybook/manager-api@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.6.20.tgz#225ff7dea3dbdb2e82bb5568babdaace4071c32e" + integrity sha512-gOB3m8hO3gBs9cBoN57T7jU0wNKDh+hi06gLcyd2awARQlAlywnLnr3s1WH5knih6Aq+OpvGBRVKkGLOkaouCQ== dependencies: - "@storybook/channels" "7.6.4" - "@storybook/client-logger" "7.6.4" - "@storybook/core-events" "7.6.4" + "@storybook/channels" "7.6.20" + "@storybook/client-logger" "7.6.20" + "@storybook/core-events" "7.6.20" "@storybook/csf" "^0.1.2" "@storybook/global" "^5.0.0" - "@storybook/router" "7.6.4" - "@storybook/theming" "7.6.4" - "@storybook/types" "7.6.4" + "@storybook/router" "7.6.20" + "@storybook/theming" "7.6.20" + "@storybook/types" "7.6.20" dequal "^2.0.2" lodash "^4.17.21" memoizerific "^1.11.3" - semver "^7.3.7" store2 "^2.14.2" telejson "^7.2.0" ts-dedent "^2.0.0" @@ -1422,27 +1421,27 @@ resolved "https://registry.npmjs.org/@storybook/mdx2-csf/-/mdx2-csf-1.1.0.tgz" integrity sha512-TXJJd5RAKakWx4BtpwvSNdgTDkKM6RkXU8GK34S/LhidQ5Pjz3wcnqb0TxEkfhK/ztbP8nKHqXFwLfa2CYkvQw== -"@storybook/node-logger@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-7.6.4.tgz" - integrity sha512-GDkEnnDj4Op+PExs8ZY/P6ox3wg453CdEIaR8PR9TxF/H/T2fBL6puzma3hN2CMam6yzfAL8U+VeIIDLQ5BZdQ== +"@storybook/node-logger@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.6.20.tgz#c0ca90cf68cf31d84cdcf53c76cec22769407ece" + integrity sha512-l2i4qF1bscJkOplNffcRTsgQWYR7J51ewmizj5YrTM8BK6rslWT1RntgVJWB1RgPqvx6VsCz1gyP3yW1oKxvYw== -"@storybook/postinstall@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/postinstall/-/postinstall-7.6.4.tgz" - integrity sha512-7uoB82hSzlFSdDMS3hKQD+AaeSvPit/fAMvXCBxn0/D0UGJUZcq4M9JcKBwEHkZJcbuDROgOTJ6TUeXi/FWO0w== +"@storybook/postinstall@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-7.6.20.tgz#5a77ce7913375b11bd7c72388798854bd8507b91" + integrity sha512-AN4WPeNma2xC2/K/wP3I/GMbBUyeSGD3+86ZFFJFO1QmE/Zea6E+1aVlTd1iKHQUcNkZ9bZTrqkhPGVYx10pIw== -"@storybook/preview-api@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-7.6.4.tgz" - integrity sha512-KhisNdQX5NdfAln+spLU4B82d804GJQp/CnI5M1mm/taTnjvMgs/wTH9AmR89OPoq+tFZVW0vhy2zgPS3ar71A== +"@storybook/preview-api@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.6.20.tgz#688a435ee2cfe57eeb1e3053c18025a9e0a03bbb" + integrity sha512-3ic2m9LDZEPwZk02wIhNc3n3rNvbi7VDKn52hDXfAxnL5EYm7yDICAkaWcVaTfblru2zn0EDJt7ROpthscTW5w== dependencies: - "@storybook/channels" "7.6.4" - "@storybook/client-logger" "7.6.4" - "@storybook/core-events" "7.6.4" + "@storybook/channels" "7.6.20" + "@storybook/client-logger" "7.6.20" + "@storybook/core-events" "7.6.20" "@storybook/csf" "^0.1.2" "@storybook/global" "^5.0.0" - "@storybook/types" "7.6.4" + "@storybook/types" "7.6.20" "@types/qs" "^6.9.5" dequal "^2.0.2" lodash "^4.17.21" @@ -1452,23 +1451,23 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/react-dom-shim@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-7.6.4.tgz" - integrity sha512-wGJfomlDEBnowNmhmumWDu/AcUInxSoPqUUJPgk2f5oL0EW17fR9fDP/juG3XOEdieMDM0jDX48GML7lyvL2fg== +"@storybook/react-dom-shim@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.6.20.tgz#20b902663474b731c22b211ec29c7fd0e86b4b7f" + integrity sha512-SRvPDr9VWcS24ByQOVmbfZ655y5LvjXRlsF1I6Pr9YZybLfYbu3L5IicfEHT4A8lMdghzgbPFVQaJez46DTrkg== -"@storybook/react@^7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/react/-/react-7.6.4.tgz" - integrity sha512-XYRP+eylH3JqkCuziwtQGY5vOCeDreOibRYJmj5na6k4QbURjGVB44WCIW04gWVlmBXM9SqLAmserUi3HP890Q== +"@storybook/react@^7.6.19": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.6.20.tgz#e326969851b96e9a6bea6fdd81f624de052ddbb6" + integrity sha512-i5tKNgUbTNwlqBWGwPveDhh9ktlS0wGtd97A1ZgKZc3vckLizunlAFc7PRC1O/CMq5PTyxbuUb4RvRD2jWKwDA== dependencies: - "@storybook/client-logger" "7.6.4" - "@storybook/core-client" "7.6.4" - "@storybook/docs-tools" "7.6.4" + "@storybook/client-logger" "7.6.20" + "@storybook/core-client" "7.6.20" + "@storybook/docs-tools" "7.6.20" "@storybook/global" "^5.0.0" - "@storybook/preview-api" "7.6.4" - "@storybook/react-dom-shim" "7.6.4" - "@storybook/types" "7.6.4" + "@storybook/preview-api" "7.6.20" + "@storybook/react-dom-shim" "7.6.20" + "@storybook/types" "7.6.20" "@types/escodegen" "^0.0.6" "@types/estree" "^0.0.51" "@types/node" "^18.0.0" @@ -1484,31 +1483,31 @@ type-fest "~2.19" util-deprecate "^1.0.2" -"@storybook/router@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/router/-/router-7.6.4.tgz" - integrity sha512-5MQ7Z4D7XNPN2yhFgjey7hXOYd6s8CggUqeAwhzGTex90SMCkKHSz1hfkcXn1ZqBPaall2b53uK553OvPLp9KQ== +"@storybook/router@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-7.6.20.tgz#ffa6a3ba1790e86f1d2364c27d3511f7975742a6" + integrity sha512-mCzsWe6GrH47Xb1++foL98Zdek7uM5GhaSlrI7blWVohGa0qIUYbfJngqR4ZsrXmJeeEvqowobh+jlxg3IJh+w== dependencies: - "@storybook/client-logger" "7.6.4" + "@storybook/client-logger" "7.6.20" memoizerific "^1.11.3" qs "^6.10.0" -"@storybook/theming@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/theming/-/theming-7.6.4.tgz" - integrity sha512-Z/dcC5EpkIXelYCkt9ojnX6D7qGOng8YHxV/OWlVE9TrEGYVGPOEfwQryR0RhmGpDha1TYESLYrsDb4A8nJ1EA== +"@storybook/theming@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.6.20.tgz#c932cd82c27314979d22d0e7867268e301f5f97c" + integrity sha512-iT1pXHkSkd35JsCte6Qbanmprx5flkqtSHC6Gi6Umqoxlg9IjiLPmpHbaIXzoC06DSW93hPj5Zbi1lPlTvRC7Q== dependencies: "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0" - "@storybook/client-logger" "7.6.4" + "@storybook/client-logger" "7.6.20" "@storybook/global" "^5.0.0" memoizerific "^1.11.3" -"@storybook/types@7.6.4": - version "7.6.4" - resolved "https://registry.npmjs.org/@storybook/types/-/types-7.6.4.tgz" - integrity sha512-qyiiXPCvol5uVgfubcIMzJBA0awAyFPU+TyUP1mkPYyiTHnsHYel/mKlSdPjc8a97N3SlJXHOCx41Hde4IyJgg== +"@storybook/types@7.6.20": + version "7.6.20" + resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.6.20.tgz#b8d62b30914b35e6750b1f4937da532432f02890" + integrity sha512-GncdY3x0LpbhmUAAJwXYtJDUQEwfF175gsjH0/fxPkxPoV7Sef9TM41jQLJW/5+6TnZoCZP/+aJZTJtq3ni23Q== dependencies: - "@storybook/channels" "7.6.4" + "@storybook/channels" "7.6.20" "@types/babel__core" "^7.0.0" "@types/express" "^4.7.0" file-system-cache "2.3.0" @@ -4500,12 +4499,12 @@ neo-async@^2.6.2: resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -next@^14.2.15: - version "14.2.15" - resolved "https://registry.yarnpkg.com/next/-/next-14.2.15.tgz#348e5603e22649775d19c785c09a89c9acb5189a" - integrity sha512-h9ctmOokpoDphRvMGnwOJAedT6zKhwqyZML9mDtspgf4Rh3Pn7UTYKqePNoDvhsWBAO5GoPNYshnAUGIazVGmw== +next@^14.2.23: + version "14.2.23" + resolved "https://registry.yarnpkg.com/next/-/next-14.2.23.tgz#37edc9a4d42c135fd97a4092f829e291e2e7c943" + integrity sha512-mjN3fE6u/tynneLiEg56XnthzuYw+kD7mCujgVqioxyPqbmiotUCGJpIZGS/VaPg3ZDT1tvWxiVyRzeqJFm/kw== dependencies: - "@next/env" "14.2.15" + "@next/env" "14.2.23" "@swc/helpers" "0.5.5" busboy "1.6.0" caniuse-lite "^1.0.30001579" @@ -4513,15 +4512,15 @@ next@^14.2.15: postcss "8.4.31" styled-jsx "5.1.1" optionalDependencies: - "@next/swc-darwin-arm64" "14.2.15" - "@next/swc-darwin-x64" "14.2.15" - "@next/swc-linux-arm64-gnu" "14.2.15" - "@next/swc-linux-arm64-musl" "14.2.15" - "@next/swc-linux-x64-gnu" "14.2.15" - "@next/swc-linux-x64-musl" "14.2.15" - "@next/swc-win32-arm64-msvc" "14.2.15" - "@next/swc-win32-ia32-msvc" "14.2.15" - "@next/swc-win32-x64-msvc" "14.2.15" + "@next/swc-darwin-arm64" "14.2.23" + "@next/swc-darwin-x64" "14.2.23" + "@next/swc-linux-arm64-gnu" "14.2.23" + "@next/swc-linux-arm64-musl" "14.2.23" + "@next/swc-linux-x64-gnu" "14.2.23" + "@next/swc-linux-x64-musl" "14.2.23" + "@next/swc-win32-arm64-msvc" "14.2.23" + "@next/swc-win32-ia32-msvc" "14.2.23" + "@next/swc-win32-x64-msvc" "14.2.23" node-fetch@^2.0.0: version "2.7.0" @@ -5359,7 +5358,7 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.3.7, semver@^7.5.4: +semver@^7.5.4: version "7.5.4" resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== From c47fd5cdc0298e548d340315945fd2c91ec7a4a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 11:34:27 +0100 Subject: [PATCH 09/14] Bump store2 in /components/inspectit-ocelot-configurationserver-ui (#1684) Bumps [store2](https://github.com/nbubna/store) from 2.14.2 to 2.14.4. - [Commits](https://github.com/nbubna/store/compare/2.14.2...2.14.4) --- updated-dependencies: - dependency-name: store2 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../inspectit-ocelot-configurationserver-ui/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/inspectit-ocelot-configurationserver-ui/yarn.lock b/components/inspectit-ocelot-configurationserver-ui/yarn.lock index 81905bc3ed..f984c1b9a0 100644 --- a/components/inspectit-ocelot-configurationserver-ui/yarn.lock +++ b/components/inspectit-ocelot-configurationserver-ui/yarn.lock @@ -5466,9 +5466,9 @@ sprintf-js@~1.0.2: integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== store2@^2.14.2: - version "2.14.2" - resolved "https://registry.npmjs.org/store2/-/store2-2.14.2.tgz" - integrity sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w== + version "2.14.4" + resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.4.tgz#81b313abaddade4dcd7570c5cc0e3264a8f7a242" + integrity sha512-srTItn1GOvyvOycgxjAnPA63FZNwy0PTyUBFMHRM+hVFltAeoh0LmNBz9SZqUS9mMqGk8rfyWyXn3GH5ReJ8Zw== streamsearch@^1.1.0: version "1.1.0" From e8bffc1233827dc93f817ba6ca87fa664c67eac9 Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Tue, 4 Feb 2025 11:50:32 +0100 Subject: [PATCH 10/14] fix configsdocsgenerator --- .github/workflows/configdocsgenerator_test.yml | 6 +++--- .github/workflows/configurationserver_test.yml | 2 +- .../inspectit-ocelot-configdocsgenerator/build.gradle | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/configdocsgenerator_test.yml b/.github/workflows/configdocsgenerator_test.yml index 7c199e307d..83893da1a3 100644 --- a/.github/workflows/configdocsgenerator_test.yml +++ b/.github/workflows/configdocsgenerator_test.yml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest env: working-directory: ./components/inspectit-ocelot-configdocsgenerator - container: openjdk:8-jdk + container: eclipse-temurin:17 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: test @@ -28,7 +28,7 @@ jobs: dependency-scan: name: Dependency Scan runs-on: ubuntu-latest - container: openjdk:8-jdk + container: eclipse-temurin:17 steps: - uses: actions/checkout@v3 - name: Grant execute permission for gradlew diff --git a/.github/workflows/configurationserver_test.yml b/.github/workflows/configurationserver_test.yml index e5074432ae..6bfdf97931 100644 --- a/.github/workflows/configurationserver_test.yml +++ b/.github/workflows/configurationserver_test.yml @@ -20,7 +20,7 @@ jobs: working-directory: ./components/inspectit-ocelot-configurationserver container: eclipse-temurin:17 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: assemble diff --git a/components/inspectit-ocelot-configdocsgenerator/build.gradle b/components/inspectit-ocelot-configdocsgenerator/build.gradle index 42e14cbc94..e1b357890f 100644 --- a/components/inspectit-ocelot-configdocsgenerator/build.gradle +++ b/components/inspectit-ocelot-configdocsgenerator/build.gradle @@ -11,6 +11,7 @@ dependencies { configServerLibs.orgMockitoMockitoJunitJupiter, configServerLibs.comGoogleGuava, + libs.ioOpentelemetryOpentelemetryApi, libs.orgAssertjAssertjCore, ) From 47a9dd229b852c4bfe12c05846dfe40dff6572b5 Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Tue, 4 Feb 2025 12:33:05 +0100 Subject: [PATCH 11/14] fix gradle setup --- .../build.gradle | 14 +++++--------- settings.gradle | 8 ++++---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/components/inspectit-ocelot-configdocsgenerator/build.gradle b/components/inspectit-ocelot-configdocsgenerator/build.gradle index e1b357890f..f59daf245e 100644 --- a/components/inspectit-ocelot-configdocsgenerator/build.gradle +++ b/components/inspectit-ocelot-configdocsgenerator/build.gradle @@ -1,9 +1,7 @@ plugins { - // Apply the application plugin to add support for building a CLI application in Java. - id 'application' alias(configServerLibs.plugins.orgSpringframeworkBoot) + alias(configServerLibs.plugins.ioSpringDependencyManagement) } -apply plugin: 'io.spring.dependency-management' dependencies { testImplementation( @@ -31,13 +29,11 @@ dependencies { annotationProcessor libs.orgProjectlombokLombok } -application { - mainClass = 'inspectit.ocelot.configuration.docs.App' -} - test { useJUnitPlatform() } -sourceCompatibility = 17 -targetCompatibility = 17 +java { + sourceCompatibility = 17 + targetCompatibility = 17 +} diff --git a/settings.gradle b/settings.gradle index 408947dbee..be3b2adc21 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,17 +4,17 @@ include 'inspectit-ocelot-core' include "inspectit-ocelot-agent" include 'inspectit-ocelot-documentation' include 'inspectit-ocelot-sdk' -include 'inspectit-ocelot-configdocsgenerator' -project(':inspectit-ocelot-configdocsgenerator').projectDir = new File('./components/inspectit-ocelot-configdocsgenerator') println("Current Java version: " + JavaVersion.current()) if(JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { include 'inspectit-ocelot-configurationserver' include 'inspectit-ocelot-configurationserver-ui' + include 'inspectit-ocelot-configdocsgenerator' project(':inspectit-ocelot-configurationserver').projectDir = new File('./components/inspectit-ocelot-configurationserver') project(':inspectit-ocelot-configurationserver-ui').projectDir = new File('./components/inspectit-ocelot-configurationserver-ui') + project(':inspectit-ocelot-configdocsgenerator').projectDir = new File('./components/inspectit-ocelot-configdocsgenerator') - // seperate version catalog for configurationServer until everything is migrated to Java17 + // separate version catalog for configuration server until everything is migrated to Java 17 dependencyResolutionManagement { versionCatalogs { configServerLibs { @@ -22,4 +22,4 @@ if(JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { } } } -} \ No newline at end of file +} From 069505f42fc2d90647b489d5f03d95037ce2f06e Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Tue, 4 Feb 2025 12:41:50 +0100 Subject: [PATCH 12/14] fix configdocsgenerator again --- components/inspectit-ocelot-configdocsgenerator/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/inspectit-ocelot-configdocsgenerator/build.gradle b/components/inspectit-ocelot-configdocsgenerator/build.gradle index f59daf245e..66f3cc9ce3 100644 --- a/components/inspectit-ocelot-configdocsgenerator/build.gradle +++ b/components/inspectit-ocelot-configdocsgenerator/build.gradle @@ -29,6 +29,9 @@ dependencies { annotationProcessor libs.orgProjectlombokLombok } +// there is no main class here +bootJar.enabled = false + test { useJUnitPlatform() } From 16e7c4b30a38f10d37bda99477f515364bff3cc9 Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Tue, 4 Feb 2025 12:48:37 +0100 Subject: [PATCH 13/14] revert protobuf --- gradle/libs.versions.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a6e1ba4e25..2bfb44b7b2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -35,7 +35,8 @@ comFasterxmlJacksonCoreJacksonDatabind = "com.fasterxml.jackson.core:jackson-dat comGithubTomakehurstWiremockJre8 = "com.github.tomakehurst:wiremock-jre8:2.35.2" comGoogleGuava = { module = "com.google.guava:guava", version = { strictly = "33.4.0-jre" } } # @pin protobuf 4.* is not running -comGoogleProtobufProtobufJavaUtil = "com.google.protobuf:protobuf-java-util:3.25.6" +# Note: 3.25.6 breaks tests +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" } From 5741a8d88ce6e53daffa1df4e03c5ed0ebc70f92 Mon Sep 17 00:00:00 2001 From: EddeCCC Date: Tue, 4 Feb 2025 16:11:54 +0100 Subject: [PATCH 14/14] update lodash --- .../inspectit-ocelot-configurationserver-ui/yarn.lock | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/inspectit-ocelot-configurationserver-ui/yarn.lock b/components/inspectit-ocelot-configurationserver-ui/yarn.lock index f984c1b9a0..892561a071 100644 --- a/components/inspectit-ocelot-configurationserver-ui/yarn.lock +++ b/components/inspectit-ocelot-configurationserver-ui/yarn.lock @@ -4318,11 +4318,16 @@ lodash.merge@^4.6.2: resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash@^4.17.19, lodash@^4.17.21: +lodash@^4.17.19: version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== +lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"