From 66332931510779fc0386f915907431c046d2f1f2 Mon Sep 17 00:00:00 2001
From: "robin.bygrave" <robin.bygrave@eroad.com>
Date: Fri, 1 May 2026 17:43:42 +1200
Subject: [PATCH 1/3] docs: update guide versions and fix defaults

- ebean.version 17.2.0 -> 17.5.0 (minimum for TestEntityBuilder)
- avaje-inject 11.5 -> 12.5
- Add io.avaje:junit:1.8 bundle to test dependencies
- Remove .skipDataSourceCheck(true) from database config example
- Add note about Configuration DI wiring in Step 3
---
 .../add-ebean-postgres-database-config.md       |  6 +++++-
 docs/guides/add-ebean-postgres-maven-pom.md     | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/docs/guides/add-ebean-postgres-database-config.md b/docs/guides/add-ebean-postgres-database-config.md
index 1fddb0a136..c16ac55e65 100644
--- a/docs/guides/add-ebean-postgres-database-config.md
+++ b/docs/guides/add-ebean-postgres-database-config.md
@@ -148,7 +148,6 @@ Database database(Configuration config) {
     return Database.builder()
         .name("db")
         .dataSourceBuilder(dataSource)
-        .skipDataSourceCheck(true)
         .build();
 }
 ```
@@ -156,6 +155,11 @@ Database database(Configuration config) {
 If the project has a dedicated config-wrapper class (a `@Component` that reads config
 keys), accept it as a parameter instead of `Configuration`.
 
+> **Note:** Injecting `Configuration` requires that `avaje-config` is properly wired
+> into the DI context. If you encounter "No dependency provided for
+> io.avaje.config.Configuration" errors, use `Config.get(...)` static access instead
+> (as shown in Step 2).
+
 ---
 
 ## Step 4 (Optional) — Add a read-only datasource
diff --git a/docs/guides/add-ebean-postgres-maven-pom.md b/docs/guides/add-ebean-postgres-maven-pom.md
index 71794e86f5..948278cf2e 100644
--- a/docs/guides/add-ebean-postgres-maven-pom.md
+++ b/docs/guides/add-ebean-postgres-maven-pom.md
@@ -85,7 +85,7 @@ already exist:
 ```xml
 <properties>
     <!-- add this line; use latest stable from https://github.com/ebean-orm/ebean/releases -->
-    <ebean.version>17.2.0</ebean.version>
+    <ebean.version>17.5.0</ebean.version>
 </properties>
 ```
 
@@ -141,8 +141,17 @@ for Postgres test instances:
     <version>${ebean.version}</version>
     <scope>test</scope>
 </dependency>
+<dependency>
+    <groupId>io.avaje</groupId>
+    <artifactId>junit</artifactId>
+    <version>1.8</version>
+    <scope>test</scope>
+</dependency>
 ```
 
+The `io.avaje:junit` bundle includes JUnit Jupiter (API + engine) and AssertJ,
+avoiding the need to declare those dependencies separately.
+
 ---
 
 ## Step 4b — Add DI framework dependencies (if applicable)
@@ -156,12 +165,12 @@ annotation processor. Skip this step if the user chose Spring or no DI.
 <dependency>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject</artifactId>
-    <version>11.5</version>
+    <version>12.5</version>
 </dependency>
 <dependency>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-test</artifactId>
-    <version>11.5</version>
+    <version>12.5</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -185,7 +194,7 @@ the final `<annotationProcessorPaths>` block should include both:
     <path> <!-- generate avaje-inject DI code -->
         <groupId>io.avaje</groupId>
         <artifactId>avaje-inject-generator</artifactId>
-        <version>11.5</version>
+        <version>12.5</version>
     </path>
 </annotationProcessorPaths>
 ```

From 0652167101d7e0acb06246dbc2a5ebc8b0970178 Mon Sep 17 00:00:00 2001
From: "robin.bygrave" <robin.bygrave@eroad.com>
Date: Fri, 1 May 2026 17:48:42 +1200
Subject: [PATCH 2/3] docs: add next steps to test container guide

- Suggest TestEntityBuilder for test data creation
- Link to testing-with-testentitybuilder.md
---
 docs/guides/add-ebean-postgres-test-container.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/guides/add-ebean-postgres-test-container.md b/docs/guides/add-ebean-postgres-test-container.md
index 54d909c342..8a4f1bffe4 100644
--- a/docs/guides/add-ebean-postgres-test-container.md
+++ b/docs/guides/add-ebean-postgres-test-container.md
@@ -433,3 +433,13 @@ mkdir -p ~/.ebean && touch ~/.ebean/ignore-docker-shutdown
 ```
 
 On CI servers, omit this file so containers are cleaned up after each build.
+
+---
+
+## Next Steps
+
+- **Add `TestEntityBuilder`** to your test configuration for rapid test data creation
+  with auto-populated random values. See `testing-with-testentitybuilder.md`.
+- **Proceed to Step 3** — production database configuration
+  (`add-ebean-postgres-database-config.md`). Verify this step passes with
+  `mvn verify` before continuing.

From e5aeda9d4eef451c8fa11f26d168add3c63b57a6 Mon Sep 17 00:00:00 2001
From: "robin.bygrave" <robin.bygrave@eroad.com>
Date: Thu, 14 May 2026 16:20:28 +1200
Subject: [PATCH 3/3] open telemetry: Use Span.current().isRecording() rather
 than isValid()

Change to use isRecording() to determine if ProfileStream should be
created for collecting profiling events
---
 .../main/java/io/ebean/opentelemetry/OtelProfileHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-opentelemetry/src/main/java/io/ebean/opentelemetry/OtelProfileHandler.java b/ebean-opentelemetry/src/main/java/io/ebean/opentelemetry/OtelProfileHandler.java
index 020db0d9f4..f9d1618689 100644
--- a/ebean-opentelemetry/src/main/java/io/ebean/opentelemetry/OtelProfileHandler.java
+++ b/ebean-opentelemetry/src/main/java/io/ebean/opentelemetry/OtelProfileHandler.java
@@ -63,7 +63,7 @@ public void shutdown() {
    */
   @Override
   public @Nullable ProfileStream createProfileStream(@Nullable ProfileLocation location, @Nullable String label) {
-    if (!Span.current().getSpanContext().isValid()) {
+    if (!Span.current().isRecording()) {
       // No active OTel trace context — don't create spans to avoid noise
       return null;
     }