From 33d7b7768b10cc9972f38938edf72af7f3b18f3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Nov 2023 12:00:16 +0900
Subject: [PATCH 01/28] Bump testcontainers from 1.19.1 to 1.19.2 (#436)

Bumps `testcontainers` from 1.19.1 to 1.19.2.

Updates `org.testcontainers:testcontainers` from 1.19.1 to 1.19.2
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.1...1.19.2)

Updates `org.testcontainers:junit-jupiter` from 1.19.1 to 1.19.2
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.1...1.19.2)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3a4aa8d0..57c447e0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ assertj = "3.24.2"
 awaitility = "4.2.0"
 mockito = "5.5.0"
 wiremock = "2.35.1"
-testcontainers = "1.19.1"
+testcontainers = "1.19.2"
 braveBom = "5.14.1"
 reactorBom = "2022.0.12"
 asmForPlugins = "7.3.1"

From 090cca1491f7fcc3d1be7b3f7aff5b5568940f0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Nov 2023 12:00:49 +0900
Subject: [PATCH 02/28] Bump io.projectreactor:reactor-bom from 2022.0.12 to
 2022.0.13 (#435)

Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2022.0.12 to 2022.0.13.
- [Release notes](https://github.com/reactor/reactor/releases)
- [Commits](https://github.com/reactor/reactor/compare/2022.0.12...2022.0.13)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 57c447e0..c665dbe0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ mockito = "5.5.0"
 wiremock = "2.35.1"
 testcontainers = "1.19.2"
 braveBom = "5.14.1"
-reactorBom = "2022.0.12"
+reactorBom = "2022.0.13"
 asmForPlugins = "7.3.1"
 javaFormatForPlugins = "0.0.39"
 jsr305 = "3.0.2"

From 823caad4fc45a535dda4d4f3753ed4479858fdb8 Mon Sep 17 00:00:00 2001
From: Jonatan Ivanov <jonatan.ivanov@gmail.com>
Date: Fri, 17 Nov 2023 16:51:22 -0800
Subject: [PATCH 03/28] Upgrade nebula-release-plugin to 18.0.4

Closes gh-445
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c665dbe0..00ba65ed 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -60,7 +60,7 @@ zipkinAws = { module = "io.zipkin.aws:brave-propagation-aws", version.ref = "zip
 
 # plugin dependencies
 plugin-license = { module = "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin", version = "0.16.1" }
-plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "16.1.0" }
+plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.4" }
 plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.3.0" }
 plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" }
 plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" }

From 633588fee30b5e67b182177baf8cd72d1dd5272a Mon Sep 17 00:00:00 2001
From: Jonatan Ivanov <jonatan.ivanov@gmail.com>
Date: Fri, 17 Nov 2023 16:51:45 -0800
Subject: [PATCH 04/28] Support worktrees

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 2c109640..c66f719e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@ build/
 .gradle/
 out/
 
+code/
+
 *.iml
 *.ipr
 *.iws

From a0aa80dff258a9993e55e3fcd7efaf09c405d5ac Mon Sep 17 00:00:00 2001
From: Jonatan Ivanov <jonatan.ivanov@gmail.com>
Date: Fri, 17 Nov 2023 17:00:28 -0800
Subject: [PATCH 05/28] Remove jgit hack

The nebula-release-plugin does not use jgit/grgit anymore but it uses
the git cli instead that eliminates the need of this hack.
---
 build.gradle | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index c212e901..04df22ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,9 +28,6 @@ buildscript {
 
 // Hacks because of Antora's clone/checkout/worktrees behavior
 // Antora uses shallow-clone and worktrees to check out branches/tags.
-// The nebula release, project, and info plugins use jgit to fetch git-related info.
-// Unfortunately jgit does not support worktrees: https://bugs.eclipse.org/bugs/show_bug.cgi?id=477475
-// TODO: remove these hacks once jgit supports worktrees (nebula upgrades) and/or Antora supports full-clone
 if (project.hasProperty('antora')) {
 	'git fetch --unshallow --all --tags'.execute().text // Antora shallow-clones so there is no history (we need commit history to find the last tag in the tree)
 	String ref = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim()
@@ -41,8 +38,6 @@ if (project.hasProperty('antora')) {
 			ext['release.version'] = tag.substring(1)
 		}
 	}
-	// We need to tell the location of the .git folder since jgit does not support worktrees
-	ext['git.root'] = 'git rev-parse --path-format=absolute --git-common-dir'.execute().text.trim()
 }
 
 // TODO: remove this hack, see: https://github.com/nebula-plugins/nebula-release-plugin/issues/213

From 2c017b3ebdb6e1a9e5fa852b1c9a301d4fa9781b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 17:01:10 +0900
Subject: [PATCH 06/28] Bump
 io.spring.javaformat:spring-javaformat-gradle-plugin (#441)

Bumps [io.spring.javaformat:spring-javaformat-gradle-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.39 to 0.0.40.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.39...v0.0.40)

---
updated-dependencies:
- dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 00ba65ed..4d989bec 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -65,5 +65,5 @@ plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugi
 plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" }
 plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" }
 plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" }
-plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.39" }
+plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.40" }
 plugin-jmh = { module = "me.champeau.jmh:jmh-gradle-plugin", version = "0.7.1" }

From b61b8d400b90fc3cf6b1b9ba6af51fa1f025660d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 17:01:28 +0900
Subject: [PATCH 07/28] Bump io.spring.javaformat:spring-javaformat-checkstyle
 (#440)

Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.39 to 0.0.40.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.39...v0.0.40)

---
updated-dependencies:
- dependency-name: io.spring.javaformat:spring-javaformat-checkstyle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4d989bec..f2b99da1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,7 +23,7 @@ testcontainers = "1.19.2"
 braveBom = "5.14.1"
 reactorBom = "2022.0.13"
 asmForPlugins = "7.3.1"
-javaFormatForPlugins = "0.0.39"
+javaFormatForPlugins = "0.0.40"
 jsr305 = "3.0.2"
 
 [libraries]

From 2359a723cb64ae638d28433ba5cac3241fa821a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 17:06:31 +0900
Subject: [PATCH 08/28] Bump spring from 5.3.30 to 5.3.31 (#442)

Bumps `spring` from 5.3.30 to 5.3.31.

Updates `org.springframework:spring-core` from 5.3.30 to 5.3.31
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.30...v5.3.31)

Updates `org.springframework:spring-context` from 5.3.30 to 5.3.31
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.30...v5.3.31)

---
updated-dependencies:
- dependency-name: org.springframework:spring-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.springframework:spring-context
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bbf93989..0df60475 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ asmForPlugins = "7.3.1"
 javaFormatForPlugins = "0.0.40"
 jsr305 = "3.0.2"
 aspectjweaver = "1.8.14"
-spring = "5.3.30"
+spring = "5.3.31"
 
 [libraries]
 aopAlliance = { module = "aopalliance:aopalliance", version.ref = "aopalliance" }

From 4194599babc9f2e43b5e0e56d93afea3148fc451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dariusz=20J=C4=99drzejczyk?= <jdariusz@vmware.com>
Date: Tue, 5 Dec 2023 16:15:47 +0100
Subject: [PATCH 09/28] Validating Observation termination doesn't invalidate
 scopes in other Threads (#421)

* Test validating Observation termination doesn't invalidate scopes in other Threads

* Formatting
---
 .../brave/contextpropagation/ScopesTests.java | 139 ++++++++++++++++++
 1 file changed, 139 insertions(+)

diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/contextpropagation/ScopesTests.java b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/contextpropagation/ScopesTests.java
index 27e90819..90d7da01 100644
--- a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/contextpropagation/ScopesTests.java
+++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/contextpropagation/ScopesTests.java
@@ -38,11 +38,19 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Hooks;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
+import reactor.core.scheduler.Schedulers;
 import reactor.util.context.Context;
 
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.assertj.core.api.BDDAssertions.then;
@@ -144,6 +152,128 @@ void should_open_and_close_scopes_with_reactor() {
         logger.info("SPAN AFTER CLOSE 1 [" + tracer.currentSpan() + "]");
     }
 
+    @Test
+    void should_open_and_close_scopes_with_reactor_multithreaded() {
+        ExecutorService executorService = Executors.newScheduledThreadPool(2);
+        Scheduler scheduler = Schedulers.fromExecutorService(executorService);
+
+        Observation obs1 = Observation.start("1", observationRegistry);
+
+        logger.info("SIZE BEFORE [" + CorrelationFlushScopeArrayReader.size() + "]");
+        Observation.Scope scope = obs1.openScope();
+        Span span1 = tracer.currentSpan();
+        logger.info("SPAN 1 [" + tracer.currentSpan() + "]");
+
+        Observation obs2 = Observation.start("2", observationRegistry);
+        Observation.Scope scope2 = obs2.openScope();
+        Span span2 = tracer.currentSpan();
+        logger.info("SPAN 2 [" + tracer.currentSpan() + "]");
+
+        logger.info("SIZE WITH 2 SCOPES [" + CorrelationFlushScopeArrayReader.size() + "]");
+
+        List<AssertionError> errorsInFlatMap = new CopyOnWriteArrayList<>();
+        List<AssertionError> errorsInInnerOnNext = new CopyOnWriteArrayList<>();
+        List<AssertionError> errorsInOuterOnNext = new CopyOnWriteArrayList<>();
+
+        CountDownLatch latch = new CountDownLatch(1);
+
+        // First, let's open a couple scopes in multiple threads and terminate an
+        // Observation upon completion signal.
+
+        Flux.range(0, 2).flatMap(integer -> {
+            Observation obs3 = Observation.start("3", observationRegistry);
+            Span span3;
+            try (Observation.Scope scope3 = obs3.openScope()) {
+                span3 = tracer.currentSpan();
+                logger.info("SPAN 3 [" + tracer.currentSpan() + "]");
+            }
+
+            return Mono.just(integer).subscribeOn(scheduler).doOnNext(v -> {
+                Span spanWEmpty = tracer.currentSpan();
+                logger.info("[inner-flatMap] SPAN IN EMPTY [" + spanWEmpty + "]");
+                assertInReactor(errorsInFlatMap, spanWEmpty, null);
+                if (integer == 1) {
+                    latch.countDown();
+                }
+                else {
+                    try {
+                        latch.await();
+                    }
+                    catch (InterruptedException e) {
+                        // ignore
+                    }
+                }
+            }).contextWrite(context -> Context.empty()).doOnNext(v -> {
+                Span spanWOnNext = tracer.currentSpan();
+                logger.info("[inner-doOnNext] SPAN IN ON NEXT [" + spanWOnNext + "]");
+                assertInReactor(errorsInInnerOnNext, spanWOnNext, span3);
+            })
+                .contextWrite(ctx -> ctx.put(ObservationThreadLocalAccessor.KEY, obs3))
+                // When stop is called in thread A, it mustn't close scopes
+                // in thread B, which might still be open, as that would
+                // cause errors and leaks.
+                .doOnTerminate(obs3::stop);
+        }, 2, 1).doOnNext(integer -> {
+            Span spanWOnNext = tracer.currentSpan();
+            logger.info("[outer-doOnNext] SPAN IN ON NEXT [" + spanWOnNext + "]");
+            assertInReactor(errorsInOuterOnNext, spanWOnNext, span2);
+        }).blockLast();
+
+        logger.info("Checking if there were no errors in reactor");
+        then(errorsInFlatMap).isEmpty();
+        then(errorsInOuterOnNext).isEmpty();
+        then(errorsInInnerOnNext).isEmpty();
+
+        logger.info("SPAN OUTSIDE REACTOR [" + tracer.currentSpan() + "]");
+        logger.info("SIZE AFTER [" + CorrelationFlushScopeArrayReader.size() + "]");
+        then(tracer.currentSpan()).isEqualTo(span2);
+
+        scope2.close();
+        obs2.stop();
+
+        logger.info("SIZE OUTSIDE CLOSE 2 [" + CorrelationFlushScopeArrayReader.size() + "]");
+        logger.info("SPAN AFTER CLOSE 2 [" + tracer.currentSpan() + "]");
+        then(tracer.currentSpan())
+            .as("Scopes should be restored to previous so current span should be Span 1 which is <%s>. Span 2 is <%s>",
+                    span1, span2)
+            .isEqualTo(span1);
+
+        scope.close();
+        obs1.stop();
+
+        logger.info("SIZE AFTER CLOSE 1 [" + CorrelationFlushScopeArrayReader.size() + "]");
+        then(CorrelationFlushScopeArrayReader.size()).isZero();
+        then(tracer.currentSpan()).isNull();
+        logger.info("SPAN AFTER CLOSE 1 [" + tracer.currentSpan() + "]");
+
+        // Now let's validate if both threads have a clean state and have no leaks.
+
+        CountDownLatch cleanupLatch = new CountDownLatch(1);
+
+        executorService.submit(() -> {
+            Observation obs4 = Observation.start("4", observationRegistry);
+            try (Observation.Scope scope4 = obs4.openScope()) {
+                logger.info("FRESH SPAN AFTER [{}]", tracer.currentSpan());
+                cleanupLatch.await();
+            }
+            catch (InterruptedException e) {
+                // ignore
+            }
+            obs4.stop();
+            logger.info("CLEAN SPAN AFTER [{}]", tracer.currentSpan());
+        });
+
+        executorService.submit(() -> {
+            Observation obs4 = Observation.start("4", observationRegistry);
+            try (Observation.Scope scope4 = obs4.openScope()) {
+                logger.info("FRESH SPAN AFTER [{}]", tracer.currentSpan());
+                cleanupLatch.countDown();
+            }
+            obs4.stop();
+            logger.info("CLEAN SPAN AFTER [{}]", tracer.currentSpan());
+        });
+    }
+
     @Test
     void should_open_and_close_scopes_with_reactor_with_baggage() {
         Observation obs1 = Observation.start("1", observationRegistry);
@@ -204,6 +334,15 @@ void should_open_and_close_scopes_with_reactor_with_baggage() {
         then(tracer.getAllBaggage()).isEmpty();
     }
 
+    private static void assertInReactor(List<AssertionError> errors, Span spanWOnNext, Span expectedSpan) {
+        try {
+            then(spanWOnNext).isEqualTo(expectedSpan);
+        }
+        catch (AssertionError er) {
+            errors.add(er);
+        }
+    }
+
     private static void assertInReactor(AtomicReference<AssertionError> errors, Span spanWOnNext, Span expectedSpan) {
         try {
             then(spanWOnNext).isEqualTo(expectedSpan);

From 00bbf57b307d2d708ed28a2542d88274c32896e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:22:10 +0100
Subject: [PATCH 10/28] Bump testcontainers from 1.19.2 to 1.19.3 (#453)

Bumps `testcontainers` from 1.19.2 to 1.19.3.

Updates `org.testcontainers:testcontainers` from 1.19.2 to 1.19.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.2...1.19.3)

Updates `org.testcontainers:junit-jupiter` from 1.19.2 to 1.19.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.2...1.19.3)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 87f05970..7b724f0b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ assertj = "3.24.2"
 awaitility = "4.2.0"
 mockito = "5.7.0"
 wiremock = "3.0.1"
-testcontainers = "1.19.2"
+testcontainers = "1.19.3"
 braveBom = "5.16.0"
 reactorBom = "2022.0.13"
 asmForPlugins = "7.3.1"

From f462053b2b6b468e862b901e80a4aaeb40e9dcdc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:22:56 +0100
Subject: [PATCH 11/28] Bump testcontainers from 1.19.2 to 1.19.3 (#451)

Bumps `testcontainers` from 1.19.2 to 1.19.3.

Updates `org.testcontainers:testcontainers` from 1.19.2 to 1.19.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.2...1.19.3)

Updates `org.testcontainers:junit-jupiter` from 1.19.2 to 1.19.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.2...1.19.3)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f2b99da1..d41a79a3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ assertj = "3.24.2"
 awaitility = "4.2.0"
 mockito = "5.5.0"
 wiremock = "2.35.1"
-testcontainers = "1.19.2"
+testcontainers = "1.19.3"
 braveBom = "5.14.1"
 reactorBom = "2022.0.13"
 asmForPlugins = "7.3.1"

From 543bb73eb7f291669c81012ccdbe8530eb4f0be0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:23:16 +0100
Subject: [PATCH 12/28] Bump com.netflix.nebula:nebula-release-plugin from
 18.0.4 to 18.0.6 (#473)

Bumps [com.netflix.nebula:nebula-release-plugin](https://github.com/nebula-plugins/nebula-release-plugin) from 18.0.4 to 18.0.6.
- [Release notes](https://github.com/nebula-plugins/nebula-release-plugin/releases)
- [Changelog](https://github.com/nebula-plugins/nebula-release-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nebula-plugins/nebula-release-plugin/compare/v18.0.4...v18.0.6)

---
updated-dependencies:
- dependency-name: com.netflix.nebula:nebula-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0df60475..7dd8e0eb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -65,7 +65,7 @@ zipkinAws = { module = "io.zipkin.aws:brave-propagation-aws", version.ref = "zip
 
 # plugin dependencies
 plugin-license = { module = "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin", version = "0.16.1" }
-plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.4" }
+plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.6" }
 plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.3.0" }
 plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" }
 plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" }

From ae225cb4d259243e263764a15ce292aa715a7018 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:23:37 +0100
Subject: [PATCH 13/28] Bump com.netflix.nebula:nebula-release-plugin from
 18.0.4 to 18.0.6 (#476)

Bumps [com.netflix.nebula:nebula-release-plugin](https://github.com/nebula-plugins/nebula-release-plugin) from 18.0.4 to 18.0.6.
- [Release notes](https://github.com/nebula-plugins/nebula-release-plugin/releases)
- [Changelog](https://github.com/nebula-plugins/nebula-release-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nebula-plugins/nebula-release-plugin/compare/v18.0.4...v18.0.6)

---
updated-dependencies:
- dependency-name: com.netflix.nebula:nebula-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7b724f0b..202f5590 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -64,7 +64,7 @@ zipkinAws = { module = "io.zipkin.aws:brave-propagation-aws", version.ref = "zip
 
 # plugin dependencies
 plugin-license = { module = "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin", version = "0.16.1" }
-plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.4" }
+plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.6" }
 plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.3.0" }
 plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" }
 plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "12.1.6" }

From c2c7fbe3467ef6fa5dee2f821c6bb7068ccb6522 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:23:55 +0100
Subject: [PATCH 14/28] Bump ch.qos.logback:logback-classic from 1.4.11 to
 1.4.14 (#464)

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.4.11 to 1.4.14.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.11...v_1.4.14)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 202f5590..f6a5e8d6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ otelInstrumentation="1.31.0-alpha"
 aopalliance="1.0"
 zipkinAws="0.23.5"
 otelBom="1.31.0"
-logback = "1.4.11"
+logback = "1.4.14"
 wavefrontSdk="3.4.3"
 otelBomAlpha="1.31.0-alpha"
 log4j = "2.21.1"

From 9df9ce4e0975342930a7e08421cc265081911bd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:24:18 +0100
Subject: [PATCH 15/28] Bump ch.qos.logback:logback-classic from 1.2.12 to
 1.2.13 (#466)

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.12 to 1.2.13.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.2.12...v_1.2.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d41a79a3..3ed6df38 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ otelInstrumentation="1.19.2-alpha"
 aopalliance="1.0"
 zipkinAws="0.23.5"
 otelBom="1.19.0"
-logback = "1.2.12"
+logback = "1.2.13"
 wavefrontSdk="3.0.4"
 otelBomAlpha="1.19.0-alpha"
 log4j = "2.20.0"

From b8041ec90e4dff99f46a962da271a51bd3683e31 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:24:31 +0100
Subject: [PATCH 16/28] Bump ch.qos.logback:logback-classic from 1.2.12 to
 1.2.13 (#469)

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.12 to 1.2.13.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.2.12...v_1.2.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7dd8e0eb..a49a1fc1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ otelInstrumentation="1.25.1-alpha"
 aopalliance="1.0"
 zipkinAws="0.23.5"
 otelBom="1.25.0"
-logback = "1.2.12"
+logback = "1.2.13"
 wavefrontSdk="3.0.4"
 otelBomAlpha="1.25.0-alpha"
 log4j = "2.20.0"

From 1165ad76f278d5e9ac54e40ed421d7aaf9e4b29a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:28:15 +0100
Subject: [PATCH 17/28] Bump testcontainers from 1.19.2 to 1.19.3 (#454)

Bumps `testcontainers` from 1.19.2 to 1.19.3.

Updates `org.testcontainers:testcontainers` from 1.19.2 to 1.19.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.2...1.19.3)

Updates `org.testcontainers:junit-jupiter` from 1.19.2 to 1.19.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.2...1.19.3)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a49a1fc1..2fc4286b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ assertj = "3.24.2"
 awaitility = "4.2.0"
 mockito = "5.5.0"
 wiremock = "2.35.1"
-testcontainers = "1.19.2"
+testcontainers = "1.19.3"
 braveBom = "5.14.1"
 reactorBom = "2022.0.13"
 asmForPlugins = "7.3.1"

From 587a0b57a4711c8737ead78fd4989a1296992d04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:28:31 +0100
Subject: [PATCH 18/28] Bump com.netflix.nebula:nebula-release-plugin from
 18.0.4 to 18.0.6 (#475)

Bumps [com.netflix.nebula:nebula-release-plugin](https://github.com/nebula-plugins/nebula-release-plugin) from 18.0.4 to 18.0.6.
- [Release notes](https://github.com/nebula-plugins/nebula-release-plugin/releases)
- [Changelog](https://github.com/nebula-plugins/nebula-release-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nebula-plugins/nebula-release-plugin/compare/v18.0.4...v18.0.6)

---
updated-dependencies:
- dependency-name: com.netflix.nebula:nebula-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3ed6df38..64e4beec 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -60,7 +60,7 @@ zipkinAws = { module = "io.zipkin.aws:brave-propagation-aws", version.ref = "zip
 
 # plugin dependencies
 plugin-license = { module = "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin", version = "0.16.1" }
-plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.4" }
+plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.6" }
 plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.3.0" }
 plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" }
 plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" }

From ca496ea52ac24b36c751fe85c0028aa200d7a358 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 15:32:30 +0100
Subject: [PATCH 19/28] Bump com.netflix.nebula:nebula-release-plugin from
 18.0.6 to 18.0.7 (#477)

Bumps [com.netflix.nebula:nebula-release-plugin](https://github.com/nebula-plugins/nebula-release-plugin) from 18.0.6 to 18.0.7.
- [Release notes](https://github.com/nebula-plugins/nebula-release-plugin/releases)
- [Changelog](https://github.com/nebula-plugins/nebula-release-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nebula-plugins/nebula-release-plugin/compare/v18.0.6...v18.0.7)

---
updated-dependencies:
- dependency-name: com.netflix.nebula:nebula-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 64e4beec..c25f8c44 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -60,7 +60,7 @@ zipkinAws = { module = "io.zipkin.aws:brave-propagation-aws", version.ref = "zip
 
 # plugin dependencies
 plugin-license = { module = "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin", version = "0.16.1" }
-plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.6" }
+plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.7" }
 plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.3.0" }
 plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" }
 plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" }

From 9fe40538357801469b6a9d8fd49c10a00e6a47a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 15:33:26 +0100
Subject: [PATCH 20/28] Bump com.netflix.nebula:nebula-release-plugin from
 18.0.6 to 18.0.7 (#481)

Bumps [com.netflix.nebula:nebula-release-plugin](https://github.com/nebula-plugins/nebula-release-plugin) from 18.0.6 to 18.0.7.
- [Release notes](https://github.com/nebula-plugins/nebula-release-plugin/releases)
- [Changelog](https://github.com/nebula-plugins/nebula-release-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nebula-plugins/nebula-release-plugin/compare/v18.0.6...v18.0.7)

---
updated-dependencies:
- dependency-name: com.netflix.nebula:nebula-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2fc4286b..11d94ba2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -65,7 +65,7 @@ zipkinAws = { module = "io.zipkin.aws:brave-propagation-aws", version.ref = "zip
 
 # plugin dependencies
 plugin-license = { module = "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin", version = "0.16.1" }
-plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.6" }
+plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.7" }
 plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.3.0" }
 plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" }
 plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" }

From f27c2a097eb57ed98b23b5209404ec8f5e22b202 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 15:56:23 +0100
Subject: [PATCH 21/28] Bump com.netflix.nebula:nebula-release-plugin from
 18.0.6 to 18.0.8 (#482)

Bumps [com.netflix.nebula:nebula-release-plugin](https://github.com/nebula-plugins/nebula-release-plugin) from 18.0.6 to 18.0.8.
- [Release notes](https://github.com/nebula-plugins/nebula-release-plugin/releases)
- [Changelog](https://github.com/nebula-plugins/nebula-release-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nebula-plugins/nebula-release-plugin/compare/v18.0.6...v18.0.8)

---
updated-dependencies:
- dependency-name: com.netflix.nebula:nebula-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f6a5e8d6..5d1dd117 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -64,7 +64,7 @@ zipkinAws = { module = "io.zipkin.aws:brave-propagation-aws", version.ref = "zip
 
 # plugin dependencies
 plugin-license = { module = "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin", version = "0.16.1" }
-plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.6" }
+plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.8" }
 plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.3.0" }
 plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" }
 plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "12.1.6" }

From dd8bd7d9fb2c7e2ddf34a95bdf3e731e9973f8ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:41:40 +0100
Subject: [PATCH 22/28] Bump com.netflix.nebula:nebula-release-plugin from
 18.0.7 to 18.0.8 (#484)

Bumps [com.netflix.nebula:nebula-release-plugin](https://github.com/nebula-plugins/nebula-release-plugin) from 18.0.7 to 18.0.8.
- [Release notes](https://github.com/nebula-plugins/nebula-release-plugin/releases)
- [Changelog](https://github.com/nebula-plugins/nebula-release-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nebula-plugins/nebula-release-plugin/compare/v18.0.7...v18.0.8)

---
updated-dependencies:
- dependency-name: com.netflix.nebula:nebula-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c25f8c44..9cbb4f59 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -60,7 +60,7 @@ zipkinAws = { module = "io.zipkin.aws:brave-propagation-aws", version.ref = "zip
 
 # plugin dependencies
 plugin-license = { module = "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin", version = "0.16.1" }
-plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.7" }
+plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.8" }
 plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.3.0" }
 plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" }
 plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" }

From c43314a6a650713fd29fd953a9c3cbe551d50ca7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:42:15 +0100
Subject: [PATCH 23/28] Bump com.netflix.nebula:nebula-release-plugin from
 18.0.7 to 18.0.8 (#485)

Bumps [com.netflix.nebula:nebula-release-plugin](https://github.com/nebula-plugins/nebula-release-plugin) from 18.0.7 to 18.0.8.
- [Release notes](https://github.com/nebula-plugins/nebula-release-plugin/releases)
- [Changelog](https://github.com/nebula-plugins/nebula-release-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nebula-plugins/nebula-release-plugin/compare/v18.0.7...v18.0.8)

---
updated-dependencies:
- dependency-name: com.netflix.nebula:nebula-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 11d94ba2..daf3a9d3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -65,7 +65,7 @@ zipkinAws = { module = "io.zipkin.aws:brave-propagation-aws", version.ref = "zip
 
 # plugin dependencies
 plugin-license = { module = "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin", version = "0.16.1" }
-plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.7" }
+plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.8" }
 plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.3.0" }
 plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" }
 plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" }

From 366dcb0930e88fd5a04fe4547f10edd962b7dffd Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Fri, 8 Dec 2023 12:01:29 +0100
Subject: [PATCH 24/28] Fixed OTel baggage tagging

- currently we're having a wrong equality check, we're converting baggage keys to lowercase but we're comparing it to non lowercase tags. We should do ignore case equality check instead
- Added tests for baggage tagging for both OTel and Brave

fixes gh-375
---
 .../tracing/brave/bridge/BaggageTests.java    | 49 ++++++++++++++++++-
 .../otel/bridge/OtelBaggageInScope.java       |  2 +-
 .../tracing/otel/bridge/BaggageTests.java     | 38 ++++++++++++--
 3 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/bridge/BaggageTests.java b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/bridge/BaggageTests.java
index 73c27b58..ce33c710 100644
--- a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/bridge/BaggageTests.java
+++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/bridge/BaggageTests.java
@@ -15,10 +15,12 @@
  */
 package io.micrometer.tracing.brave.bridge;
 
+import brave.Tags;
 import brave.Tracing;
 import brave.baggage.BaggageField;
 import brave.baggage.BaggagePropagation;
 import brave.baggage.BaggagePropagationConfig;
+import brave.handler.MutableSpan;
 import brave.handler.SpanHandler;
 import brave.propagation.B3Propagation;
 import brave.propagation.StrictCurrentTraceContext;
@@ -46,7 +48,11 @@ class BaggageTests {
 
     public static final String VALUE_1 = "value1";
 
-    SpanHandler spanHandler = new TestSpanHandler();
+    public static final String TAG_KEY = "tagKey";
+
+    public static final String TAG_VALUE = "tagValue";
+
+    TestSpanHandler spanHandler = new TestSpanHandler();
 
     StrictCurrentTraceContext braveCurrentTraceContext = StrictCurrentTraceContext.create();
 
@@ -58,9 +64,11 @@ class BaggageTests {
         .traceId128Bit(true)
         .propagationFactory(BaggagePropagation.newFactoryBuilder(B3Propagation.FACTORY)
             .add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create(KEY_1)))
+            .add(BaggagePropagationConfig.SingleBaggageField.local(BaggageField.create(TAG_KEY)))
             .build())
         .sampler(Sampler.ALWAYS_SAMPLE)
         .addSpanHandler(this.spanHandler)
+        .addSpanHandler(new BaggageTagSpanHandler(new BaggageField[] { BaggageField.create(TAG_KEY) }))
         .build();
 
     brave.Tracer braveTracer = this.tracing.tracer();
@@ -138,4 +146,43 @@ void baggageWithContextPropagation() {
         }
     }
 
+    @Test
+    void baggageTagKey() {
+        ScopedSpan span = this.tracer.startScopedSpan("call1");
+        try {
+            try (BaggageInScope scope7 = this.tracer.createBaggage(TAG_KEY, TAG_VALUE).makeCurrent()) {
+                // span should get tagged with baggage
+            }
+        }
+        catch (RuntimeException | Error ex) {
+            span.error(ex);
+            throw ex;
+        }
+        finally {
+            span.end();
+        }
+
+        then(spanHandler.spans()).hasSize(1);
+        MutableSpan mutableSpan = spanHandler.spans().get(0);
+        then(mutableSpan.tags().get(TAG_KEY)).isEqualTo(TAG_VALUE);
+    }
+
+    static final class BaggageTagSpanHandler extends SpanHandler {
+
+        final BaggageField[] fieldsToTag;
+
+        BaggageTagSpanHandler(BaggageField[] fieldsToTag) {
+            this.fieldsToTag = fieldsToTag;
+        }
+
+        @Override
+        public boolean end(brave.propagation.TraceContext context, MutableSpan span, Cause cause) {
+            for (BaggageField field : fieldsToTag) {
+                Tags.BAGGAGE_FIELD.tag(field, context, span);
+            }
+            return true;
+        }
+
+    }
+
 }
diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/OtelBaggageInScope.java b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/OtelBaggageInScope.java
index d3ff60e2..7d0253e9 100644
--- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/OtelBaggageInScope.java
+++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/OtelBaggageInScope.java
@@ -101,7 +101,7 @@ private io.micrometer.tracing.Baggage doSet(TraceContext context, String value)
         Context withBaggage = current.with(baggage);
         ctx.updateContext(withBaggage);
         contextWithBaggage.set(withBaggage);
-        if (this.tagFields.stream().map(String::toLowerCase).anyMatch(s -> s.equals(entry().getKey()))) {
+        if (this.tagFields.stream().anyMatch(s -> s.equalsIgnoreCase(entry().getKey()))) {
             currentSpan.setAttribute(entry().getKey(), value);
         }
         Entry previous = entry();
diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/bridge/BaggageTests.java b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/bridge/BaggageTests.java
index 55d71c6a..20d04e5d 100644
--- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/bridge/BaggageTests.java
+++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/bridge/BaggageTests.java
@@ -17,18 +17,18 @@
 
 import io.micrometer.common.util.internal.logging.InternalLogger;
 import io.micrometer.common.util.internal.logging.InternalLoggerFactory;
-import io.micrometer.tracing.Baggage;
-import io.micrometer.tracing.BaggageInScope;
-import io.micrometer.tracing.Span;
-import io.micrometer.tracing.Tracer;
+import io.micrometer.tracing.*;
 import io.micrometer.tracing.otel.propagation.BaggageTextMapPropagator;
 import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.extension.trace.propagation.B3Propagator;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.data.SpanData;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Hooks;
 import reactor.core.publisher.Mono;
@@ -52,8 +52,15 @@ class BaggageTests {
 
     public static final String VALUE_2 = "value2";
 
+    public static final String TAG_KEY = "tagKey";
+
+    public static final String TAG_VALUE = "tagValue";
+
+    ArrayListSpanProcessor spanExporter = new ArrayListSpanProcessor();
+
     SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
         .setSampler(io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOn())
+        .addSpanProcessor(SimpleSpanProcessor.create(spanExporter))
         .build();
 
     OpenTelemetrySdk openTelemetrySdk = OpenTelemetrySdk.builder()
@@ -66,7 +73,7 @@ class BaggageTests {
     OtelCurrentTraceContext otelCurrentTraceContext = new OtelCurrentTraceContext();
 
     OtelBaggageManager otelBaggageManager = new OtelBaggageManager(otelCurrentTraceContext,
-            Collections.singletonList(KEY_1), Collections.emptyList());
+            Collections.singletonList(KEY_1), Collections.singletonList(TAG_KEY));
 
     ContextPropagators contextPropagators = ContextPropagators
         .create(TextMapPropagator.composite(W3CBaggagePropagator.getInstance(), W3CTraceContextPropagator.getInstance(),
@@ -144,4 +151,25 @@ void baggageWithContextPropagation() {
         }
     }
 
+    @Test
+    void baggageTagKey() {
+        ScopedSpan span = this.tracer.startScopedSpan("call1");
+        try {
+            try (BaggageInScope scope7 = this.tracer.createBaggage(TAG_KEY, TAG_VALUE).makeCurrent()) {
+                // span should get tagged with baggage
+            }
+        }
+        catch (RuntimeException | Error ex) {
+            span.error(ex);
+            throw ex;
+        }
+        finally {
+            span.end();
+        }
+
+        then(spanExporter.spans()).hasSize(1);
+        SpanData spanData = spanExporter.spans().poll();
+        then(spanData.getAttributes().get(AttributeKey.stringKey(TAG_KEY))).isEqualTo(TAG_VALUE);
+    }
+
 }

From cdbd895e77a81c67039ba2e0f8338e4dbd17bb08 Mon Sep 17 00:00:00 2001
From: Tadaya Tsuyukubo <tadaya@ttddyy.net>
Date: Mon, 11 Dec 2023 01:25:30 -0800
Subject: [PATCH 25/28] Do not pass walltime=0 to span event (#487)

When `Event#getWallTime` returns `0`(default implementation), do not
pass it to the underlying span event. Rather, let the span
implementation determine the timestamp.

Signed-off-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>
---
 .../handler/TracingObservationHandler.java    |  7 +++-
 .../TracingObservationHandlerTests.java       | 34 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/micrometer-tracing/src/main/java/io/micrometer/tracing/handler/TracingObservationHandler.java b/micrometer-tracing/src/main/java/io/micrometer/tracing/handler/TracingObservationHandler.java
index 9e9dfc10..38266559 100755
--- a/micrometer-tracing/src/main/java/io/micrometer/tracing/handler/TracingObservationHandler.java
+++ b/micrometer-tracing/src/main/java/io/micrometer/tracing/handler/TracingObservationHandler.java
@@ -121,7 +121,12 @@ default void onScopeReset(T context) {
     @Override
     default void onEvent(Event event, T context) {
         long timestamp = event.getWallTime();
-        getRequiredSpan(context).event(event.getContextualName(), timestamp, TimeUnit.MILLISECONDS);
+        if (timestamp == 0) {
+            getRequiredSpan(context).event(event.getContextualName());
+        }
+        else {
+            getRequiredSpan(context).event(event.getContextualName(), timestamp, TimeUnit.MILLISECONDS);
+        }
     }
 
     @Override
diff --git a/micrometer-tracing/src/test/java/io/micrometer/tracing/handler/TracingObservationHandlerTests.java b/micrometer-tracing/src/test/java/io/micrometer/tracing/handler/TracingObservationHandlerTests.java
index 57c9280a..bd36991c 100644
--- a/micrometer-tracing/src/test/java/io/micrometer/tracing/handler/TracingObservationHandlerTests.java
+++ b/micrometer-tracing/src/test/java/io/micrometer/tracing/handler/TracingObservationHandlerTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 the original author or authors.
+ * Copyright 2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package io.micrometer.tracing.handler;
 
 import io.micrometer.observation.Observation;
+import io.micrometer.observation.Observation.Event;
 import io.micrometer.tracing.CurrentTraceContext;
 import io.micrometer.tracing.Span;
 import io.micrometer.tracing.Tracer;
@@ -25,6 +26,7 @@
 import org.mockito.InOrder;
 
 import java.util.Collections;
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.BDDAssertions.thenNoException;
@@ -95,4 +97,34 @@ void spanShouldNotBeOverriddenWhenResettingScope() {
         assertThat(tracingContext.getSpan()).isSameAs(span);
     }
 
+    @Test
+    void eventTimestamp() {
+        Span span = mock(Span.class);
+        Observation.Context context = new Observation.Context();
+        TracingObservationHandler.TracingContext tracingContext = new TracingObservationHandler.TracingContext();
+        tracingContext.setSpan(span);
+        context.put(TracingObservationHandler.TracingContext.class, tracingContext);
+        TracingObservationHandler<Observation.Context> handler = () -> tracer;
+
+        Event defaultEvent = () -> "default-event";
+        handler.onEvent(defaultEvent, context);
+        BDDMockito.then(span).should().event("default-event");
+
+        BDDMockito.reset(span);
+
+        Event eventWithWallTime = new Event() {
+            @Override
+            public String getName() {
+                return "walltime-event";
+            }
+
+            @Override
+            public long getWallTime() {
+                return 100;
+            }
+        };
+        handler.onEvent(eventWithWallTime, context);
+        BDDMockito.then(span).should().event("walltime-event", 100, TimeUnit.MILLISECONDS);
+    }
+
 }

From e67a0d109c073044345c886074932789cb7e6eb1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 04:53:40 -0800
Subject: [PATCH 26/28] Bump io.micrometer:micrometer-bom from 1.11.6 to 1.11.7
 (#489)

Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.11.6 to 1.11.7.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.11.6...v1.11.7)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index daf3a9d3..e69fe086 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-micrometer = "1.11.6"
+micrometer = "1.11.7"
 micrometerContextPropagation="1.0.6"
 junit = "5.10.1"
 javaxServlet="4.0.1"

From 5013fafe7e2cb0382f3beedd912174f8f15e47d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 04:58:34 -0800
Subject: [PATCH 27/28] Bump org.aspectj:aspectjweaver from 1.9.20.1 to 1.9.21
 (#490)

Bumps [org.aspectj:aspectjweaver](https://github.com/eclipse/org.aspectj) from 1.9.20.1 to 1.9.21.
- [Release notes](https://github.com/eclipse/org.aspectj/releases)
- [Commits](https://github.com/eclipse/org.aspectj/commits)

---
updated-dependencies:
- dependency-name: org.aspectj:aspectjweaver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5d1dd117..d362cea4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -25,7 +25,7 @@ reactorBom = "2022.0.13"
 asmForPlugins = "7.3.1"
 javaFormatForPlugins = "0.0.40"
 jsr305 = "3.0.2"
-aspectjweaver = "1.9.20.1"
+aspectjweaver = "1.9.21"
 spring = "5.3.31"
 
 [libraries]

From 77749811751333297b3010b9be3af803e11006de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 04:58:41 -0800
Subject: [PATCH 28/28] Bump io.micrometer:micrometer-bom from 1.12.0 to 1.12.1
 (#491)

Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.12.0 to 1.12.1.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.0...v1.12.1)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d362cea4..7dc37527 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-micrometer = "1.12.0"
+micrometer = "1.12.1"
 micrometerContextPropagation="1.1.0"
 junit = "5.10.1"
 javaxServlet="4.0.1"