diff --git a/.github/scripts/run-oats-tests.sh b/.github/scripts/run-oats-tests.sh index 2dcfd34c13..eaa24a2fc0 100755 --- a/.github/scripts/run-oats-tests.sh +++ b/.github/scripts/run-oats-tests.sh @@ -12,4 +12,4 @@ cd oats/yaml go install github.com/onsi/ginkgo/v2/ginkgo@latest export TESTCASE_TIMEOUT=5m export TESTCASE_BASE_PATH=../.. -ginkgo -r +ginkgo -r --github-output diff --git a/logging-k8s-stdout-otlp-json/build.gradle.kts b/logging-k8s-stdout-otlp-json/build.gradle.kts index bf8ba3aa7a..3dc58af245 100644 --- a/logging-k8s-stdout-otlp-json/build.gradle.kts +++ b/logging-k8s-stdout-otlp-json/build.gradle.kts @@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("java") - id("org.springframework.boot") version "3.4.0" + id("org.springframework.boot") version "3.4.1" } description = "OpenTelemetry Example for Java Agent with Stdout logging" diff --git a/logging-k8s-stdout-otlp-json/oats.yaml b/logging-k8s-stdout-otlp-json/oats.yaml index cd009c18de..dcb31d62e8 100644 --- a/logging-k8s-stdout-otlp-json/oats.yaml +++ b/logging-k8s-stdout-otlp-json/oats.yaml @@ -24,7 +24,6 @@ expected: service_version: 1.1 severity_number: 17 severity_text: SEVERE - exception_stacktrace: "java.lang.RuntimeException: simulating an error\n\tat com.grafana.example.RollController.index(RollController.java:21)\n\tat java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(Unknown Source)\n\tat java.base/java.lang.reflect.Method.invoke(Unknown Source)\n\tat org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:255)\n\tat org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:188)\n\tat org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:118)\n\tat org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:986)\n\tat org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:891)\n\tat org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\n\tat org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1088)\n\tat org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:978)\n\tat org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1014)\n\tat org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:903)\n\tat jakarta.servlet.http.HttpServlet.service(HttpServlet.java:564)\n\tat org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:885)\n\tat jakarta.servlet.http.HttpServlet.service(HttpServlet.java:658)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:195)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)\n\tat org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:51)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)\n\tat org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)\n\tat org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)\n\tat org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)\n\tat org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)\n\tat org.springframework.web.servlet.v6_0.OpenTelemetryHandlerMappingFilter.doFilter(OpenTelemetryHandlerMappingFilter.java:78)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)\n\tat org.springframework.web.filter.ServerHttpObservationFilter.doFilterInternal(ServerHttpObservationFilter.java:114)\n\tat org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)\n\tat org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)\n\tat org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)\n\tat org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:167)\n\tat org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:90)\n\tat org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:483)\n\tat org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:115)\n\tat org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:93)\n\tat org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\n\tat org.apache.catalina.valves.RemoteIpValve.invoke(RemoteIpValve.java:731)\n\tat org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:344)\n\tat org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:397)\n\tat org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:63)\n\tat org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:905)\n\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1741)\n\tat org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:52)\n\tat org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1190)\n\tat org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659)\n\tat org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:63)\n\tat java.base/java.lang.Thread.run(Unknown Source)\n" attribute-regexp: flags: ".*" # from loki detected_level: ".*" # from loki @@ -49,6 +48,7 @@ expected: telemetry_sdk_language: ".*" telemetry_sdk_name: ".*" telemetry_sdk_version: ".*" + exception_stacktrace: "java\\.lang\\.RuntimeException: simulating an error\n\tat io\\.opentelemetry\\.example\\.RollController\\.index\\(RollController\\.java:21\\)\n\t.*\n" no-extra-attributes: true diff --git a/logging-k8s-stdout-otlp-json/src/main/java/com/grafana/example/RollController.java b/logging-k8s-stdout-otlp-json/src/main/java/io/opentelemetry/example/RollController.java similarity index 97% rename from logging-k8s-stdout-otlp-json/src/main/java/com/grafana/example/RollController.java rename to logging-k8s-stdout-otlp-json/src/main/java/io/opentelemetry/example/RollController.java index 99f4ac3a1e..1fcc3dc015 100644 --- a/logging-k8s-stdout-otlp-json/src/main/java/com/grafana/example/RollController.java +++ b/logging-k8s-stdout-otlp-json/src/main/java/io/opentelemetry/example/RollController.java @@ -1,4 +1,4 @@ -package com.grafana.example; +package io.opentelemetry.example; import java.util.Optional; import java.util.Random; diff --git a/logging-k8s-stdout-otlp-json/src/main/java/com/grafana/example/SpringBootApp.java b/logging-k8s-stdout-otlp-json/src/main/java/io/opentelemetry/example/SpringBootApp.java similarity index 91% rename from logging-k8s-stdout-otlp-json/src/main/java/com/grafana/example/SpringBootApp.java rename to logging-k8s-stdout-otlp-json/src/main/java/io/opentelemetry/example/SpringBootApp.java index f375c0126a..061af22572 100644 --- a/logging-k8s-stdout-otlp-json/src/main/java/com/grafana/example/SpringBootApp.java +++ b/logging-k8s-stdout-otlp-json/src/main/java/io/opentelemetry/example/SpringBootApp.java @@ -1,4 +1,4 @@ -package com.grafana.example; +package io.opentelemetry.example; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;