Address review comments

Author: steverao

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

@@ -27,6 +27,8 @@ class ElasticJobExperimentalAttributeExtractor
       longKey("scheduling.apache-elasticjob.sharding.total.count");
   private static final AttributeKey<String> ELASTICJOB_SHARDING_ITEM_PARAMETER =
       stringKey("scheduling.apache-elasticjob.sharding.item.parameter");
+  private static final AttributeKey<String> ELASTICJOB_JOB_TYPE =
+      stringKey("scheduling.apache-elasticjob.job.type");
 
   @Override
   public void onStart(
@@ -38,9 +40,10 @@ public void onStart(
     attributes.put(ELASTICJOB_SHARDING_ITEM_INDEX, elasticJobProcessRequest.getShardingItemIndex());
     attributes.put(
         ELASTICJOB_SHARDING_TOTAL_COUNT, elasticJobProcessRequest.getShardingTotalCount());
-    String shardingItemParameters = elasticJobProcessRequest.getShardingItemParameter();
-    if (shardingItemParameters != null) {
-      attributes.put(ELASTICJOB_SHARDING_ITEM_PARAMETER, shardingItemParameters);
+    attributes.put(ELASTICJOB_JOB_TYPE, elasticJobProcessRequest.getJobType());
+    String shardingItemParameter = elasticJobProcessRequest.getShardingItemParameter();
+    if (shardingItemParameter != null) {
+      attributes.put(ELASTICJOB_SHARDING_ITEM_PARAMETER, shardingItemParameter);
     }
   }
 

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

@@ -85,6 +85,10 @@ public String getShardingItemParameter() {
     return this.shardingItemParameter;
   }
 
+  public String getJobType() {
+    return this.jobType;
+  }
+
   public Class<?> getUserJobClass() {
     return this.userJobClass;
   }

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

@@ -111,7 +111,8 @@ void testHttpJob() {
                                 3L,
                                 "Beijing",
                                 "process",
-                                "org.apache.shardingsphere.elasticjob.http.executor.HttpJobExecutor"))),
+                                "org.apache.shardingsphere.elasticjob.http.executor.HttpJobExecutor",
+                                "HTTP"))),
         trace ->
             trace.hasSpansSatisfyingExactly(
                 span ->
@@ -124,7 +125,8 @@ void testHttpJob() {
                                 3L,
                                 "Shanghai",
                                 "process",
-                                "org.apache.shardingsphere.elasticjob.http.executor.HttpJobExecutor"))),
+                                "org.apache.shardingsphere.elasticjob.http.executor.HttpJobExecutor",
+                                "HTTP"))),
         trace ->
             trace.hasSpansSatisfyingExactly(
                 span ->
@@ -137,7 +139,8 @@ void testHttpJob() {
                                 3L,
                                 "Guangzhou",
                                 "process",
-                                "org.apache.shardingsphere.elasticjob.http.executor.HttpJobExecutor"))));
+                                "org.apache.shardingsphere.elasticjob.http.executor.HttpJobExecutor",
+                                "HTTP"))));
   }
 
   @Test
@@ -169,7 +172,8 @@ void testSimpleJob() {
                                 2L,
                                 "A",
                                 "execute",
-                                TestSimpleJob.class.getName()))),
+                                TestSimpleJob.class.getName(),
+                                "SIMPLE"))),
         trace ->
             trace.hasSpansSatisfyingExactly(
                 span ->
@@ -182,7 +186,8 @@ void testSimpleJob() {
                                 2L,
                                 "B",
                                 "execute",
-                                TestSimpleJob.class.getName()))));
+                                TestSimpleJob.class.getName(),
+                                "SIMPLE"))));
   }
 
   @Test
@@ -214,7 +219,8 @@ void testDataflowJob() {
                                 2L,
                                 "X",
                                 "processData",
-                                TestDataflowJob.class.getName()))),
+                                TestDataflowJob.class.getName(),
+                                "DATAFLOW"))),
         trace ->
             trace.hasSpansSatisfyingExactly(
                 span ->
@@ -227,7 +233,8 @@ void testDataflowJob() {
                                 2L,
                                 "Y",
                                 "processData",
-                                TestDataflowJob.class.getName()))));
+                                TestDataflowJob.class.getName(),
+                                "DATAFLOW"))));
   }
 
   @Test
@@ -247,7 +254,8 @@ void testScriptJob() throws IOException {
                                 1L,
                                 null,
                                 "process",
-                                "org.apache.shardingsphere.elasticjob.script.executor.ScriptJobExecutor"))));
+                                "org.apache.shardingsphere.elasticjob.script.executor.ScriptJobExecutor",
+                                "SCRIPT"))));
   }
 
   @Test
@@ -280,7 +288,8 @@ void testFailedJob() {
                                 1L,
                                 "failed",
                                 "execute",
-                                TestFailedJob.class.getName()))));
+                                TestFailedJob.class.getName(),
+                                "SIMPLE"))));
   }
 
   private static CoordinatorRegistryCenter setUpRegistryCenter() {
@@ -346,20 +355,22 @@ private static List<AttributeAssertion> elasticJobAttributes(
       String jobName,
       long item,
       long totalCount,
-      String parameters,
+      String parameter,
       String codeFunction,
-      String codeNamespace) {
+      String codeNamespace,
+      String jobType) {
     List<AttributeAssertion> assertions =
         new ArrayList<>(
             asList(
                 equalTo(stringKey("code.function"), codeFunction),
                 equalTo(stringKey("code.namespace"), codeNamespace),
                 equalTo(stringKey("job.system"), "elasticjob"),
                 equalTo(stringKey("scheduling.apache-elasticjob.job.name"), jobName),
+                equalTo(stringKey("scheduling.apache-elasticjob.job.type"), jobType),
                 equalTo(longKey("scheduling.apache-elasticjob.sharding.item.index"), item),
                 equalTo(longKey("scheduling.apache-elasticjob.sharding.total.count"), totalCount),
                 equalTo(
-                    stringKey("scheduling.apache-elasticjob.sharding.item.parameters"), parameters),
+                    stringKey("scheduling.apache-elasticjob.sharding.item.parameter"), parameter),
                 satisfies(
                     stringKey("scheduling.apache-elasticjob.task.id"),
                     taskId -> taskId.contains(jobName))));