Rework otel crud storage

README.md

@@ -256,6 +256,14 @@ To work with Jaeger, you can run the following command:
 
 `docker run --rm -e COLLECTOR_ZIPKIN_HOST_PORT=:9411 -p 16686:16686 -p 4317:4317 -p 4318:4318 -p 9411:9411 jaegertracing/all-in-one:latest`
 
+You'll need to uncomment or add:
+
+```
+<property name="openTelemetryEndpoint" ref="openTelemetryEndpoint"/>
+```
+
+In the testTool bean.
+
 To choose between one of the collectors in the Ladybug application, there is a bean available to make your choice. You have to add the following and change the string value of this bean to the collector you want to use. For Zipkin, enter the endpoint in the string value. For Jaeger (which doesn't use a endpoint), you can just enter "jaeger":
 ```
 <bean name="openTelemetryEndpoint" class="java.lang.String">

ladybug-backend-jaxrs/pom.xml

@@ -45,5 +45,23 @@
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>4.34.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java-util</artifactId>
+      <version>4.34.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.opentelemetry.proto</groupId>
+      <artifactId>opentelemetry-proto</artifactId>
+      <version>1.9.0-alpha</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>

ladybug-backend-jaxrs/src/main/java/org/wearefrank/ladybug/web/jaxrs/ApiAuthorizationFilter.java

@@ -125,7 +125,7 @@ public void setTesterRoles(List<String> testerRoles) {
 
 	public void setWebServiceRoles(List<String> webServiceRoles) {
 		if (constructorDone) log.info("Set web service roles");
-		addConfigurationPart("POST/" + Constants.LADYBUG_API_PATH + "/collector/.*$", webServiceRoles);
+		addConfigurationPart("POST/" + Constants.LADYBUG_API_PATH + "/traces/.*$", webServiceRoles);
 	}
 
 	public void setLadybugApiRoles(Map<String, List<String>> ladybugApiRoles) {

ladybug-backend-jaxrs/src/main/java/org/wearefrank/ladybug/web/jaxrs/api/TracingApi.java

@@ -0,0 +1,87 @@
+/*
+   Copyright 2021-2026 WeAreFrank!
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+package org.wearefrank.ladybug.web.jaxrs.api;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.util.JsonFormat;
+import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
+import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse;
+import io.opentelemetry.proto.trace.v1.ResourceSpans;
+import io.opentelemetry.proto.trace.v1.ScopeSpans;
+import io.opentelemetry.proto.trace.v1.Span;
+import jakarta.annotation.PostConstruct;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.wearefrank.ladybug.SpanBuffer;
+import org.wearefrank.ladybug.web.common.TracingApiImpl;
+import org.wearefrank.ladybug.web.common.Constants;
+
+@Path("/" + Constants.LADYBUG_API_PATH + "/traces")
+public class TracingApi extends ApiBase {
+    private SpanBuffer spanBuffer;
+
+    @Autowired
+    private @Setter TracingApiImpl delegate;
+
+    @PostConstruct
+    public void init() {
+        spanBuffer = new SpanBuffer(delegate);
+    }
+
+    @POST
+    @Consumes({"application/x-protobuf", "application/json"})
+    public Response receiveSpans(@HeaderParam("Content-Type") String contentType, byte[] data) throws InvalidProtocolBufferException {
+        ExportTraceServiceRequest request;
+
+        if (contentType != null && contentType.startsWith("application/x-protobuf")) {
+            request = ExportTraceServiceRequest.parseFrom(data);
+        } else if (contentType != null && contentType.startsWith("application/json")) {
+            String json = new String(data);
+            ExportTraceServiceRequest.Builder builder = ExportTraceServiceRequest.newBuilder();
+            JsonFormat.parser().merge(json, builder);
+            request = builder.build();
+        } else {
+            ExportTraceServiceResponse response = ExportTraceServiceResponse.newBuilder().build();
+            return Response.status(Response.Status.UNSUPPORTED_MEDIA_TYPE)
+                    .type(MediaType.APPLICATION_JSON)
+                    .entity(JsonFormat.printer().print(response))
+                    .build();
+        }
+
+        for (ResourceSpans resourceSpans : request.getResourceSpansList()) {
+            for (ScopeSpans scopeSpans : resourceSpans.getScopeSpansList()) {
+                for (Span span : scopeSpans.getSpansList()) {
+                    spanBuffer.addSpan(span);
+                }
+            }
+        }
+
+        ExportTraceServiceResponse response = ExportTraceServiceResponse.newBuilder().build();
+        if (contentType.startsWith("application/x-protobuf")) {
+            return Response.ok(response.toByteArray())
+                    .type("application/x-protobuf")
+                    .build();
+        } else {
+            return Response.ok(JsonFormat.printer().print(response))
+                    .type(MediaType.APPLICATION_JSON)
+                    .build();
+        }
+    }
+}

ladybug-backend-springmvc/pom.xml

@@ -21,7 +21,6 @@
       <groupId>org.wearefrank</groupId>
       <artifactId>ladybug-common</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
@@ -50,5 +49,23 @@
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>4.34.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java-util</artifactId>
+      <version>4.34.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.opentelemetry.proto</groupId>
+      <artifactId>opentelemetry-proto</artifactId>
+      <version>1.9.0-alpha</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>

ladybug-backend-springmvc/src/main/java/org/wearefrank/ladybug/web/springmvc/api/TracingApi.java

@@ -0,0 +1,75 @@
+/*
+   Copyright 2025, 2026 WeAreFrank!
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+package org.wearefrank.ladybug.web.springmvc.api;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.util.JsonFormat;
+import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
+import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse;
+import io.opentelemetry.proto.trace.v1.ResourceSpans;
+import io.opentelemetry.proto.trace.v1.ScopeSpans;
+import jakarta.annotation.security.RolesAllowed;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.wearefrank.ladybug.web.common.TracingApiImpl;
+
+@RestController
+@RequestMapping("/traces")
+@RolesAllowed("IbisWebService")
+public class TracingApi {
+	@Autowired
+	private @Setter TracingApiImpl delegate;
+
+	@PostMapping(consumes = {"application/x-protobuf", MediaType.APPLICATION_JSON_VALUE})
+	public ResponseEntity<?> receiveSpans(@RequestHeader("Content-Type") String contentType, @RequestBody byte[] data) throws InvalidProtocolBufferException {
+		ExportTraceServiceRequest request;
+
+		if (contentType != null && contentType.startsWith("application/x-protobuf")) {
+			request = ExportTraceServiceRequest.parseFrom(data);
+		} else if (contentType != null && contentType.startsWith(MediaType.APPLICATION_JSON_VALUE)) {
+			String json = new String(data);
+			ExportTraceServiceRequest.Builder builder = ExportTraceServiceRequest.newBuilder();
+			JsonFormat.parser().merge(json, builder);
+			request = builder.build();
+		} else {
+			ExportTraceServiceResponse response = ExportTraceServiceResponse.newBuilder().build();
+			return ResponseEntity.status(HttpStatus.UNSUPPORTED_MEDIA_TYPE)
+					.contentType(MediaType.APPLICATION_JSON)
+					.body(JsonFormat.printer().print(response));
+		}
+
+		for (ResourceSpans resourceSpans : request.getResourceSpansList()) {
+			for (ScopeSpans scopeSpans : resourceSpans.getScopeSpansList()) {
+				delegate.processSpans(scopeSpans.getSpansList());
+			}
+		}
+
+		ExportTraceServiceResponse response = ExportTraceServiceResponse.newBuilder().build();
+		if (contentType.startsWith("application/x-protobuf")) {
+			return ResponseEntity.ok()
+					.contentType(org.springframework.http.MediaType.parseMediaType("application/x-protobuf"))
+					.body(response.toByteArray());
+		} else {
+			return ResponseEntity.ok()
+					.contentType(MediaType.APPLICATION_JSON)
+					.body(JsonFormat.printer().print(response));
+		}
+	}
+}

ladybug-common/pom.xml

@@ -129,6 +129,34 @@
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-exporter-otlp</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.opentelemetry.proto</groupId>
+      <artifactId>opentelemetry-proto</artifactId>
+      <version>1.9.0-alpha</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.17.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.github.ben-manes.caffeine</groupId>
+      <artifactId>caffeine</artifactId>
+      <version>3.2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>5.18.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <version>5.18.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>