Skip to content

Commit b14e7bd

Browse files
committed
use ProcessIncubatingAttributes
1 parent c21e279 commit b14e7bd

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

instrumentation/resources/library/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ testing {
7777
dependencies {
7878
implementation(project(":instrumentation:resources:library"))
7979
implementation("io.opentelemetry:opentelemetry-sdk-common")
80+
implementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
8081
}
8182
}
8283
}

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
public final class ProcessResource {
2424

2525
// copied from ProcessIncubatingAttributes
26-
static final AttributeKey<List<String>> PROCESS_COMMAND_ARGS =
26+
private static final AttributeKey<List<String>> PROCESS_COMMAND_ARGS =
2727
AttributeKey.stringArrayKey("process.command_args");
28-
static final AttributeKey<String> PROCESS_COMMAND_LINE =
28+
private static final AttributeKey<String> PROCESS_COMMAND_LINE =
2929
AttributeKey.stringKey("process.command_line");
30-
static final AttributeKey<String> PROCESS_EXECUTABLE_PATH =
30+
private static final AttributeKey<String> PROCESS_EXECUTABLE_PATH =
3131
AttributeKey.stringKey("process.executable.path");
32-
static final AttributeKey<Long> PROCESS_PID = AttributeKey.longKey("process.pid");
32+
private static final AttributeKey<Long> PROCESS_PID = AttributeKey.longKey("process.pid");
3333

3434
// Note: This pattern doesn't support file paths with spaces in them.
3535
// Important: This is statically used in buildResource, so must be declared/initialized first.

instrumentation/resources/library/src/testSecurityManager/java/io/opentelemetry/instrumentation/resources/SecurityManagerResourceTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import io.opentelemetry.api.common.Attributes;
1111
import io.opentelemetry.sdk.resources.Resource;
12+
import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes;
1213
import org.junit.jupiter.api.Test;
1314
import org.junit.jupiter.api.TestInstance;
1415
import org.junit.jupiter.api.condition.EnabledOnJre;
@@ -36,7 +37,7 @@ void osResourceEmpty() {
3637
@Test
3738
void processResourceEmpty() {
3839
Attributes attributes = ProcessResource.buildResource().getAttributes();
39-
assertThat(attributes.asMap()).containsOnlyKeys(ProcessResource.PROCESS_PID);
40+
assertThat(attributes.asMap()).containsOnlyKeys(ProcessIncubatingAttributes.PROCESS_PID);
4041
}
4142

4243
@Test

0 commit comments

Comments
 (0)