From 3335a06b60bbb74b4c256f1141e323061fcad820 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 21:09:29 +0000 Subject: [PATCH 1/3] chore(deps): pin actions/download-artifact action to d3f86a1 --- .github/workflows/auto-spotless-apply.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-spotless-apply.yml b/.github/workflows/auto-spotless-apply.yml index 65b03f006..6312417f7 100644 --- a/.github/workflows/auto-spotless-apply.yml +++ b/.github/workflows/auto-spotless-apply.yml @@ -17,7 +17,7 @@ jobs: pull-requests: write steps: - name: Download patch - uses: actions/download-artifact@v4.3.0 + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: run-id: ${{ github.event.workflow_run.id }} path: ${{ runner.temp }} From efdaa8b37ecf28140452a646e3fe74870b2bfea1 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 19 May 2025 15:27:38 -0700 Subject: [PATCH 2/3] trask testing --- .../contrib/sampler/LinksBasedSampler.java | 72 ++++++++++--------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksBasedSampler.java b/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksBasedSampler.java index 1dc5124f4..c7990a6bc 100644 --- a/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksBasedSampler.java +++ b/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksBasedSampler.java @@ -11,6 +11,7 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingResult; + import java.util.List; /** @@ -19,43 +20,44 @@ * links, this Sampler will use the "root" sampler that it is built with. */ public final class LinksBasedSampler implements Sampler { - private final Sampler root; - - private LinksBasedSampler(Sampler root) { - this.root = root; - } - - public static LinksBasedSampler create(Sampler root) { - return new LinksBasedSampler(root); - } - - @Override - public SamplingResult shouldSample( - Context parentContext, - String traceId, - String name, - SpanKind spanKind, - Attributes attributes, - List parentLinks) { - if (parentLinks.size() > 0) { - for (LinkData linkData : parentLinks) { - if (linkData.getSpanContext().isSampled()) { - return SamplingResult.recordAndSample(); - } - } - return SamplingResult.drop(); + private final Sampler root; + + private LinksBasedSampler(Sampler root) { + this.root = root; + } + + public static LinksBasedSampler create( + Sampler root) { + return new LinksBasedSampler(root); } - return this.root.shouldSample(parentContext, traceId, name, spanKind, attributes, parentLinks); - } + @Override + public SamplingResult shouldSample( + Context parentContext, + String traceId, + String name, + SpanKind spanKind, + Attributes attributes, + List parentLinks) { + if (parentLinks.size() > 0) { + for (LinkData linkData : parentLinks) { + if (linkData.getSpanContext().isSampled()) { + return SamplingResult.recordAndSample(); + } + } + return SamplingResult.drop(); + } - @Override - public String getDescription() { - return String.format("LinksBased{root:%s}", this.root.getDescription()); - } + return this.root.shouldSample(parentContext, traceId, name, spanKind, attributes, parentLinks); + } - @Override - public String toString() { - return getDescription(); - } + @Override + public String getDescription() { + return String.format("LinksBased{root:%s}", this.root.getDescription()); + } + + @Override + public String toString() { + return getDescription(); + } } From 3f246368fa22e659b777fffb4bfdadc38a1f911c Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Mon, 19 May 2025 22:29:17 +0000 Subject: [PATCH 3/3] ./gradlew spotlessApply --- .../contrib/sampler/LinksBasedSampler.java | 72 +++++++++---------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksBasedSampler.java b/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksBasedSampler.java index c7990a6bc..1dc5124f4 100644 --- a/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksBasedSampler.java +++ b/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksBasedSampler.java @@ -11,7 +11,6 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingResult; - import java.util.List; /** @@ -20,44 +19,43 @@ * links, this Sampler will use the "root" sampler that it is built with. */ public final class LinksBasedSampler implements Sampler { - private final Sampler root; - - private LinksBasedSampler(Sampler root) { - this.root = root; - } - - public static LinksBasedSampler create( - Sampler root) { - return new LinksBasedSampler(root); - } - - @Override - public SamplingResult shouldSample( - Context parentContext, - String traceId, - String name, - SpanKind spanKind, - Attributes attributes, - List parentLinks) { - if (parentLinks.size() > 0) { - for (LinkData linkData : parentLinks) { - if (linkData.getSpanContext().isSampled()) { - return SamplingResult.recordAndSample(); - } - } - return SamplingResult.drop(); + private final Sampler root; + + private LinksBasedSampler(Sampler root) { + this.root = root; + } + + public static LinksBasedSampler create(Sampler root) { + return new LinksBasedSampler(root); + } + + @Override + public SamplingResult shouldSample( + Context parentContext, + String traceId, + String name, + SpanKind spanKind, + Attributes attributes, + List parentLinks) { + if (parentLinks.size() > 0) { + for (LinkData linkData : parentLinks) { + if (linkData.getSpanContext().isSampled()) { + return SamplingResult.recordAndSample(); } - - return this.root.shouldSample(parentContext, traceId, name, spanKind, attributes, parentLinks); + } + return SamplingResult.drop(); } - @Override - public String getDescription() { - return String.format("LinksBased{root:%s}", this.root.getDescription()); - } + return this.root.shouldSample(parentContext, traceId, name, spanKind, attributes, parentLinks); + } - @Override - public String toString() { - return getDescription(); - } + @Override + public String getDescription() { + return String.format("LinksBased{root:%s}", this.root.getDescription()); + } + + @Override + public String toString() { + return getDescription(); + } }