Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to semantic-conventions v1.30.0 #141

Merged
merged 2 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ val snapshot = true
// end

// The release version of https://github.com/open-telemetry/semantic-conventions used to generate classes
var semanticConventionsVersion = "1.29.0"
var semanticConventionsVersion = "1.30.0"
val schemaUrlVersions = listOf(
semanticConventionsVersion,
"1.29.0",
"1.28.0",
"1.27.0",
"1.26.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
params:
excluded_namespaces: ["ios", "aspnetcore", "signalr"]
excluded_namespaces: ["dotnet", "ios", "aspnetcore", "signalr"]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heads up - excluding dotnet. attributes as a continuation of #48

excluded_attributes: ["messaging.client_id", "exception.escaped"]
comment_formats:
javadoc:
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/templates/registry/java/weaver.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
params:
excluded_namespaces: ["ios", "aspnetcore", "signalr"]
excluded_namespaces: ["dotnet", "ios", "aspnetcore", "signalr"]
# excluding "exception.escaped" from stable attributes
# because we are anticipating it being deprecated soon
excluded_attributes: ["messaging.client_id", "exception.escaped"]
Expand Down
3 changes: 2 additions & 1 deletion docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Comparing source compatibility of opentelemetry-semconv-1.29.0-SNAPSHOT.jar against
Comparing source compatibility of opentelemetry-semconv-1.30.0-SNAPSHOT.jar against
+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.semconv.AttributeKeyTemplate (not serializable)
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
GENERIC TEMPLATES: +++ T:java.lang.Object
Expand Down Expand Up @@ -117,6 +117,7 @@ Comparing source compatibility of opentelemetry-semconv-1.29.0-SNAPSHOT.jar agai
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+++ NEW SUPERCLASS: java.lang.Object
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_24_0
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_30_0
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_29_0
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_28_0
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_27_0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ public final class ArtifactIncubatingAttributes {

/**
* The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
* glossary)</a>, of the built attestation. Some envelopes in the software attestation space also
* refer to this as the <a
* href="https://github.com/in-toto/attestation/blob/main/spec/README.md#in-toto-attestation-framework-spec">digest</a>.
* glossary)</a>, of the built attestation. Some envelopes in the <a
* href="https://github.com/in-toto/attestation/tree/main/spec">software attestation space</a>
* also refer to this as the <strong>digest</strong>.
*/
public static final AttributeKey<String> ARTIFACT_ATTESTATION_HASH =
stringKey("artifact.attestation.hash");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ public final class AwsIncubatingAttributes {
/** The ARN of an EKS cluster. */
public static final AttributeKey<String> AWS_EKS_CLUSTER_ARN = stringKey("aws.eks.cluster.arn");

/** The AWS extended request ID as returned in the response header {@code x-amz-id-2}. */
public static final AttributeKey<String> AWS_EXTENDED_REQUEST_ID =
stringKey("aws.extended_request_id");

/**
* The full invoked ARN as provided on the {@code Context} passed to the function ({@code
* Lambda-Runtime-Invoked-Function-Arn} header on the {@code /runtime/invocation/next}
Expand Down Expand Up @@ -204,8 +208,8 @@ public final class AwsIncubatingAttributes {
stringArrayKey("aws.log.stream.names");

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

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.semconv.incubating;

import static io.opentelemetry.api.common.AttributeKey.doubleKey;
import static io.opentelemetry.api.common.AttributeKey.longKey;
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
import static io.opentelemetry.api.common.AttributeKey.stringKey;

import io.opentelemetry.api.common.AttributeKey;
import java.util.List;

// DO NOT EDIT, this is an Auto-generated file from
// buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2
@SuppressWarnings("unused")
public final class AzureIncubatingAttributes {
/** The unique identifier of the client instance. */
public static final AttributeKey<String> AZURE_CLIENT_ID = stringKey("azure.client.id");

/** Cosmos client connection mode. */
public static final AttributeKey<String> AZURE_COSMOSDB_CONNECTION_MODE =
stringKey("azure.cosmosdb.connection.mode");

/**
* Account or request <a
* href="https://learn.microsoft.com/azure/cosmos-db/consistency-levels">consistency level</a>.
*/
public static final AttributeKey<String> AZURE_COSMOSDB_CONSISTENCY_LEVEL =
stringKey("azure.cosmosdb.consistency.level");

/**
* List of regions contacted during operation in the order that they were contacted. If there is
* more than one region listed, it indicates that the operation was performed on multiple regions
* i.e. cross-regional call.
*
* <p>Notes:
*
* <p>Region name matches the format of {@code displayName} in <a
* href="https://learn.microsoft.com/rest/api/subscription/subscriptions/list-locations?view=rest-subscription-2021-10-01&tabs=HTTP#location">Azure
* Location API</a>
*/
public static final AttributeKey<List<String>> AZURE_COSMOSDB_OPERATION_CONTACTED_REGIONS =
stringArrayKey("azure.cosmosdb.operation.contacted_regions");

/** The number of request units consumed by the operation. */
public static final AttributeKey<Double> AZURE_COSMOSDB_OPERATION_REQUEST_CHARGE =
doubleKey("azure.cosmosdb.operation.request_charge");

/** Request payload size in bytes. */
public static final AttributeKey<Long> AZURE_COSMOSDB_REQUEST_BODY_SIZE =
longKey("azure.cosmosdb.request.body.size");

/** Cosmos DB sub status code. */
public static final AttributeKey<Long> AZURE_COSMOSDB_RESPONSE_SUB_STATUS_CODE =
longKey("azure.cosmosdb.response.sub_status_code");

// Enum definitions
/** Values for {@link #AZURE_COSMOSDB_CONNECTION_MODE}. */
public static final class AzureCosmosdbConnectionModeIncubatingValues {
/** Gateway (HTTP) connection. */
public static final String GATEWAY = "gateway";

/** Direct connection. */
public static final String DIRECT = "direct";

private AzureCosmosdbConnectionModeIncubatingValues() {}
}

/** Values for {@link #AZURE_COSMOSDB_CONSISTENCY_LEVEL}. */
public static final class AzureCosmosdbConsistencyLevelIncubatingValues {
/** strong. */
public static final String STRONG = "Strong";

/** bounded_staleness. */
public static final String BOUNDED_STALENESS = "BoundedStaleness";

/** session. */
public static final String SESSION = "Session";

/** eventual. */
public static final String EVENTUAL = "Eventual";

/** consistent_prefix. */
public static final String CONSISTENT_PREFIX = "ConsistentPrefix";

private AzureCosmosdbConsistencyLevelIncubatingValues() {}
}

private AzureIncubatingAttributes() {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.semconv.incubating;

import static io.opentelemetry.api.common.AttributeKey.booleanKey;
import static io.opentelemetry.api.common.AttributeKey.longKey;
import static io.opentelemetry.api.common.AttributeKey.stringKey;

import io.opentelemetry.api.common.AttributeKey;

// DO NOT EDIT, this is an Auto-generated file from
// buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2
@SuppressWarnings("unused")
public final class CassandraIncubatingAttributes {
/**
* The consistency level of the query. Based on consistency values from <a
* href="https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html">CQL</a>.
*/
public static final AttributeKey<String> CASSANDRA_CONSISTENCY_LEVEL =
stringKey("cassandra.consistency.level");

/** The data center of the coordinating node for a query. */
public static final AttributeKey<String> CASSANDRA_COORDINATOR_DC =
stringKey("cassandra.coordinator.dc");

/** The ID of the coordinating node for a query. */
public static final AttributeKey<String> CASSANDRA_COORDINATOR_ID =
stringKey("cassandra.coordinator.id");

/** The fetch size used for paging, i.e. how many rows will be returned at once. */
public static final AttributeKey<Long> CASSANDRA_PAGE_SIZE = longKey("cassandra.page.size");

/** Whether or not the query is idempotent. */
public static final AttributeKey<Boolean> CASSANDRA_QUERY_IDEMPOTENT =
booleanKey("cassandra.query.idempotent");

/**
* The number of times a query was speculatively executed. Not set or {@code 0} if the query was
* not executed speculatively.
*/
public static final AttributeKey<Long> CASSANDRA_SPECULATIVE_EXECUTION_COUNT =
longKey("cassandra.speculative_execution.count");

// Enum definitions
/** Values for {@link #CASSANDRA_CONSISTENCY_LEVEL}. */
public static final class CassandraConsistencyLevelIncubatingValues {
/** all. */
public static final String ALL = "all";

/** each_quorum. */
public static final String EACH_QUORUM = "each_quorum";

/** quorum. */
public static final String QUORUM = "quorum";

/** local_quorum. */
public static final String LOCAL_QUORUM = "local_quorum";

/** one. */
public static final String ONE = "one";

/** two. */
public static final String TWO = "two";

/** three. */
public static final String THREE = "three";

/** local_one. */
public static final String LOCAL_ONE = "local_one";

/** any. */
public static final String ANY = "any";

/** serial. */
public static final String SERIAL = "serial";

/** local_serial. */
public static final String LOCAL_SERIAL = "local_serial";

private CassandraConsistencyLevelIncubatingValues() {}
}

private CassandraIncubatingAttributes() {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,16 @@ public final class CicdIncubatingAttributes {
/** The human readable name of the pipeline within a CI/CD system. */
public static final AttributeKey<String> CICD_PIPELINE_NAME = stringKey("cicd.pipeline.name");

/** The result of a pipeline run. */
public static final AttributeKey<String> CICD_PIPELINE_RESULT = stringKey("cicd.pipeline.result");

/** The unique identifier of a pipeline run within a CI/CD system. */
public static final AttributeKey<String> CICD_PIPELINE_RUN_ID = stringKey("cicd.pipeline.run.id");

/** The pipeline run goes through these states during its lifecycle. */
public static final AttributeKey<String> CICD_PIPELINE_RUN_STATE =
stringKey("cicd.pipeline.run.state");

/**
* The human readable name of a task within a pipeline. Task here most closely aligns with a <a
* href="https://wikipedia.org/wiki/Pipeline_(computing)">computing process</a> in a pipeline.
Expand All @@ -42,7 +49,64 @@ public final class CicdIncubatingAttributes {
public static final AttributeKey<String> CICD_PIPELINE_TASK_TYPE =
stringKey("cicd.pipeline.task.type");

/** The name of a component of the CICD system. */
public static final AttributeKey<String> CICD_SYSTEM_COMPONENT =
stringKey("cicd.system.component");

/** The state of a CICD worker / agent. */
public static final AttributeKey<String> CICD_WORKER_STATE = stringKey("cicd.worker.state");

// Enum definitions
/** Values for {@link #CICD_PIPELINE_RESULT}. */
public static final class CicdPipelineResultIncubatingValues {
/** The pipeline run finished successfully. */
public static final String SUCCESS = "success";

/**
* The pipeline run did not finish successfully, eg. due to a compile error or a failing test.
* Such failures are usually detected by non-zero exit codes of the tools executed in the
* pipeline run.
*/
public static final String FAILURE = "failure";

/**
* The pipeline run failed due to an error in the CICD system, eg. due to the worker being
* killed.
*/
public static final String ERROR = "error";

/** A timeout caused the pipeline run to be interrupted. */
public static final String TIMEOUT = "timeout";

/** The pipeline run was cancelled, eg. by a user manually cancelling the pipeline run. */
public static final String CANCELLATION = "cancellation";

/** The pipeline run was skipped, eg. due to a precondition not being met. */
public static final String SKIP = "skip";

private CicdPipelineResultIncubatingValues() {}
}

/** Values for {@link #CICD_PIPELINE_RUN_STATE}. */
public static final class CicdPipelineRunStateIncubatingValues {
/**
* The run pending state spans from the event triggering the pipeline run until the execution of
* the run starts (eg. time spent in a queue, provisioning agents, creating run resources).
*/
public static final String PENDING = "pending";

/** The executing state spans the execution of any run tasks (eg. build, test). */
public static final String EXECUTING = "executing";

/**
* The finalizing state spans from when the run has finished executing (eg. cleanup of run
* resources).
*/
public static final String FINALIZING = "finalizing";

private CicdPipelineRunStateIncubatingValues() {}
}

/** Values for {@link #CICD_PIPELINE_TASK_TYPE}. */
public static final class CicdPipelineTaskTypeIncubatingValues {
/** build */
Expand All @@ -57,5 +121,22 @@ public static final class CicdPipelineTaskTypeIncubatingValues {
private CicdPipelineTaskTypeIncubatingValues() {}
}

/** Values for {@link #CICD_WORKER_STATE}. */
public static final class CicdWorkerStateIncubatingValues {
/**
* The worker is not performing work for the CICD system. It is available to the CICD system to
* perform work on (online / idle).
*/
public static final String AVAILABLE = "available";

/** The worker is performing work for the CICD system. */
public static final String BUSY = "busy";

/** The worker is not available to the CICD system (disconnected / down). */
public static final String OFFLINE = "offline";

private CicdWorkerStateIncubatingValues() {}
}

private CicdIncubatingAttributes() {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,12 @@ public static final class CloudPlatformIncubatingValues {
/** Red Hat OpenShift on IBM Cloud */
public static final String IBM_CLOUD_OPENSHIFT = "ibm_cloud_openshift";

/** Compute on Oracle Cloud Infrastructure (OCI) */
public static final String ORACLE_CLOUD_COMPUTE = "oracle_cloud_compute";

/** Kubernetes Engine (OKE) on Oracle Cloud Infrastructure (OCI) */
public static final String ORACLE_CLOUD_OKE = "oracle_cloud_oke";

/** Tencent Cloud Cloud Virtual Machine (CVM) */
public static final String TENCENT_CLOUD_CVM = "tencent_cloud_cvm";

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

/** Oracle Cloud Infrastructure (OCI) */
public static final String ORACLE_CLOUD = "oracle_cloud";

/** Tencent Cloud */
public static final String TENCENT_CLOUD = "tencent_cloud";

Expand Down
Loading
Loading