Skip to content

Commit 011d725

Browse files
steveraosteverao
committed
feat: add support for elasticjob
1 parent 456a8b4 commit 011d725

23 files changed

+88
-93
lines changed

‎.fossa.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ targets:
7373
- type: gradle
7474
path: ./
7575
target: ':instrumentation:apache-dubbo-2.7:library-autoconfigure'
76+
- type: gradle
77+
path: ./
78+
target: ':instrumentation:apache-elasticjob-3.0:javaagent'
7679
- type: gradle
7780
path: ./
7881
target: ':instrumentation:apache-httpasyncclient-4.1:javaagent'
@@ -427,9 +430,6 @@ targets:
427430
- type: gradle
428431
path: ./
429432
target: ':instrumentation:dropwizard:dropwizard-views-0.7:javaagent'
430-
- type: gradle
431-
path: ./
432-
target: ':instrumentation:elasticjob-3.0:javaagent'
433433
- type: gradle
434434
path: ./
435435
target: ':instrumentation:elasticsearch:elasticsearch-api-client-7.16:javaagent'

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ These are the supported libraries and frameworks:
2929
| [Apache CXF JAX-WS](https://cxf.apache.org/) | 3.0+ (not including 4.0+ yet) | N/A | Provides `http.route` [2], Controller Spans [3] |
3030
| [Apache DBCP](https://commons.apache.org/proper/commons-dbcp/) | 2.0+ | [opentelemetry-apache-dbcp-2.0](../instrumentation/apache-dbcp-2.0/library) | [Database Pool Metrics] |
3131
| [Apache Dubbo](https://github.com/apache/dubbo/) | 2.7+ | [opentelemetry-apache-dubbo-2.7](../instrumentation/apache-dubbo-2.7/library-autoconfigure) | [RPC Client Spans], [RPC Server Spans] |
32+
| [Apache ElasticJob](https://shardingsphere.apache.org/elasticjob/) | 3.0+ | N/A | none |
3233
| [Apache HttpAsyncClient](https://hc.apache.org/index.html) | 4.1+ | N/A | [HTTP Client Spans], [HTTP Client Metrics] |
3334
| [Apache HttpClient](https://hc.apache.org/index.html) | 2.0+ | [opentelemetry-apache-httpclient-4.3](../instrumentation/apache-httpclient/apache-httpclient-4.3/library),<br>[opentelemetry-apache-httpclient-5.2](../instrumentation/apache-httpclient/apache-httpclient-5.2/library) | [HTTP Client Spans], [HTTP Client Metrics] |
3435
| [Apache ShenYu](https://shenyu.apache.org/) | 2.4+ | N/A | Provides `http.route` [2] |
@@ -63,7 +64,6 @@ These are the supported libraries and frameworks:
6364
| [Eclipse Jetty HTTP Client](https://www.eclipse.org/jetty/javadoc/jetty-9/org/eclipse/jetty/client/HttpClient.html) | 9.2 - 9.4.x,<br>12.0+ | [opentelemetry-jetty-httpclient-9.2](../instrumentation/jetty-httpclient/jetty-httpclient-9.2/library)<br>[opentelemetry-jetty-httpclient-12.0](../instrumentation/jetty-httpclient/jetty-httpclient-12.0/library) | [HTTP Client Spans], [HTTP Client Metrics] |
6465
| [Eclipse Metro](https://projects.eclipse.org/projects/ee4j.metro) | 2.2+ | N/A | Provides `http.route` [2], Controller Spans [3] |
6566
| [Eclipse Mojarra](https://projects.eclipse.org/projects/ee4j.mojarra) | 1.2+ (not including 4.0+ yet) | N/A | Provides `http.route` [2], Controller Spans [3] |
66-
| [ElasticJob](https://shardingsphere.apache.org/elasticjob/) | 3.0+ | N/A | none |
6767
| [Elasticsearch API Client](https://www.elastic.co/guide/en/elasticsearch/client/java-api-client/current/index.html) | 7.16 - 7.17.19,<br>8.0 - 8.9.+ [4] | N/A | [Elasticsearch Client Spans] |
6868
| [Elasticsearch REST Client](https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/index.html) | 5.0+ | N/A | [Database Client Spans], [Database Client Metrics]&nbsp;[6] |
6969
| [Elasticsearch Transport Client](https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/index.html) | 5.0+ | N/A | [Database Client Spans], [Database Client Metrics]&nbsp;[6] |

instrumentation/elasticjob-3.0/README.md renamed to instrumentation/apache-elasticjob-3.0/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Settings for the ElasticJob instrumentation
1+
# Settings for the Apache ElasticJob instrumentation
22

33
| System property | Type | Default | Description |
44
|------------------------------------------------------------------|---------|---------|-----------------------------------------------------|
5-
| `otel.instrumentation.elasticjob.experimental-span-attributes` | Boolean | `false` | Enable the capture of experimental span attributes. |
5+
| `otel.instrumentation.apache-elasticjob.experimental-span-attributes` | Boolean | `false` | Enable the capture of experimental span attributes. |

‎instrumentation/apache-elasticjob-3.0/javaagent/build.gradle.kts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
plugins {
2+
id("otel.javaagent-instrumentation")
3+
}
4+
5+
muzzle {
6+
pass {
7+
group.set("org.apache.shardingsphere.elasticjob")
8+
module.set("elasticjob-lite-core")
9+
versions.set("[3.0.0,)")
10+
assertInverse.set(true)
11+
}
12+
}
13+
14+
dependencies {
15+
library("org.apache.shardingsphere.elasticjob:elasticjob-lite-core:3.0.0")
16+
17+
testImplementation("org.apache.curator:curator-test:5.1.0")
18+
}
19+
20+
tasks.withType<Test>().configureEach {
21+
// required on jdk17
22+
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
23+
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
24+
jvmArgs("-Dotel.instrumentation.apache-elasticjob.experimental-span-attributes=true")
25+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.elasticjob.v3_0;
6+
package io.opentelemetry.javaagent.instrumentation.apacheelasticjob.v3_0;
77

8-
import static io.opentelemetry.javaagent.instrumentation.elasticjob.v3_0.ElasticJobSingletons.helper;
8+
import static io.opentelemetry.javaagent.instrumentation.apacheelasticjob.v3_0.ElasticJobSingletons.helper;
99
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1010
import static net.bytebuddy.matcher.ElementMatchers.named;
1111
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;

instrumentation/elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticjob/v3_0/ElasticJobCodeAttributesGetter.java renamed to instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobCodeAttributesGetter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.elasticjob.v3_0;
6+
package io.opentelemetry.javaagent.instrumentation.apacheelasticjob.v3_0;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
99
import javax.annotation.Nullable;

instrumentation/elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticjob/v3_0/ElasticJobExecutorInstrumentation.java renamed to instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobExecutorInstrumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.elasticjob.v3_0;
6+
package io.opentelemetry.javaagent.instrumentation.apacheelasticjob.v3_0;
77

8-
import static io.opentelemetry.javaagent.instrumentation.elasticjob.v3_0.ElasticJobSingletons.helper;
8+
import static io.opentelemetry.javaagent.instrumentation.apacheelasticjob.v3_0.ElasticJobSingletons.helper;
99
import static net.bytebuddy.matcher.ElementMatchers.named;
1010
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
1111

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.elasticjob.v3_0;
6+
package io.opentelemetry.javaagent.instrumentation.apacheelasticjob.v3_0;
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.common.AttributesBuilder;
@@ -15,15 +15,15 @@ class ElasticJobExperimentalAttributeExtractor
1515
implements AttributesExtractor<ElasticJobProcessRequest, Void> {
1616

1717
private static final AttributeKey<String> ELASTICJOB_JOB_NAME =
18-
AttributeKey.stringKey("scheduling.elasticjob.job.name");
18+
AttributeKey.stringKey("scheduling.apache-elasticjob.job.name");
1919
private static final AttributeKey<String> ELASTICJOB_TASK_ID =
20-
AttributeKey.stringKey("scheduling.elasticjob.task.id");
20+
AttributeKey.stringKey("scheduling.apache-elasticjob.task.id");
2121
private static final AttributeKey<Long> ELASTICJOB_ITEM =
22-
AttributeKey.longKey("scheduling.elasticjob.item");
22+
AttributeKey.longKey("scheduling.apache-elasticjob.item");
2323
private static final AttributeKey<Long> ELASTICJOB_SHARDING_TOTAL_COUNT =
24-
AttributeKey.longKey("scheduling.elasticjob.sharding.total.count");
24+
AttributeKey.longKey("scheduling.apache-elasticjob.sharding.total.count");
2525
private static final AttributeKey<String> ELASTICJOB_SHARDING_ITEM_PARAMETERS =
26-
AttributeKey.stringKey("scheduling.elasticjob.sharding.item.parameters");
26+
AttributeKey.stringKey("scheduling.apache-elasticjob.sharding.item.parameters");
2727

2828
@Override
2929
public void onStart(

instrumentation/elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticjob/v3_0/ElasticJobHelper.java renamed to instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.elasticjob.v3_0;
6+
package io.opentelemetry.javaagent.instrumentation.apacheelasticjob.v3_0;
77

88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.context.Scope;

instrumentation/elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticjob/v3_0/ElasticJobInstrumentationModule.java renamed to instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobInstrumentationModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.elasticjob.v3_0;
6+
package io.opentelemetry.javaagent.instrumentation.apacheelasticjob.v3_0;
77

88
import com.google.auto.service.AutoService;
99
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
@@ -17,7 +17,7 @@ public class ElasticJobInstrumentationModule extends InstrumentationModule
1717
implements ExperimentalInstrumentationModule {
1818

1919
public ElasticJobInstrumentationModule() {
20-
super("elasticjob", "elasticjob-3.0");
20+
super("apache-elasticjob", "apache-elasticjob-3.0");
2121
}
2222

2323
@Override

0 commit comments

Comments
 (0)