review

Author: laurit

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

@@ -50,8 +50,8 @@ public static ElasticJobHelper.ElasticJobScope onEnter(
         @Advice.Argument(3) ShardingContext shardingContext) {
 
       ElasticJobProcessRequest request =
-          ElasticJobProcessRequest.createFromShardingContext(
-              shardingContext, "DATAFLOW", elasticJob.getClass(), "processData");
+          ElasticJobProcessRequest.create(
+              shardingContext, ElasticJobType.DATAFLOW, elasticJob.getClass(), "processData");
 
       return helper().startSpan(request);
     }

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

@@ -40,7 +40,7 @@ public void onStart(
     attributes.put(ELASTICJOB_SHARDING_ITEM_INDEX, elasticJobProcessRequest.getShardingItemIndex());
     attributes.put(
         ELASTICJOB_SHARDING_TOTAL_COUNT, elasticJobProcessRequest.getShardingTotalCount());
-    attributes.put(ELASTICJOB_JOB_TYPE, elasticJobProcessRequest.getJobType());
+    attributes.put(ELASTICJOB_JOB_TYPE, elasticJobProcessRequest.getJobType().name());
     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

@@ -13,56 +13,35 @@ public final class ElasticJobProcessRequest {
   private final int shardingItemIndex;
   private final int shardingTotalCount;
   private final String shardingItemParameter;
-  private final String jobType;
-  private Class<?> userJobClass;
-  private String userMethodName = "process";
+  private final ElasticJobType jobType;
+  private final Class<?> userJobClass;
+  private final String userMethodName;
 
   private ElasticJobProcessRequest(
-      String jobName,
-      String taskId,
-      int shardingItemIndex,
-      int shardingTotalCount,
-      String shardingItemParameter,
-      String jobType) {
-    this.jobName = jobName;
-    this.taskId = taskId;
-    this.shardingItemIndex = shardingItemIndex;
-    this.shardingTotalCount = shardingTotalCount;
-    this.shardingItemParameter = emptyToNull(shardingItemParameter);
+      ShardingContext shardingContext,
+      ElasticJobType jobType,
+      Class<?> userJobClass,
+      String userMethodNam) {
+    this.jobName = shardingContext.getJobName();
+    this.taskId = shardingContext.getTaskId();
+    this.shardingItemIndex = shardingContext.getShardingItem();
+    this.shardingTotalCount = shardingContext.getShardingTotalCount();
+    this.shardingItemParameter = emptyToNull(shardingContext.getShardingParameter());
     this.jobType = jobType;
-  }
-
-  public static ElasticJobProcessRequest create(
-      String jobName,
-      String taskId,
-      int shardingItemIndex,
-      int shardingTotalCount,
-      String shardingItemParameters,
-      String jobType) {
-    return new ElasticJobProcessRequest(
-        jobName, taskId, shardingItemIndex, shardingTotalCount, shardingItemParameters, jobType);
+    this.userJobClass = userJobClass;
+    this.userMethodName = userMethodNam;
   }
 
   private static String emptyToNull(String string) {
     return string == null || string.isEmpty() ? null : string;
   }
 
-  public static ElasticJobProcessRequest createFromShardingContext(
+  public static ElasticJobProcessRequest create(
       ShardingContext shardingContext,
-      String jobType,
+      ElasticJobType jobType,
       Class<?> userJobClass,
       String userMethodName) {
-    ElasticJobProcessRequest request =
-        create(
-            shardingContext.getJobName(),
-            shardingContext.getTaskId(),
-            shardingContext.getShardingItem(),
-            shardingContext.getShardingTotalCount(),
-            shardingContext.getShardingParameter(),
-            jobType);
-    request.userJobClass = userJobClass;
-    request.userMethodName = userMethodName;
-    return request;
+    return new ElasticJobProcessRequest(shardingContext, jobType, userJobClass, userMethodName);
   }
 
   public String getJobName() {
@@ -85,7 +64,7 @@ public String getShardingItemParameter() {
     return this.shardingItemParameter;
   }
 
-  public String getJobType() {
+  public ElasticJobType getJobType() {
     return this.jobType;
   }
 

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

@@ -8,6 +8,7 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.common.AttributeKey;
 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;
@@ -29,7 +30,7 @@ private static Instrumenter<ElasticJobProcessRequest, Void> createInstrumenter()
         Instrumenter.<ElasticJobProcessRequest, Void>builder(
                 GlobalOpenTelemetry.get(),
                 INSTRUMENTATION_NAME,
-                new ElasticJobSpanNameExtractor(codeAttributesGetter))
+                CodeSpanNameExtractor.create(codeAttributesGetter))
             .addAttributesExtractor(CodeAttributesExtractor.create(codeAttributesGetter));
     if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) {
       builder.addAttributesExtractor(

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

@@ -0,0 +1,13 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.apacheelasticjob.v3_0;
+
+public enum ElasticJobType {
+  SIMPLE,
+  DATAFLOW,
+  HTTP,
+  SCRIPT;
+}

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

@@ -43,8 +43,8 @@ public static ElasticJobHelper.ElasticJobScope onEnter(
         @Advice.Argument(3) ShardingContext shardingContext) {
 
       ElasticJobProcessRequest request =
-          ElasticJobProcessRequest.createFromShardingContext(
-              shardingContext, "HTTP", HttpJobExecutor.class, "process");
+          ElasticJobProcessRequest.create(
+              shardingContext, ElasticJobType.HTTP, HttpJobExecutor.class, "process");
 
       return helper().startSpan(request);
     }

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

@@ -43,8 +43,8 @@ public static ElasticJobHelper.ElasticJobScope onEnter(
         @Advice.Argument(3) ShardingContext shardingContext) {
 
       ElasticJobProcessRequest request =
-          ElasticJobProcessRequest.createFromShardingContext(
-              shardingContext, "SCRIPT", ScriptJobExecutor.class, "process");
+          ElasticJobProcessRequest.create(
+              shardingContext, ElasticJobType.SCRIPT, ScriptJobExecutor.class, "process");
 
       return helper().startSpan(request);
     }

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

@@ -50,8 +50,8 @@ public static ElasticJobHelper.ElasticJobScope onEnter(
         @Advice.Argument(3) ShardingContext shardingContext) {
 
       ElasticJobProcessRequest request =
-          ElasticJobProcessRequest.createFromShardingContext(
-              shardingContext, "SIMPLE", elasticJob.getClass(), "execute");
+          ElasticJobProcessRequest.create(
+              shardingContext, ElasticJobType.SIMPLE, elasticJob.getClass(), "execute");
 
       return helper().startSpan(request);
     }

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

@@ -28,7 +28,6 @@
 import java.net.InetSocketAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
@@ -359,21 +358,16 @@ private static List<AttributeAssertion> elasticJobAttributes(
       String codeFunction,
       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.parameter"), parameter),
-                satisfies(
-                    stringKey("scheduling.apache-elasticjob.task.id"),
-                    taskId -> taskId.contains(jobName))));
-    return assertions;
+    return 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.parameter"), parameter),
+        satisfies(
+            stringKey("scheduling.apache-elasticjob.task.id"), taskId -> taskId.contains(jobName)));
   }
 }