Skip to content

Remove AgentInstrumentationConfig usages: Scheduling #15674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
trask wants to merge 1 commit into from
Closed

Remove AgentInstrumentationConfig usages: Scheduling #15674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...o/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeSpanNameExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;

public final class ElasticJobSingletons {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-elasticjob-3.0";
private static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
AgentInstrumentationConfig.get()
.getBoolean("otel.instrumentation.apache-elasticjob.experimental-span-attributes", false);
DeclarativeConfigUtil.get(GlobalOpenTelemetry.get())
.get("apache_elasticjob")
.getBoolean("experimental_span_attributes", false);

private static final Instrumenter<ElasticJobProcessRequest, Void> INSTRUMENTER =
createInstrumenter();
Expand Down
7 changes: 4 additions & 3 deletions ...ain/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,23 @@
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeSpanNameExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor;
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
import tech.powerjob.worker.core.processor.ProcessResult;

public final class PowerJobSingletons {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.powerjob-4.0";

private static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
AgentInstrumentationConfig.get()
.getBoolean("otel.instrumentation.powerjob.experimental-span-attributes", false);
DeclarativeConfigUtil.get(GlobalOpenTelemetry.get())
.get("powerjob")
.getBoolean("experimental_span_attributes", false);
private static final Instrumenter<PowerJobProcessRequest, ProcessResult> INSTRUMENTER = create();

public static Instrumenter<PowerJobProcessRequest, ProcessResult> instrumenter() {
Expand Down
7 changes: 4 additions & 3 deletions ...rc/main/java/io/opentelemetry/javaagent/instrumentation/quartz/v2_0/QuartzSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@
package io.opentelemetry.javaagent.instrumentation.quartz.v2_0;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.quartz.v2_0.QuartzTelemetry;
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;

public final class QuartzSingletons {

public static final QuartzTelemetry TELEMETRY =
QuartzTelemetry.builder(GlobalOpenTelemetry.get())
.setCaptureExperimentalSpanAttributes(
AgentInstrumentationConfig.get()
.getBoolean("otel.instrumentation.quartz.experimental-span-attributes", false))
DeclarativeConfigUtil.get(GlobalOpenTelemetry.get())
.get("quartz")
.getBoolean("experimental_span_attributes", false))

@zeitlinger zeitlinger Dec 17, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use /development suffix

.build();

private QuartzSingletons() {}
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/AdviceScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

package io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0;

import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.SpringBatchInstrumentationConfig.shouldTraceItems;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.item.ItemSingletons.getChunkContext;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.item.ItemSingletons.itemInstrumenter;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.item.ItemSingletons.shouldTraceItems;

import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
Expand Down
35 changes: 0 additions & 35 deletions ...lemetry/javaagent/instrumentation/spring/batch/v3_0/SpringBatchInstrumentationConfig.java
View file
Open in desktop

This file was deleted.

17 changes: 13 additions & 4 deletions ...a/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/chunk/ChunkSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
package io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.chunk;

import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.SpringBatchInstrumentationConfig.instrumentationName;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.SpringBatchInstrumentationConfig.shouldCreateRootSpanForChunk;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.job.JobSingletons.instrumentationName;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanContext;
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
import io.opentelemetry.instrumentation.api.instrumenter.SpanLinksBuilder;
Expand All @@ -21,14 +21,19 @@

public class ChunkSingletons {

private static final boolean CREATE_ROOT_SPAN_FOR_CHUNK =
DeclarativeConfigUtil.get(GlobalOpenTelemetry.get())
.get("spring_batch")
.get("chunk/development")
.getBoolean("new_trace", false);
private static final Instrumenter<ChunkContextAndBuilder, Void> INSTRUMENTER;

static {
InstrumenterBuilder<ChunkContextAndBuilder, Void> instrumenterBuilder =
Instrumenter.builder(
GlobalOpenTelemetry.get(), instrumentationName(), ChunkSingletons::spanName);

if (shouldCreateRootSpanForChunk()) {
if (CREATE_ROOT_SPAN_FOR_CHUNK) {
instrumenterBuilder.addSpanLinksExtractor(ChunkSingletons::extractSpanLinks);
}

Expand All @@ -43,7 +48,7 @@ private static void extractSpanLinks(
SpanLinksBuilder spanLinks, Context unused, ChunkContextAndBuilder request) {
// The context passed will be Context.root() if shouldCreateRootSpanForChunk()
Context parentContext = currentContext();
if (shouldCreateRootSpanForChunk()) {
if (CREATE_ROOT_SPAN_FOR_CHUNK) {
SpanContext parentSpanContext = Span.fromContext(parentContext).getSpanContext();
if (parentSpanContext.isValid()) {
spanLinks.addLink(parentSpanContext);
Expand All @@ -62,5 +67,9 @@ private static String spanName(ChunkContextAndBuilder chunkContextAndBuilder) {
return "BatchJob " + jobName + "." + stepName + "." + type;
}

public static boolean shouldCreateRootSpanForChunk() {
return CREATE_ROOT_SPAN_FOR_CHUNK;
}

private ChunkSingletons() {}
}
2 changes: 1 addition & 1 deletion ...etry/javaagent/instrumentation/spring/batch/v3_0/chunk/TracingChunkExecutionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

package io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.chunk;

import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.SpringBatchInstrumentationConfig.shouldCreateRootSpanForChunk;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.chunk.ChunkSingletons.chunkInstrumenter;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.chunk.ChunkSingletons.shouldCreateRootSpanForChunk;
import static java.util.Objects.requireNonNull;

import io.opentelemetry.context.Context;
Expand Down
2 changes: 1 addition & 1 deletion ...javaagent/instrumentation/spring/batch/v3_0/item/ChunkOrientedTaskletInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.item;

import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.SpringBatchInstrumentationConfig.shouldTraceItems;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.item.ItemSingletons.shouldTraceItems;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.item.ItemSingletons.startChunk;
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named;
Expand Down
12 changes: 11 additions & 1 deletion ...ava/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/item/ItemSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@

package io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.item;

import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.SpringBatchInstrumentationConfig.instrumentationName;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.job.JobSingletons.instrumentationName;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.ContextKey;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import javax.annotation.Nullable;
import org.springframework.batch.core.scope.context.ChunkContext;
Expand All @@ -20,6 +21,11 @@ public class ItemSingletons {
static final String ITEM_OPERATION_WRITE = "ItemWrite";
static final String ITEM_OPERATION_PROCESS = "ItemProcess";

private static final boolean ITEM_ENABLED =
DeclarativeConfigUtil.get(GlobalOpenTelemetry.get())
.get("spring_batch")
.get("item")
.getBoolean("enabled", false);
private static final Instrumenter<String, Void> INSTRUMENTER =
Instrumenter.<String, Void>builder(
GlobalOpenTelemetry.get(), instrumentationName(), str -> str)
Expand Down Expand Up @@ -53,5 +59,9 @@ public static ChunkContext getChunkContext(Context currentContext) {
return currentContext.get(CHUNK_CONTEXT_KEY);
}

public static boolean shouldTraceItems() {
return ITEM_ENABLED;
}

private ItemSingletons() {}
}
17 changes: 10 additions & 7 deletions .../java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/job/JobSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,27 @@

package io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.job;

import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.SpringBatchInstrumentationConfig.instrumentationName;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
import org.springframework.batch.core.JobExecution;

public class JobSingletons {

private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-batch-3.0";
private static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
AgentInstrumentationConfig.get()
.getBoolean("otel.instrumentation.spring-batch.experimental-span-attributes", false);

DeclarativeConfigUtil.get(GlobalOpenTelemetry.get())
.get("spring_batch")
.getBoolean("experimental_span_attributes", false);
private static final Instrumenter<JobExecution, Void> INSTRUMENTER;

static {
InstrumenterBuilder<JobExecution, Void> instrumenter =
Instrumenter.builder(
GlobalOpenTelemetry.get(), instrumentationName(), JobSingletons::extractSpanName);
GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, JobSingletons::extractSpanName);
if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) {
instrumenter.addAttributesExtractor(
AttributesExtractor.constant(AttributeKey.stringKey("job.system"), "spring_batch"));
Expand All @@ -42,5 +41,9 @@ public static Instrumenter<JobExecution, Void> jobInstrumenter() {
return INSTRUMENTER;
}

public static String instrumentationName() {
return INSTRUMENTATION_NAME;
}

private JobSingletons() {}
}
2 changes: 1 addition & 1 deletion ...ava/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/step/StepSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.step;

import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.SpringBatchInstrumentationConfig.instrumentationName;
import static io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.job.JobSingletons.instrumentationName;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
Expand Down
7 changes: 4 additions & 3 deletions ...elemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeSpanNameExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;

public final class SpringSchedulingSingletons {

private static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
AgentInstrumentationConfig.get()
.getBoolean("otel.instrumentation.spring-scheduling.experimental-span-attributes", false);
DeclarativeConfigUtil.get(GlobalOpenTelemetry.get())
.get("spring_scheduling")
.getBoolean("experimental_span_attributes", false);

private static final Instrumenter<Runnable, Void> INSTRUMENTER;

Expand Down
7 changes: 4 additions & 3 deletions ...a/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobInstrumenterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,18 @@
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;

public final class XxlJobInstrumenterFactory {

private static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
AgentInstrumentationConfig.get()
.getBoolean("otel.instrumentation.xxl-job.experimental-span-attributes", false);
DeclarativeConfigUtil.get(GlobalOpenTelemetry.get())
.get("xxl_job")
.getBoolean("experimental_span_attributes", false);

public static Instrumenter<XxlJobProcessRequest, Void> create(String instrumentationName) {
XxlJobCodeAttributesGetter codeAttributesGetter = new XxlJobCodeAttributesGetter();
Expand Down
Loading