Merge branch '1.0.x'

nikoncode · Apr 19, 2023 · 7ff0829 · 7ff0829
2 parents dd22826 + 8309dac
commit 7ff0829
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.5.0
+      - uses: actions/checkout@v3.5.2
       - uses: gradle/wrapper-validation-action@v1
diff --git a/micrometer-tracing/src/main/java/io/micrometer/tracing/propagation/Propagator.java b/micrometer-tracing/src/main/java/io/micrometer/tracing/propagation/Propagator.java
@@ -93,8 +93,7 @@ public <C> Span.Builder extract(C carrier, Getter<C> getter) {
     <C> Span.Builder extract(C carrier, Getter<C> getter);
 
     /**
-     * Class that allows a {@code TextMapPropagator} to set propagated fields into a
-     * carrier.
+     * Class that allows a {@code Propagator} to set propagated fields into a carrier.
      *
      * <p>
      * {@code Setter} is stateless and allows to be saved as a constant to avoid runtime
@@ -130,7 +129,7 @@ interface Setter<C> {
     }
 
     /**
-     * Interface that allows a {@code TextMapPropagator} to read propagated fields from a
+     * Interface that allows a {@code Propagator} to read propagated fields from a
      * carrier.
      *
      * <p>

diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.gradle.enterprise' version '3.12.6'
+	id 'com.gradle.enterprise' version '3.13'
 	id 'io.spring.ge.conventions' version '0.0.13'
 	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0'
 }