Skip to content

Commit de49063

Browse files
committed
Address review comment
1 parent b4604cf commit de49063

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobExperimentalAttributeExtractor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class ElasticJobExperimentalAttributeExtractor
1818
AttributeKey.stringKey("scheduling.apache-elasticjob.job.name");
1919
private static final AttributeKey<String> ELASTICJOB_TASK_ID =
2020
AttributeKey.stringKey("scheduling.apache-elasticjob.task.id");
21-
private static final AttributeKey<Long> ELASTICJOB_ITEM =
22-
AttributeKey.longKey("scheduling.apache-elasticjob.item");
21+
private static final AttributeKey<Long> ELASTICJOB_SHARDING_ITEM_INDEX =
22+
AttributeKey.longKey("scheduling.apache-elasticjob.sharding.item.index");
2323
private static final AttributeKey<Long> ELASTICJOB_SHARDING_TOTAL_COUNT =
2424
AttributeKey.longKey("scheduling.apache-elasticjob.sharding.total.count");
2525
private static final AttributeKey<String> ELASTICJOB_SHARDING_ITEM_PARAMETERS =
@@ -32,7 +32,7 @@ public void onStart(
3232
ElasticJobProcessRequest elasticJobProcessRequest) {
3333
attributes.put(ELASTICJOB_JOB_NAME, elasticJobProcessRequest.getJobName());
3434
attributes.put(ELASTICJOB_TASK_ID, elasticJobProcessRequest.getTaskId());
35-
attributes.put(ELASTICJOB_ITEM, elasticJobProcessRequest.getItem());
35+
attributes.put(ELASTICJOB_SHARDING_ITEM_INDEX, elasticJobProcessRequest.getShardingItemIndex());
3636
attributes.put(
3737
ELASTICJOB_SHARDING_TOTAL_COUNT, elasticJobProcessRequest.getShardingTotalCount());
3838
if (elasticJobProcessRequest.getShardingItemParameters() != null) {

instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobProcessRequest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public final class ElasticJobProcessRequest {
99
private String jobName;
1010
private String taskId;
11-
private int item;
11+
private int shardingItemIndex;
1212
private int shardingTotalCount;
1313
private String shardingItemParameters;
1414
private boolean failed;
@@ -19,14 +19,14 @@ public final class ElasticJobProcessRequest {
1919
public static ElasticJobProcessRequest create(
2020
String jobName,
2121
String taskId,
22-
int item,
22+
int shardingItemIndex,
2323
int shardingTotalCount,
2424
String shardingItemParameters,
2525
String jobType) {
2626
ElasticJobProcessRequest request = new ElasticJobProcessRequest();
2727
request.jobName = jobName;
2828
request.taskId = taskId;
29-
request.item = item;
29+
request.shardingItemIndex = shardingItemIndex;
3030
request.shardingTotalCount = shardingTotalCount;
3131
request.shardingItemParameters = shardingItemParameters;
3232
request.jobType = jobType;
@@ -36,7 +36,7 @@ public static ElasticJobProcessRequest create(
3636
public static ElasticJobProcessRequest createWithUserJobInfo(
3737
String jobName,
3838
String taskId,
39-
int item,
39+
int shardingItemIndex,
4040
int shardingTotalCount,
4141
String shardingItemParameters,
4242
String jobType,
@@ -45,7 +45,7 @@ public static ElasticJobProcessRequest createWithUserJobInfo(
4545
ElasticJobProcessRequest request = new ElasticJobProcessRequest();
4646
request.jobName = jobName;
4747
request.taskId = taskId;
48-
request.item = item;
48+
request.shardingItemIndex = shardingItemIndex;
4949
request.shardingTotalCount = shardingTotalCount;
5050
request.shardingItemParameters = shardingItemParameters;
5151
request.jobType = jobType;
@@ -70,8 +70,8 @@ public String getTaskId() {
7070
return this.taskId;
7171
}
7272

73-
public int getItem() {
74-
return this.item;
73+
public int getShardingItemIndex() {
74+
return this.shardingItemIndex;
7575
}
7676

7777
public int getShardingTotalCount() {

instrumentation/apache-elasticjob-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void testHttpJob() {
9494
bootstrap.schedule();
9595

9696
testing.waitAndAssertSortedTraces(
97-
comparingRootSpanAttribute(longKey("scheduling.apache-elasticjob.item")),
97+
comparingRootSpanAttribute(longKey("scheduling.apache-elasticjob.sharding.item.index")),
9898
trace ->
9999
trace.hasSpansSatisfyingExactly(
100100
span ->
@@ -140,7 +140,7 @@ void testSimpleJob() {
140140
bootstrap.schedule();
141141

142142
testing.waitAndAssertSortedTraces(
143-
comparingRootSpanAttribute(longKey("scheduling.apache-elasticjob.item")),
143+
comparingRootSpanAttribute(longKey("scheduling.apache-elasticjob.sharding.item.index")),
144144
trace ->
145145
trace.hasSpansSatisfyingExactly(
146146
span ->
@@ -188,7 +188,7 @@ void testDataflowJob() {
188188
bootstrap.schedule();
189189

190190
testing.waitAndAssertSortedTraces(
191-
comparingRootSpanAttribute(longKey("scheduling.apache-elasticjob.item")),
191+
comparingRootSpanAttribute(longKey("scheduling.apache-elasticjob.sharding.item.index")),
192192
trace ->
193193
trace.hasSpansSatisfyingExactly(
194194
span ->
@@ -335,7 +335,7 @@ private static List<AttributeAssertion> elasticJobBaseAttributes(
335335
List<AttributeAssertion> assertions = new ArrayList<>();
336336
assertions.add(equalTo(stringKey("job.system"), "elasticjob"));
337337
assertions.add(equalTo(stringKey("scheduling.apache-elasticjob.job.name"), jobName));
338-
assertions.add(equalTo(longKey("scheduling.apache-elasticjob.item"), item));
338+
assertions.add(equalTo(longKey("scheduling.apache-elasticjob.sharding.item.index"), item));
339339
assertions.add(
340340
equalTo(longKey("scheduling.apache-elasticjob.sharding.total.count"), totalCount));
341341
assertions.add(

0 commit comments

Comments
 (0)