Skip to content

Commit a039a52

Browse files
authored
Bump to semantic-conventions v1.30.0 (#141)
* Bump to semantic-conventions v1.30.0 * Exclude dotnet namespace
1 parent cafdb53 commit a039a52

27 files changed

+916
-140
lines changed

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ val snapshot = true
1111
// end
1212

1313
// The release version of https://github.com/open-telemetry/semantic-conventions used to generate classes
14-
var semanticConventionsVersion = "1.29.0"
14+
var semanticConventionsVersion = "1.30.0"
1515
val schemaUrlVersions = listOf(
1616
semanticConventionsVersion,
17+
"1.29.0",
1718
"1.28.0",
1819
"1.27.0",
1920
"1.26.0",

buildscripts/templates/registry/incubating_java/weaver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
params:
2-
excluded_namespaces: ["ios", "aspnetcore", "signalr"]
2+
excluded_namespaces: ["dotnet", "ios", "aspnetcore", "signalr"]
33
excluded_attributes: ["messaging.client_id", "exception.escaped"]
44
comment_formats:
55
javadoc:

buildscripts/templates/registry/java/weaver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
params:
2-
excluded_namespaces: ["ios", "aspnetcore", "signalr"]
2+
excluded_namespaces: ["dotnet", "ios", "aspnetcore", "signalr"]
33
# excluding "exception.escaped" from stable attributes
44
# because we are anticipating it being deprecated soon
55
excluded_attributes: ["messaging.client_id", "exception.escaped"]

docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Comparing source compatibility of opentelemetry-semconv-1.29.0-SNAPSHOT.jar against
1+
Comparing source compatibility of opentelemetry-semconv-1.30.0-SNAPSHOT.jar against
22
+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.semconv.AttributeKeyTemplate (not serializable)
33
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
44
GENERIC TEMPLATES: +++ T:java.lang.Object
@@ -117,6 +117,7 @@ Comparing source compatibility of opentelemetry-semconv-1.29.0-SNAPSHOT.jar agai
117117
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
118118
+++ NEW SUPERCLASS: java.lang.Object
119119
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_24_0
120+
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_30_0
120121
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_29_0
121122
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_28_0
122123
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_27_0

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ArtifactIncubatingAttributes.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public final class ArtifactIncubatingAttributes {
2424

2525
/**
2626
* The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
27-
* glossary)</a>, of the built attestation. Some envelopes in the software attestation space also
28-
* refer to this as the <a
29-
* href="https://github.com/in-toto/attestation/blob/main/spec/README.md#in-toto-attestation-framework-spec">digest</a>.
27+
* glossary)</a>, of the built attestation. Some envelopes in the <a
28+
* href="https://github.com/in-toto/attestation/tree/main/spec">software attestation space</a>
29+
* also refer to this as the <strong>digest</strong>.
3030
*/
3131
public static final AttributeKey<String> ARTIFACT_ATTESTATION_HASH =
3232
stringKey("artifact.attestation.hash");

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AwsIncubatingAttributes.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ public final class AwsIncubatingAttributes {
151151
/** The ARN of an EKS cluster. */
152152
public static final AttributeKey<String> AWS_EKS_CLUSTER_ARN = stringKey("aws.eks.cluster.arn");
153153

154+
/** The AWS extended request ID as returned in the response header {@code x-amz-id-2}. */
155+
public static final AttributeKey<String> AWS_EXTENDED_REQUEST_ID =
156+
stringKey("aws.extended_request_id");
157+
154158
/**
155159
* The full invoked ARN as provided on the {@code Context} passed to the function ({@code
156160
* Lambda-Runtime-Invoked-Function-Arn} header on the {@code /runtime/invocation/next}
@@ -204,8 +208,8 @@ public final class AwsIncubatingAttributes {
204208
stringArrayKey("aws.log.stream.names");
205209

206210
/**
207-
* The AWS request ID as returned in the response headers {@code x-amz-request-id} or {@code
208-
* x-amz-requestid}.
211+
* The AWS request ID as returned in the response headers {@code x-amzn-requestid}, {@code
212+
* x-amzn-request-id} or {@code x-amz-request-id}.
209213
*/
210214
public static final AttributeKey<String> AWS_REQUEST_ID = stringKey("aws.request_id");
211215

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.semconv.incubating;
7+
8+
import static io.opentelemetry.api.common.AttributeKey.doubleKey;
9+
import static io.opentelemetry.api.common.AttributeKey.longKey;
10+
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
11+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
12+
13+
import io.opentelemetry.api.common.AttributeKey;
14+
import java.util.List;
15+
16+
// DO NOT EDIT, this is an Auto-generated file from
17+
// buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2
18+
@SuppressWarnings("unused")
19+
public final class AzureIncubatingAttributes {
20+
/** The unique identifier of the client instance. */
21+
public static final AttributeKey<String> AZURE_CLIENT_ID = stringKey("azure.client.id");
22+
23+
/** Cosmos client connection mode. */
24+
public static final AttributeKey<String> AZURE_COSMOSDB_CONNECTION_MODE =
25+
stringKey("azure.cosmosdb.connection.mode");
26+
27+
/**
28+
* Account or request <a
29+
* href="https://learn.microsoft.com/azure/cosmos-db/consistency-levels">consistency level</a>.
30+
*/
31+
public static final AttributeKey<String> AZURE_COSMOSDB_CONSISTENCY_LEVEL =
32+
stringKey("azure.cosmosdb.consistency.level");
33+
34+
/**
35+
* List of regions contacted during operation in the order that they were contacted. If there is
36+
* more than one region listed, it indicates that the operation was performed on multiple regions
37+
* i.e. cross-regional call.
38+
*
39+
* <p>Notes:
40+
*
41+
* <p>Region name matches the format of {@code displayName} in <a
42+
* href="https://learn.microsoft.com/rest/api/subscription/subscriptions/list-locations?view=rest-subscription-2021-10-01&tabs=HTTP#location">Azure
43+
* Location API</a>
44+
*/
45+
public static final AttributeKey<List<String>> AZURE_COSMOSDB_OPERATION_CONTACTED_REGIONS =
46+
stringArrayKey("azure.cosmosdb.operation.contacted_regions");
47+
48+
/** The number of request units consumed by the operation. */
49+
public static final AttributeKey<Double> AZURE_COSMOSDB_OPERATION_REQUEST_CHARGE =
50+
doubleKey("azure.cosmosdb.operation.request_charge");
51+
52+
/** Request payload size in bytes. */
53+
public static final AttributeKey<Long> AZURE_COSMOSDB_REQUEST_BODY_SIZE =
54+
longKey("azure.cosmosdb.request.body.size");
55+
56+
/** Cosmos DB sub status code. */
57+
public static final AttributeKey<Long> AZURE_COSMOSDB_RESPONSE_SUB_STATUS_CODE =
58+
longKey("azure.cosmosdb.response.sub_status_code");
59+
60+
// Enum definitions
61+
/** Values for {@link #AZURE_COSMOSDB_CONNECTION_MODE}. */
62+
public static final class AzureCosmosdbConnectionModeIncubatingValues {
63+
/** Gateway (HTTP) connection. */
64+
public static final String GATEWAY = "gateway";
65+
66+
/** Direct connection. */
67+
public static final String DIRECT = "direct";
68+
69+
private AzureCosmosdbConnectionModeIncubatingValues() {}
70+
}
71+
72+
/** Values for {@link #AZURE_COSMOSDB_CONSISTENCY_LEVEL}. */
73+
public static final class AzureCosmosdbConsistencyLevelIncubatingValues {
74+
/** strong. */
75+
public static final String STRONG = "Strong";
76+
77+
/** bounded_staleness. */
78+
public static final String BOUNDED_STALENESS = "BoundedStaleness";
79+
80+
/** session. */
81+
public static final String SESSION = "Session";
82+
83+
/** eventual. */
84+
public static final String EVENTUAL = "Eventual";
85+
86+
/** consistent_prefix. */
87+
public static final String CONSISTENT_PREFIX = "ConsistentPrefix";
88+
89+
private AzureCosmosdbConsistencyLevelIncubatingValues() {}
90+
}
91+
92+
private AzureIncubatingAttributes() {}
93+
}
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.semconv.incubating;
7+
8+
import static io.opentelemetry.api.common.AttributeKey.booleanKey;
9+
import static io.opentelemetry.api.common.AttributeKey.longKey;
10+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
11+
12+
import io.opentelemetry.api.common.AttributeKey;
13+
14+
// DO NOT EDIT, this is an Auto-generated file from
15+
// buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2
16+
@SuppressWarnings("unused")
17+
public final class CassandraIncubatingAttributes {
18+
/**
19+
* The consistency level of the query. Based on consistency values from <a
20+
* href="https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html">CQL</a>.
21+
*/
22+
public static final AttributeKey<String> CASSANDRA_CONSISTENCY_LEVEL =
23+
stringKey("cassandra.consistency.level");
24+
25+
/** The data center of the coordinating node for a query. */
26+
public static final AttributeKey<String> CASSANDRA_COORDINATOR_DC =
27+
stringKey("cassandra.coordinator.dc");
28+
29+
/** The ID of the coordinating node for a query. */
30+
public static final AttributeKey<String> CASSANDRA_COORDINATOR_ID =
31+
stringKey("cassandra.coordinator.id");
32+
33+
/** The fetch size used for paging, i.e. how many rows will be returned at once. */
34+
public static final AttributeKey<Long> CASSANDRA_PAGE_SIZE = longKey("cassandra.page.size");
35+
36+
/** Whether or not the query is idempotent. */
37+
public static final AttributeKey<Boolean> CASSANDRA_QUERY_IDEMPOTENT =
38+
booleanKey("cassandra.query.idempotent");
39+
40+
/**
41+
* The number of times a query was speculatively executed. Not set or {@code 0} if the query was
42+
* not executed speculatively.
43+
*/
44+
public static final AttributeKey<Long> CASSANDRA_SPECULATIVE_EXECUTION_COUNT =
45+
longKey("cassandra.speculative_execution.count");
46+
47+
// Enum definitions
48+
/** Values for {@link #CASSANDRA_CONSISTENCY_LEVEL}. */
49+
public static final class CassandraConsistencyLevelIncubatingValues {
50+
/** all. */
51+
public static final String ALL = "all";
52+
53+
/** each_quorum. */
54+
public static final String EACH_QUORUM = "each_quorum";
55+
56+
/** quorum. */
57+
public static final String QUORUM = "quorum";
58+
59+
/** local_quorum. */
60+
public static final String LOCAL_QUORUM = "local_quorum";
61+
62+
/** one. */
63+
public static final String ONE = "one";
64+
65+
/** two. */
66+
public static final String TWO = "two";
67+
68+
/** three. */
69+
public static final String THREE = "three";
70+
71+
/** local_one. */
72+
public static final String LOCAL_ONE = "local_one";
73+
74+
/** any. */
75+
public static final String ANY = "any";
76+
77+
/** serial. */
78+
public static final String SERIAL = "serial";
79+
80+
/** local_serial. */
81+
public static final String LOCAL_SERIAL = "local_serial";
82+
83+
private CassandraConsistencyLevelIncubatingValues() {}
84+
}
85+
86+
private CassandraIncubatingAttributes() {}
87+
}

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CicdIncubatingAttributes.java

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,16 @@ public final class CicdIncubatingAttributes {
1616
/** The human readable name of the pipeline within a CI/CD system. */
1717
public static final AttributeKey<String> CICD_PIPELINE_NAME = stringKey("cicd.pipeline.name");
1818

19+
/** The result of a pipeline run. */
20+
public static final AttributeKey<String> CICD_PIPELINE_RESULT = stringKey("cicd.pipeline.result");
21+
1922
/** The unique identifier of a pipeline run within a CI/CD system. */
2023
public static final AttributeKey<String> CICD_PIPELINE_RUN_ID = stringKey("cicd.pipeline.run.id");
2124

25+
/** The pipeline run goes through these states during its lifecycle. */
26+
public static final AttributeKey<String> CICD_PIPELINE_RUN_STATE =
27+
stringKey("cicd.pipeline.run.state");
28+
2229
/**
2330
* The human readable name of a task within a pipeline. Task here most closely aligns with a <a
2431
* href="https://wikipedia.org/wiki/Pipeline_(computing)">computing process</a> in a pipeline.
@@ -42,7 +49,64 @@ public final class CicdIncubatingAttributes {
4249
public static final AttributeKey<String> CICD_PIPELINE_TASK_TYPE =
4350
stringKey("cicd.pipeline.task.type");
4451

52+
/** The name of a component of the CICD system. */
53+
public static final AttributeKey<String> CICD_SYSTEM_COMPONENT =
54+
stringKey("cicd.system.component");
55+
56+
/** The state of a CICD worker / agent. */
57+
public static final AttributeKey<String> CICD_WORKER_STATE = stringKey("cicd.worker.state");
58+
4559
// Enum definitions
60+
/** Values for {@link #CICD_PIPELINE_RESULT}. */
61+
public static final class CicdPipelineResultIncubatingValues {
62+
/** The pipeline run finished successfully. */
63+
public static final String SUCCESS = "success";
64+
65+
/**
66+
* The pipeline run did not finish successfully, eg. due to a compile error or a failing test.
67+
* Such failures are usually detected by non-zero exit codes of the tools executed in the
68+
* pipeline run.
69+
*/
70+
public static final String FAILURE = "failure";
71+
72+
/**
73+
* The pipeline run failed due to an error in the CICD system, eg. due to the worker being
74+
* killed.
75+
*/
76+
public static final String ERROR = "error";
77+
78+
/** A timeout caused the pipeline run to be interrupted. */
79+
public static final String TIMEOUT = "timeout";
80+
81+
/** The pipeline run was cancelled, eg. by a user manually cancelling the pipeline run. */
82+
public static final String CANCELLATION = "cancellation";
83+
84+
/** The pipeline run was skipped, eg. due to a precondition not being met. */
85+
public static final String SKIP = "skip";
86+
87+
private CicdPipelineResultIncubatingValues() {}
88+
}
89+
90+
/** Values for {@link #CICD_PIPELINE_RUN_STATE}. */
91+
public static final class CicdPipelineRunStateIncubatingValues {
92+
/**
93+
* The run pending state spans from the event triggering the pipeline run until the execution of
94+
* the run starts (eg. time spent in a queue, provisioning agents, creating run resources).
95+
*/
96+
public static final String PENDING = "pending";
97+
98+
/** The executing state spans the execution of any run tasks (eg. build, test). */
99+
public static final String EXECUTING = "executing";
100+
101+
/**
102+
* The finalizing state spans from when the run has finished executing (eg. cleanup of run
103+
* resources).
104+
*/
105+
public static final String FINALIZING = "finalizing";
106+
107+
private CicdPipelineRunStateIncubatingValues() {}
108+
}
109+
46110
/** Values for {@link #CICD_PIPELINE_TASK_TYPE}. */
47111
public static final class CicdPipelineTaskTypeIncubatingValues {
48112
/** build */
@@ -57,5 +121,22 @@ public static final class CicdPipelineTaskTypeIncubatingValues {
57121
private CicdPipelineTaskTypeIncubatingValues() {}
58122
}
59123

124+
/** Values for {@link #CICD_WORKER_STATE}. */
125+
public static final class CicdWorkerStateIncubatingValues {
126+
/**
127+
* The worker is not performing work for the CICD system. It is available to the CICD system to
128+
* perform work on (online / idle).
129+
*/
130+
public static final String AVAILABLE = "available";
131+
132+
/** The worker is performing work for the CICD system. */
133+
public static final String BUSY = "busy";
134+
135+
/** The worker is not available to the CICD system (disconnected / down). */
136+
public static final String OFFLINE = "offline";
137+
138+
private CicdWorkerStateIncubatingValues() {}
139+
}
140+
60141
private CicdIncubatingAttributes() {}
61142
}

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudIncubatingAttributes.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,12 @@ public static final class CloudPlatformIncubatingValues {
167167
/** Red Hat OpenShift on IBM Cloud */
168168
public static final String IBM_CLOUD_OPENSHIFT = "ibm_cloud_openshift";
169169

170+
/** Compute on Oracle Cloud Infrastructure (OCI) */
171+
public static final String ORACLE_CLOUD_COMPUTE = "oracle_cloud_compute";
172+
173+
/** Kubernetes Engine (OKE) on Oracle Cloud Infrastructure (OCI) */
174+
public static final String ORACLE_CLOUD_OKE = "oracle_cloud_oke";
175+
170176
/** Tencent Cloud Cloud Virtual Machine (CVM) */
171177
public static final String TENCENT_CLOUD_CVM = "tencent_cloud_cvm";
172178

@@ -199,6 +205,9 @@ public static final class CloudProviderIncubatingValues {
199205
/** IBM Cloud */
200206
public static final String IBM_CLOUD = "ibm_cloud";
201207

208+
/** Oracle Cloud Infrastructure (OCI) */
209+
public static final String ORACLE_CLOUD = "oracle_cloud";
210+
202211
/** Tencent Cloud */
203212
public static final String TENCENT_CLOUD = "tencent_cloud";
204213

0 commit comments

Comments
 (0)