diff --git a/CHANGELOG.md b/CHANGELOG.md index e245aba928..127391fb58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,9 @@ Increment the: * [CMAKE] Remove include_directories usage and rely on target properties [#3426](https://github.com/open-telemetry/opentelemetry-cpp/pull/3426) +* [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.34.0 + [#3428](https://github.com/open-telemetry/opentelemetry-cpp/pull/3428) + ## [1.20 2025-04-01] * [BUILD] Update opentelemetry-proto version diff --git a/api/include/opentelemetry/semconv/exception_attributes.h b/api/include/opentelemetry/semconv/exception_attributes.h index 61e94d955b..3aee91bde3 100644 --- a/api/include/opentelemetry/semconv/exception_attributes.h +++ b/api/include/opentelemetry/semconv/exception_attributes.h @@ -24,7 +24,7 @@ namespace exception * * @deprecated * {"note": "It's no longer recommended to record exceptions that are handled and do not escape the - * scope of a span.", "reason": "uncategorized"} + * scope of a span.\n", "reason": "obsoleted"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kExceptionEscaped = "exception.escaped"; diff --git a/api/include/opentelemetry/semconv/incubating/aws_attributes.h b/api/include/opentelemetry/semconv/incubating/aws_attributes.h index 9544844e9c..c7fdb592b3 100644 --- a/api/include/opentelemetry/semconv/incubating/aws_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/aws_attributes.h @@ -19,6 +19,21 @@ namespace semconv namespace aws { +/** + * The unique identifier of the AWS Bedrock Guardrail. A guardrail helps + * safeguard and prevent unwanted behavior from model responses or user messages. + */ +static constexpr const char *kAwsBedrockGuardrailId = "aws.bedrock.guardrail.id"; + +/** + * The unique identifier of the AWS Bedrock Knowledge base. A knowledge + * base is a bank of information that can be queried by models to generate more relevant + * responses and augment prompts. + */ +static constexpr const char *kAwsBedrockKnowledgeBaseId = "aws.bedrock.knowledge_base.id"; + /** * The JSON-serialized value of each item in the @code AttributeDefinitions @endcode request field. */ @@ -191,6 +206,15 @@ static constexpr const char *kAwsEksClusterArn = "aws.eks.cluster.arn"; */ static constexpr const char *kAwsExtendedRequestId = "aws.extended_request_id"; +/** + * The name of the AWS Kinesis stream the request + * refers to. Corresponds to the @code --stream-name @endcode parameter of the Kinesis describe-stream + * operation. + */ +static constexpr const char *kAwsKinesisStreamName = "aws.kinesis.stream_name"; + /** * The full invoked ARN as provided on the @code Context @endcode passed to the function (@code * Lambda-Runtime-Invoked-Function-Arn @endcode header on the @code /runtime/invocation/next @@ -199,6 +223,17 @@ static constexpr const char *kAwsExtendedRequestId = "aws.extended_request_id"; */ static constexpr const char *kAwsLambdaInvokedArn = "aws.lambda.invoked_arn"; +/** + * The UUID of the AWS + * Lambda EvenSource Mapping. An event source is mapped to a lambda function. It's contents are + * read by Lambda and used to trigger a function. This isn't available in the lambda execution + * context or the lambda runtime environtment. This is going to be populated by the AWS SDK for each + * language when that UUID is present. Some of these operations are Create/Delete/Get/List/Update + * EventSourceMapping. + */ +static constexpr const char *kAwsLambdaResourceMappingId = "aws.lambda.resource_mapping.id"; + /** * The Amazon Resource Name(s) (ARN) of the AWS log group(s). *

@@ -342,6 +377,35 @@ static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number"; */ static constexpr const char *kAwsS3UploadId = "aws.s3.upload_id"; +/** + * The ARN of the Secret stored in the Secrets Mangger + */ +static constexpr const char *kAwsSecretsmanagerSecretArn = "aws.secretsmanager.secret.arn"; + +/** + * The ARN of the AWS SNS Topic. An Amazon SNS topic is a logical + * access point that acts as a communication channel. + */ +static constexpr const char *kAwsSnsTopicArn = "aws.sns.topic.arn"; + +/** + * The URL of the AWS SQS Queue. It's a unique identifier for a queue in Amazon Simple Queue Service + * (SQS) and is used to access the queue and perform actions on it. + */ +static constexpr const char *kAwsSqsQueueUrl = "aws.sqs.queue.url"; + +/** + * The ARN of the AWS Step Functions Activity. + */ +static constexpr const char *kAwsStepFunctionsActivityArn = "aws.step_functions.activity.arn"; + +/** + * The ARN of the AWS Step Functions State Machine. + */ +static constexpr const char *kAwsStepFunctionsStateMachineArn = + "aws.step_functions.state_machine.arn"; + namespace AwsEcsLaunchtypeValues { /** diff --git a/api/include/opentelemetry/semconv/incubating/cloud_attributes.h b/api/include/opentelemetry/semconv/incubating/cloud_attributes.h index f0b4d6da07..191915f985 100644 --- a/api/include/opentelemetry/semconv/incubating/cloud_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/cloud_attributes.h @@ -44,9 +44,10 @@ static constexpr const char *kCloudPlatform = "cloud.platform"; static constexpr const char *kCloudProvider = "cloud.provider"; /** - * The geographical region the resource is running. - *

- * Refer to your provider's docs to see the available regions, for example Refer + * to your provider's docs to see the available regions, for example Alibaba Cloud regions, AWS regions, Azure regions, histogram + * {"note": "Replaced by @code db.client.connection.create_time @endcode with unit @code s + * @endcode.", "reason": "uncategorized"}

histogram */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsCreateTime = "db.client.connections.create_time"; @@ -388,9 +388,8 @@ CreateSyncDoubleMetricDbClientConnectionsCreateTime(metrics::Meter *meter) * Deprecated, use @code db.client.connection.idle.max @endcode instead. * * @deprecated - * {"note": "Replaced by @code db.client.connection.idle.max @endcode.", "reason": "uncategorized"} - *

- * updowncounter + * {"note": "Replaced by @code db.client.connection.idle.max @endcode.", "reason": "renamed", + * "renamed_to": "db.client.connection.idle.max"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsIdleMax = "db.client.connections.idle.max"; @@ -435,9 +434,8 @@ CreateAsyncDoubleMetricDbClientConnectionsIdleMax(metrics::Meter *meter) * Deprecated, use @code db.client.connection.idle.min @endcode instead. * * @deprecated - * {"note": "Replaced by @code db.client.connection.idle.min @endcode.", "reason": "uncategorized"} - *

- * updowncounter + * {"note": "Replaced by @code db.client.connection.idle.min @endcode.", "reason": "renamed", + * "renamed_to": "db.client.connection.idle.min"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsIdleMin = "db.client.connections.idle.min"; @@ -482,9 +480,8 @@ CreateAsyncDoubleMetricDbClientConnectionsIdleMin(metrics::Meter *meter) * Deprecated, use @code db.client.connection.max @endcode instead. * * @deprecated - * {"note": "Replaced by @code db.client.connection.max @endcode.", "reason": "uncategorized"} - *

- * updowncounter + * {"note": "Replaced by @code db.client.connection.max @endcode.", "reason": "renamed", + * "renamed_to": "db.client.connection.max"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsMax = "db.client.connections.max"; @@ -530,7 +527,7 @@ CreateAsyncDoubleMetricDbClientConnectionsMax(metrics::Meter *meter) * * @deprecated * {"note": "Replaced by @code db.client.connection.pending_requests @endcode.", "reason": - * "uncategorized"}

updowncounter + * "renamed", "renamed_to": "db.client.connection.pending_requests"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsPendingRequests = "db.client.connections.pending_requests"; @@ -576,9 +573,8 @@ CreateAsyncDoubleMetricDbClientConnectionsPendingRequests(metrics::Meter *meter) * Deprecated, use @code db.client.connection.timeouts @endcode instead. * * @deprecated - * {"note": "Replaced by @code db.client.connection.timeouts @endcode.", "reason": "uncategorized"} - *

- * counter + * {"note": "Replaced by @code db.client.connection.timeouts @endcode.", "reason": "renamed", + * "renamed_to": "db.client.connection.timeouts"}

counter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsTimeouts = "db.client.connections.timeouts"; @@ -623,9 +619,8 @@ CreateAsyncDoubleMetricDbClientConnectionsTimeouts(metrics::Meter *meter) * Deprecated, use @code db.client.connection.count @endcode instead. * * @deprecated - * {"note": "Replaced by @code db.client.connection.count @endcode.", "reason": "uncategorized"} - *

- * updowncounter + * {"note": "Replaced by @code db.client.connection.count @endcode.", "reason": "renamed", + * "renamed_to": "db.client.connection.count"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsUsage = "db.client.connections.usage"; @@ -671,8 +666,8 @@ CreateAsyncDoubleMetricDbClientConnectionsUsage(metrics::Meter *meter) * from @code ms @endcode to @code s @endcode. * * @deprecated - * {"note": "Replaced by @code db.client.connection.use_time @endcode. Note: the unit also changed - * from @code ms @endcode to @code s @endcode.", "reason": "uncategorized"}

histogram + * {"note": "Replaced by @code db.client.connection.use_time @endcode with unit @code s @endcode.", + * "reason": "uncategorized"}

histogram */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsUseTime = "db.client.connections.use_time"; @@ -702,8 +697,8 @@ CreateSyncDoubleMetricDbClientConnectionsUseTime(metrics::Meter *meter) * changed from @code ms @endcode to @code s @endcode. * * @deprecated - * {"note": "Replaced by @code db.client.connection.wait_time @endcode. Note: the unit also changed - * from @code ms @endcode to @code s @endcode.", "reason": "uncategorized"}

histogram + * {"note": "Replaced by @code db.client.connection.wait_time @endcode with unit @code s @endcode.", + * "reason": "uncategorized"}

histogram */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsWaitTime = "db.client.connections.wait_time"; @@ -733,7 +728,7 @@ CreateSyncDoubleMetricDbClientConnectionsWaitTime(metrics::Meter *meter) * * @deprecated * {"note": "Replaced by @code azure.cosmosdb.client.active_instance.count @endcode.", "reason": - * "uncategorized"}

updowncounter + * "renamed", "renamed_to": "azure.cosmosdb.client.active_instance.count"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientCosmosdbActiveInstanceCount = "db.client.cosmosdb.active_instance.count"; @@ -780,7 +775,7 @@ CreateAsyncDoubleMetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter * * @deprecated * {"note": "Replaced by @code azure.cosmosdb.client.operation.request_charge @endcode.", "reason": - * "uncategorized"}

histogram + * "renamed", "renamed_to": "azure.cosmosdb.client.operation.request_charge"}

histogram */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientCosmosdbOperationRequestCharge = "db.client.cosmosdb.operation.request_charge"; diff --git a/api/include/opentelemetry/semconv/incubating/deployment_attributes.h b/api/include/opentelemetry/semconv/incubating/deployment_attributes.h index fc2aeb1c3d..11caeb428e 100644 --- a/api/include/opentelemetry/semconv/incubating/deployment_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/deployment_attributes.h @@ -23,8 +23,8 @@ namespace deployment * 'Deprecated, use @code deployment.environment.name @endcode instead.' * * @deprecated - * {"note": "Deprecated, use @code deployment.environment.name @endcode instead.", "reason": - * "uncategorized"} + * {"note": "Replaced by @code deployment.environment.name @endcode.", "reason": "renamed", + * "renamed_to": "deployment.environment.name"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kDeploymentEnvironment = "deployment.environment"; diff --git a/api/include/opentelemetry/semconv/incubating/device_attributes.h b/api/include/opentelemetry/semconv/incubating/device_attributes.h index a1fb5bc5e9..f2c4874e14 100644 --- a/api/include/opentelemetry/semconv/incubating/device_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/device_attributes.h @@ -38,7 +38,7 @@ namespace device * for specific enterprise scenarios, such as kiosk devices or enterprise-managed devices, with * appropriate compliance clearance. Any instrumentation providing this identifier MUST implement it * as an opt-in feature.

See @code app.installation.id + * href="/docs/registry/attributes/app.md#app-installation-id">@code app.installation.id * @endcode for a more privacy-preserving alternative. */ static constexpr const char *kDeviceId = "device.id"; diff --git a/api/include/opentelemetry/semconv/incubating/enduser_attributes.h b/api/include/opentelemetry/semconv/incubating/enduser_attributes.h index af9fe393a8..b31773ae36 100644 --- a/api/include/opentelemetry/semconv/incubating/enduser_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/enduser_attributes.h @@ -40,7 +40,7 @@ static constexpr const char *kEnduserPseudoId = "enduser.pseudo.id"; * Deprecated, use @code user.roles @endcode instead. * * @deprecated - * {"note": "Replaced by @code user.roles @endcode attribute.", "reason": "uncategorized"} + * {"note": "Use @code user.roles @endcode attribute instead.", "reason": "uncategorized"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserRole = "enduser.role"; @@ -48,7 +48,7 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserRole = "enduser.ro * Deprecated, no replacement at this time. * * @deprecated - * {"note": "Removed.", "reason": "uncategorized"} + * {"note": "Removed, no replacement at this time.", "reason": "obsoleted"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserScope = "enduser.scope"; diff --git a/api/include/opentelemetry/semconv/incubating/event_attributes.h b/api/include/opentelemetry/semconv/incubating/event_attributes.h index c1b39247d5..ca99d470de 100644 --- a/api/include/opentelemetry/semconv/incubating/event_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/event_attributes.h @@ -23,7 +23,7 @@ namespace event * Identifies the class / type of event. * * @deprecated - * {"note": "Replaced by EventName top-level field on the LogRecord", "reason": "uncategorized"} + * {"note": "Replaced by EventName top-level field on the LogRecord.\n", "reason": "uncategorized"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kEventName = "event.name"; diff --git a/api/include/opentelemetry/semconv/incubating/exception_attributes.h b/api/include/opentelemetry/semconv/incubating/exception_attributes.h index 61e94d955b..3aee91bde3 100644 --- a/api/include/opentelemetry/semconv/incubating/exception_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/exception_attributes.h @@ -24,7 +24,7 @@ namespace exception * * @deprecated * {"note": "It's no longer recommended to record exceptions that are handled and do not escape the - * scope of a span.", "reason": "uncategorized"} + * scope of a span.\n", "reason": "obsoleted"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kExceptionEscaped = "exception.escaped"; diff --git a/api/include/opentelemetry/semconv/incubating/feature_flag_attributes.h b/api/include/opentelemetry/semconv/incubating/feature_flag_attributes.h index dcdcbc3457..0e531a6413 100644 --- a/api/include/opentelemetry/semconv/incubating/feature_flag_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/feature_flag_attributes.h @@ -28,7 +28,8 @@ static constexpr const char *kFeatureFlagContextId = "feature_flag.context.id"; * Deprecated, use @code error.message @endcode instead. * * @deprecated - * {"note": "Replaced by @code error.message @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code error.message @endcode.", "reason": "renamed", "renamed_to": + * "error.message"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kFeatureFlagEvaluationErrorMessage = "feature_flag.evaluation.error.message"; @@ -37,7 +38,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kFeatureFlagEvaluationErro * Deprecated, use @code feature_flag.result.reason @endcode instead. * * @deprecated - * {"note": "Replaced by @code feature_flag.result.reason @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code feature_flag.result.reason @endcode.", "reason": "renamed", + * "renamed_to": "feature_flag.result.reason"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kFeatureFlagEvaluationReason = "feature_flag.evaluation.reason"; @@ -57,6 +59,18 @@ static constexpr const char *kFeatureFlagProviderName = "feature_flag.provider.n */ static constexpr const char *kFeatureFlagResultReason = "feature_flag.result.reason"; +/** + * The evaluated value of the feature flag. + *

+ * With some feature flag providers, feature flag results can be quite large or contain private or + * sensitive details. Because of this, @code feature_flag.result.variant @endcode is often the + * preferred attribute if it is available.

It may be desirable to redact or otherwise limit the + * size and scope of @code feature_flag.result.value @endcode if possible. Because the evaluated + * flag value is unstructured and may be any type, it is left to the instrumentation author to + * determine how best to achieve this. + */ +static constexpr const char *kFeatureFlagResultValue = "feature_flag.result.value"; + /** * A semantic identifier for an evaluated flag value. *

@@ -77,7 +91,8 @@ static constexpr const char *kFeatureFlagSetId = "feature_flag.set.id"; * Deprecated, use @code feature_flag.result.variant @endcode instead. * * @deprecated - * {"note": "Replaced by @code feature_flag.result.variant @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code feature_flag.result.variant @endcode.", "reason": "renamed", + * "renamed_to": "feature_flag.result.variant"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kFeatureFlagVariant = "feature_flag.variant"; diff --git a/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h b/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h index 113e93f9d3..4c3c8c5a16 100644 --- a/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h @@ -38,15 +38,35 @@ static constexpr const char *kGenAiAgentName = "gen_ai.agent.name"; * Deprecated, use Event API to report completions contents. * * @deprecated - * {"note": "Removed, no replacement at this time.", "reason": "uncategorized"} + * {"note": "Removed, no replacement at this time.", "reason": "obsoleted"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiCompletion = "gen_ai.completion"; +/** + * The unique identifier for a conversation (session, thread), used to store and correlate messages + * within this conversation. + */ +static constexpr const char *kGenAiConversationId = "gen_ai.conversation.id"; + +/** + * The data source identifier. + *

+ * Data sources are used by AI agents and RAG applications to store grounding data. A data source + * may be an external database, object store, document collection, website, or any other storage + * system used by the GenAI agent or application. The @code gen_ai.data_source.id @endcode SHOULD + * match the identifier used by the GenAI system rather than a name specific to the external + * storage, such as a database or object store. Semantic conventions referencing @code + * gen_ai.data_source.id @endcode MAY also leverage additional attributes, such as @code db.* + * @endcode, to further identify and describe the data source. + */ +static constexpr const char *kGenAiDataSourceId = "gen_ai.data_source.id"; + /** * Deprecated, use @code gen_ai.output.type @endcode. * * @deprecated - * {"note": "Replaced by @code gen_ai.output.type @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code gen_ai.output.type @endcode.", "reason": "renamed", "renamed_to": + * "gen_ai.output.type"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiOpenaiRequestResponseFormat = "gen_ai.openai.request.response_format"; @@ -55,7 +75,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiOpenaiRequestRespons * Deprecated, use @code gen_ai.request.seed @endcode. * * @deprecated - * {"note": "Replaced by @code gen_ai.request.seed @endcode attribute.", "reason": "uncategorized"} + * {"note": "Replaced by @code gen_ai.request.seed @endcode.", "reason": "renamed", "renamed_to": + * "gen_ai.request.seed"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiOpenaiRequestSeed = "gen_ai.openai.request.seed"; @@ -102,7 +123,7 @@ static constexpr const char *kGenAiOutputType = "gen_ai.output.type"; * Deprecated, use Event API to report prompt contents. * * @deprecated - * {"note": "Removed, no replacement at this time.", "reason": "uncategorized"} + * {"note": "Removed, no replacement at this time.", "reason": "obsoleted"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiPrompt = "gen_ai.prompt"; @@ -231,8 +252,8 @@ static constexpr const char *kGenAiToolType = "gen_ai.tool.type"; * Deprecated, use @code gen_ai.usage.output_tokens @endcode instead. * * @deprecated - * {"note": "Replaced by @code gen_ai.usage.output_tokens @endcode attribute.", "reason": - * "uncategorized"} + * {"note": "Replaced by @code gen_ai.usage.output_tokens @endcode.", "reason": "renamed", + * "renamed_to": "gen_ai.usage.output_tokens"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsageCompletionTokens = "gen_ai.usage.completion_tokens"; @@ -251,8 +272,8 @@ static constexpr const char *kGenAiUsageOutputTokens = "gen_ai.usage.output_toke * Deprecated, use @code gen_ai.usage.input_tokens @endcode instead. * * @deprecated - * {"note": "Replaced by @code gen_ai.usage.input_tokens @endcode attribute.", "reason": - * "uncategorized"} + * {"note": "Replaced by @code gen_ai.usage.input_tokens @endcode.", "reason": "renamed", + * "renamed_to": "gen_ai.usage.input_tokens"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsagePromptTokens = "gen_ai.usage.prompt_tokens"; diff --git a/api/include/opentelemetry/semconv/incubating/http_attributes.h b/api/include/opentelemetry/semconv/incubating/http_attributes.h index a378738b93..6c2ba51800 100644 --- a/api/include/opentelemetry/semconv/incubating/http_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/http_attributes.h @@ -23,7 +23,8 @@ namespace http * Deprecated, use @code client.address @endcode instead. * * @deprecated - * {"note": "Replaced by @code client.address @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code client.address @endcode.", "reason": "renamed", "renamed_to": + * "client.address"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpClientIp = "http.client_ip"; @@ -36,7 +37,8 @@ static constexpr const char *kHttpConnectionState = "http.connection.state"; * Deprecated, use @code network.protocol.name @endcode instead. * * @deprecated - * {"note": "Replaced by @code network.protocol.name @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code network.protocol.name @endcode.", "reason": "renamed", "renamed_to": + * "network.protocol.name"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpFlavor = "http.flavor"; @@ -46,7 +48,7 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpFlavor = "http.flavor * * @deprecated * {"note": "Replaced by one of @code server.address @endcode, @code client.address @endcode or - * @code http.request.header.host @endcode, depending on the usage.", "reason": "uncategorized"} + * @code http.request.header.host @endcode, depending on the usage.\n", "reason": "uncategorized"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpHost = "http.host"; @@ -54,7 +56,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpHost = "http.host"; * Deprecated, use @code http.request.method @endcode instead. * * @deprecated - * {"note": "Replaced by @code http.request.method @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code http.request.method @endcode.", "reason": "renamed", "renamed_to": + * "http.request.method"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpMethod = "http.method"; @@ -129,10 +132,11 @@ static constexpr const char *kHttpRequestResendCount = "http.request.resend_coun static constexpr const char *kHttpRequestSize = "http.request.size"; /** - * Deprecated, use @code http.request.header. @endcode instead. + * Deprecated, use @code http.request.header.content-length @endcode instead. * * @deprecated - * {"note": "Replaced by @code http.request.header. @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code http.request.header.content-length @endcode.", "reason": + * "uncategorized"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLength = "http.request_content_length"; @@ -141,7 +145,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLength * Deprecated, use @code http.request.body.size @endcode instead. * * @deprecated - * {"note": "Replaced by @code http.request.body.size @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code http.request.body.size @endcode.", "reason": "renamed", "renamed_to": + * "http.request.body.size"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLengthUncompressed = "http.request_content_length_uncompressed"; @@ -185,10 +190,10 @@ static constexpr const char *kHttpResponseSize = "http.response.size"; static constexpr const char *kHttpResponseStatusCode = "http.response.status_code"; /** - * Deprecated, use @code http.response.header. @endcode instead. + * Deprecated, use @code http.response.header.content-length @endcode instead. * * @deprecated - * {"note": "Replaced by @code http.response.header. @endcode.", "reason": "uncategorized"} + * {"note": "hp.response.header.content-length", "reason": "uncategorized"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLength = "http.response_content_length"; @@ -197,7 +202,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLength * Deprecated, use @code http.response.body.size @endcode instead. * * @deprecated - * {"note": "Replace by @code http.response.body.size @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code http.response.body.size @endcode.", "reason": "renamed", + * "renamed_to": "http.response.body.size"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLengthUncompressed = "http.response_content_length_uncompressed"; @@ -215,7 +221,8 @@ static constexpr const char *kHttpRoute = "http.route"; * Deprecated, use @code url.scheme @endcode instead. * * @deprecated - * {"note": "Replaced by @code url.scheme @endcode instead.", "reason": "uncategorized"} + * {"note": "Replaced by @code url.scheme @endcode.", "reason": "renamed", "renamed_to": + * "url.scheme"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpScheme = "http.scheme"; @@ -223,7 +230,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpScheme = "http.scheme * Deprecated, use @code server.address @endcode instead. * * @deprecated - * {"note": "Replaced by @code server.address @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code server.address @endcode.", "reason": "renamed", "renamed_to": + * "server.address"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpServerName = "http.server_name"; @@ -231,7 +239,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpServerName = "http.se * Deprecated, use @code http.response.status_code @endcode instead. * * @deprecated - * {"note": "Replaced by @code http.response.status_code @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code http.response.status_code @endcode.", "reason": "renamed", + * "renamed_to": "http.response.status_code"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpStatusCode = "http.status_code"; @@ -239,7 +248,7 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpStatusCode = "http.st * Deprecated, use @code url.path @endcode and @code url.query @endcode instead. * * @deprecated - * {"note": "Split to @code url.path @endcode and `url.query.", "reason": "uncategorized"} + * {"note": "Split to @code url.path @endcode and @code url.query @endcode.", "reason": "obsoleted"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpTarget = "http.target"; @@ -247,7 +256,7 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpTarget = "http.target * Deprecated, use @code url.full @endcode instead. * * @deprecated - * {"note": "Replaced by @code url.full @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code url.full @endcode.", "reason": "renamed", "renamed_to": "url.full"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUrl = "http.url"; @@ -255,7 +264,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUrl = "http.url"; * Deprecated, use @code user_agent.original @endcode instead. * * @deprecated - * {"note": "Replaced by @code user_agent.original @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code user_agent.original @endcode.", "reason": "renamed", "renamed_to": + * "user_agent.original"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUserAgent = "http.user_agent"; diff --git a/api/include/opentelemetry/semconv/incubating/k8s_attributes.h b/api/include/opentelemetry/semconv/incubating/k8s_attributes.h index 5a820d110d..c1e6799442 100644 --- a/api/include/opentelemetry/semconv/incubating/k8s_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/k8s_attributes.h @@ -279,7 +279,8 @@ static constexpr const char *kK8sPodLabel = "k8s.pod.label"; * Deprecated, use @code k8s.pod.label @endcode instead. * * @deprecated - * {"note": "Replaced by @code k8s.pod.label @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code k8s.pod.label @endcode.", "reason": "renamed", "renamed_to": + * "k8s.pod.label"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kK8sPodLabels = "k8s.pod.labels"; diff --git a/api/include/opentelemetry/semconv/incubating/k8s_metrics.h b/api/include/opentelemetry/semconv/incubating/k8s_metrics.h index 0c2a18ea20..f6cef58cfc 100644 --- a/api/include/opentelemetry/semconv/incubating/k8s_metrics.h +++ b/api/include/opentelemetry/semconv/incubating/k8s_metrics.h @@ -1347,11 +1347,7 @@ CreateAsyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter) * * @deprecated * {"note": "Replaced by @code k8s.replicationcontroller.available_pods @endcode.", "reason": - * "uncategorized"}

This metric aligns with the @code availableReplicas @endcode field of the K8s - * ReplicationControllerStatus

This metric SHOULD, at a minimum, be reported against a @code k8s.replicationcontroller @endcode - * resource.

updowncounter + * "renamed", "renamed_to": "k8s.replicationcontroller.available_pods"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerAvailablePods = "k8s.replication_controller.available_pods"; @@ -1399,11 +1395,7 @@ CreateAsyncDoubleMetricK8sReplicationControllerAvailablePods(metrics::Meter *met * * @deprecated * {"note": "Replaced by @code k8s.replicationcontroller.desired_pods @endcode.", "reason": - * "uncategorized"}

This metric aligns with the @code replicas @endcode field of the K8s - * ReplicationControllerSpec

This metric SHOULD, at a minimum, be reported against a @code k8s.replicationcontroller @endcode - * resource.

updowncounter + * "renamed", "renamed_to": "k8s.replicationcontroller.desired_pods"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerDesiredPods = "k8s.replication_controller.desired_pods"; diff --git a/api/include/opentelemetry/semconv/incubating/message_attributes.h b/api/include/opentelemetry/semconv/incubating/message_attributes.h index 19e2e3f8c0..6b60107b7f 100644 --- a/api/include/opentelemetry/semconv/incubating/message_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/message_attributes.h @@ -23,7 +23,8 @@ namespace message * Deprecated, use @code rpc.message.compressed_size @endcode instead. * * @deprecated - * {"note": "Replaced by @code rpc.message.compressed_size @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code rpc.message.compressed_size @endcode.", "reason": "renamed", + * "renamed_to": "rpc.message.compressed_size"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageCompressedSize = "message.compressed_size"; @@ -32,7 +33,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageCompressedSize = * Deprecated, use @code rpc.message.id @endcode instead. * * @deprecated - * {"note": "Replaced by @code rpc.message.id @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code rpc.message.id @endcode.", "reason": "renamed", "renamed_to": + * "rpc.message.id"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageId = "message.id"; @@ -40,7 +42,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageId = "message.id"; * Deprecated, use @code rpc.message.type @endcode instead. * * @deprecated - * {"note": "Replaced by @code rpc.message.type @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code rpc.message.type @endcode.", "reason": "renamed", "renamed_to": + * "rpc.message.type"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageType = "message.type"; @@ -48,7 +51,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageType = "message.ty * Deprecated, use @code rpc.message.uncompressed_size @endcode instead. * * @deprecated - * {"note": "Replaced by @code rpc.message.uncompressed_size @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code rpc.message.uncompressed_size @endcode.", "reason": "renamed", + * "renamed_to": "rpc.message.uncompressed_size"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageUncompressedSize = "message.uncompressed_size"; diff --git a/api/include/opentelemetry/semconv/incubating/messaging_attributes.h b/api/include/opentelemetry/semconv/incubating/messaging_attributes.h index 13c52bf616..5c4f9392c5 100644 --- a/api/include/opentelemetry/semconv/incubating/messaging_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/messaging_attributes.h @@ -96,7 +96,7 @@ static constexpr const char *kMessagingDestinationTemporary = "messaging.destina * Deprecated, no replacement at this time. * * @deprecated - * {"note": "No replacement at this time.", "reason": "uncategorized"} + * {"note": "Removed. No replacement at this time.", "reason": "obsoleted"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishAnonymous = "messaging.destination_publish.anonymous"; @@ -105,7 +105,7 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPubli * Deprecated, no replacement at this time. * * @deprecated - * {"note": "No replacement at this time.", "reason": "uncategorized"} + * {"note": "Removed. No replacement at this time.", "reason": "obsoleted"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishName = "messaging.destination_publish.name"; @@ -114,7 +114,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPubli * Deprecated, use @code messaging.consumer.group.name @endcode instead. * * @deprecated - * {"note": "Replaced by @code messaging.consumer.group.name @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code messaging.consumer.group.name @endcode.", "reason": "renamed", + * "renamed_to": "messaging.consumer.group.name"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingEventhubsConsumerGroup = "messaging.eventhubs.consumer.group"; @@ -154,7 +155,8 @@ static constexpr const char *kMessagingGcpPubsubMessageOrderingKey = * Deprecated, use @code messaging.consumer.group.name @endcode instead. * * @deprecated - * {"note": "Replaced by @code messaging.consumer.group.name @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code messaging.consumer.group.name @endcode.", "reason": "renamed", + * "renamed_to": "messaging.consumer.group.name"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaConsumerGroup = "messaging.kafka.consumer.group"; @@ -163,8 +165,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaConsumerGro * Deprecated, use @code messaging.destination.partition.id @endcode instead. * * @deprecated - * {"note": "Replaced by @code messaging.destination.partition.id @endcode.", "reason": - * "uncategorized"} + * {"note": "Replaced by @code messaging.destination.partition.id @endcode.", "reason": "renamed", + * "renamed_to": "messaging.destination.partition.id"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaDestinationPartition = "messaging.kafka.destination.partition"; @@ -182,7 +184,8 @@ static constexpr const char *kMessagingKafkaMessageKey = "messaging.kafka.messag * Deprecated, use @code messaging.kafka.offset @endcode instead. * * @deprecated - * {"note": "Replaced by @code messaging.kafka.offset @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code messaging.kafka.offset @endcode.", "reason": "renamed", "renamed_to": + * "messaging.kafka.offset"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaMessageOffset = "messaging.kafka.message.offset"; @@ -228,7 +231,8 @@ static constexpr const char *kMessagingMessageId = "messaging.message.id"; * Deprecated, use @code messaging.operation.type @endcode instead. * * @deprecated - * {"note": "Replaced by @code messaging.operation.type @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code messaging.operation.type @endcode.", "reason": "renamed", + * "renamed_to": "messaging.operation.type"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingOperation = "messaging.operation"; @@ -261,7 +265,7 @@ static constexpr const char *kMessagingRabbitmqMessageDeliveryTag = * * @deprecated * {"note": "Replaced by @code messaging.consumer.group.name @endcode on the consumer spans. No - * replacement for producer spans.", "reason": "uncategorized"} + * replacement for producer spans.\n", "reason": "uncategorized"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingRocketmqClientGroup = "messaging.rocketmq.client_group"; @@ -315,7 +319,7 @@ static constexpr const char *kMessagingRocketmqNamespace = "messaging.rocketmq.n * * @deprecated * {"note": "Replaced by @code messaging.destination.subscription.name @endcode.", "reason": - * "uncategorized"} + * "renamed", "renamed_to": "messaging.destination.subscription.name"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingServicebusDestinationSubscriptionName = diff --git a/api/include/opentelemetry/semconv/incubating/messaging_metrics.h b/api/include/opentelemetry/semconv/incubating/messaging_metrics.h index 91cb19f726..7c97388413 100644 --- a/api/include/opentelemetry/semconv/incubating/messaging_metrics.h +++ b/api/include/opentelemetry/semconv/incubating/messaging_metrics.h @@ -99,9 +99,8 @@ CreateSyncDoubleMetricMessagingClientOperationDuration(metrics::Meter *meter) * Deprecated. Use @code messaging.client.sent.messages @endcode instead. * * @deprecated - * {"note": "Replaced by @code messaging.client.sent.messages @endcode.", "reason": "uncategorized"} - *

- * counter + * {"note": "Replaced by @code messaging.client.sent.messages @endcode.", "reason": "renamed", + * "renamed_to": "messaging.client.sent.messages"}

counter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingClientPublishedMessages = "messaging.client.published.messages"; @@ -217,8 +216,8 @@ CreateSyncDoubleMetricMessagingProcessDuration(metrics::Meter *meter) * Deprecated. Use @code messaging.client.consumed.messages @endcode instead. * * @deprecated - * {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason": - * "uncategorized"}

counter + * {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason": "renamed", + * "renamed_to": "messaging.client.consumed.messages"}

counter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingProcessMessages = "messaging.process.messages"; @@ -263,8 +262,8 @@ CreateAsyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter) * Deprecated. Use @code messaging.client.operation.duration @endcode instead. * * @deprecated - * {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason": - * "uncategorized"}

histogram + * {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason": "renamed", + * "renamed_to": "messaging.client.operation.duration"}

histogram */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishDuration = "messaging.publish.duration"; @@ -289,16 +288,16 @@ CreateSyncDoubleMetricMessagingPublishDuration(metrics::Meter *meter) } /** - * Deprecated. Use @code messaging.client.produced.messages @endcode instead. + * Deprecated. Use @code messaging.client.sent.messages @endcode instead. * * @deprecated - * {"note": "Replaced by @code messaging.client.produced.messages @endcode.", "reason": - * "uncategorized"}

counter + * {"note": "Replaced by @code messaging.client.sent.messages @endcode.", "reason": "renamed", + * "renamed_to": "messaging.client.sent.messages"}

counter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishMessages = "messaging.publish.messages"; OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingPublishMessages = - "Deprecated. Use `messaging.client.produced.messages` instead."; + "Deprecated. Use `messaging.client.sent.messages` instead."; OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingPublishMessages = "{message}"; @@ -338,8 +337,8 @@ CreateAsyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter) * Deprecated. Use @code messaging.client.operation.duration @endcode instead. * * @deprecated - * {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason": - * "uncategorized"}

histogram + * {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason": "renamed", + * "renamed_to": "messaging.client.operation.duration"}

histogram */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveDuration = "messaging.receive.duration"; @@ -367,8 +366,8 @@ CreateSyncDoubleMetricMessagingReceiveDuration(metrics::Meter *meter) * Deprecated. Use @code messaging.client.consumed.messages @endcode instead. * * @deprecated - * {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason": - * "uncategorized"}

counter + * {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason": "renamed", + * "renamed_to": "messaging.client.consumed.messages"}

counter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveMessages = "messaging.receive.messages"; diff --git a/api/include/opentelemetry/semconv/incubating/net_attributes.h b/api/include/opentelemetry/semconv/incubating/net_attributes.h index ba35616314..aa7d935cdc 100644 --- a/api/include/opentelemetry/semconv/incubating/net_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/net_attributes.h @@ -23,7 +23,8 @@ namespace net * Deprecated, use @code network.local.address @endcode. * * @deprecated - * {"note": "Replaced by @code network.local.address @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code network.local.address @endcode.", "reason": "renamed", "renamed_to": + * "network.local.address"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostIp = "net.host.ip"; @@ -31,7 +32,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostIp = "net.host.ip" * Deprecated, use @code server.address @endcode. * * @deprecated - * {"note": "Replaced by @code server.address @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code server.address @endcode.", "reason": "renamed", "renamed_to": + * "server.address"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostName = "net.host.name"; @@ -39,7 +41,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostName = "net.host.n * Deprecated, use @code server.port @endcode. * * @deprecated - * {"note": "Replaced by @code server.port @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code server.port @endcode.", "reason": "renamed", "renamed_to": + * "server.port"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostPort = "net.host.port"; @@ -47,7 +50,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostPort = "net.host.p * Deprecated, use @code network.peer.address @endcode. * * @deprecated - * {"note": "Replaced by @code network.peer.address @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code network.peer.address @endcode.", "reason": "renamed", "renamed_to": + * "network.peer.address"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerIp = "net.peer.ip"; @@ -75,7 +79,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerPort = "net.peer.p * Deprecated, use @code network.protocol.name @endcode. * * @deprecated - * {"note": "Replaced by @code network.protocol.name @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code network.protocol.name @endcode.", "reason": "renamed", "renamed_to": + * "network.protocol.name"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolName = "net.protocol.name"; @@ -83,7 +88,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolName = "net.pr * Deprecated, use @code network.protocol.version @endcode. * * @deprecated - * {"note": "Replaced by @code network.protocol.version @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code network.protocol.version @endcode.", "reason": "renamed", + * "renamed_to": "network.protocol.version"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolVersion = "net.protocol.version"; @@ -100,7 +106,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockFamily = "net.sock * Deprecated, use @code network.local.address @endcode. * * @deprecated - * {"note": "Replaced by @code network.local.address @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code network.local.address @endcode.", "reason": "renamed", "renamed_to": + * "network.local.address"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostAddr = "net.sock.host.addr"; @@ -108,7 +115,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostAddr = "net.so * Deprecated, use @code network.local.port @endcode. * * @deprecated - * {"note": "Replaced by @code network.local.port @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code network.local.port @endcode.", "reason": "renamed", "renamed_to": + * "network.local.port"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostPort = "net.sock.host.port"; @@ -116,7 +124,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostPort = "net.so * Deprecated, use @code network.peer.address @endcode. * * @deprecated - * {"note": "Replaced by @code network.peer.address @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code network.peer.address @endcode.", "reason": "renamed", "renamed_to": + * "network.peer.address"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr"; @@ -124,7 +133,7 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerAddr = "net.so * Deprecated, no replacement at this time. * * @deprecated - * {"note": "Removed.", "reason": "uncategorized"} + * {"note": "Removed. No replacement at this time.", "reason": "obsoleted"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerName = "net.sock.peer.name"; @@ -132,7 +141,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerName = "net.so * Deprecated, use @code network.peer.port @endcode. * * @deprecated - * {"note": "Replaced by @code network.peer.port @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code network.peer.port @endcode.", "reason": "renamed", "renamed_to": + * "network.peer.port"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerPort = "net.sock.peer.port"; @@ -140,7 +150,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerPort = "net.so * Deprecated, use @code network.transport @endcode. * * @deprecated - * {"note": "Replaced by @code network.transport @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code network.transport @endcode.", "reason": "renamed", "renamed_to": + * "network.transport"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kNetTransport = "net.transport"; diff --git a/api/include/opentelemetry/semconv/incubating/otel_attributes.h b/api/include/opentelemetry/semconv/incubating/otel_attributes.h index 20e3955178..cd2eb6b8f7 100644 --- a/api/include/opentelemetry/semconv/incubating/otel_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/otel_attributes.h @@ -49,7 +49,8 @@ static constexpr const char *kOtelComponentType = "otel.component.type"; * Deprecated. Use the @code otel.scope.name @endcode attribute * * @deprecated - * {"note": "Use the @code otel.scope.name @endcode attribute.", "reason": "uncategorized"} + * {"note": "Replaced by @code otel.scope.name @endcode.", "reason": "renamed", "renamed_to": + * "otel.scope.name"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryName = "otel.library.name"; @@ -57,7 +58,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryName = "otel.l * Deprecated. Use the @code otel.scope.version @endcode attribute. * * @deprecated - * {"note": "Use the @code otel.scope.version @endcode attribute.", "reason": "uncategorized"} + * {"note": "Replaced by @code otel.scope.version @endcode.", "reason": "renamed", "renamed_to": + * "otel.scope.version"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryVersion = "otel.library.version"; diff --git a/api/include/opentelemetry/semconv/incubating/otel_metrics.h b/api/include/opentelemetry/semconv/incubating/otel_metrics.h index 0905c0b74c..791f7b15e1 100644 --- a/api/include/opentelemetry/semconv/incubating/otel_metrics.h +++ b/api/include/opentelemetry/semconv/incubating/otel_metrics.h @@ -288,9 +288,8 @@ CreateAsyncDoubleMetricOtelSdkExporterSpanExported(metrics::Meter *meter) * Deprecated, use @code otel.sdk.exporter.span.exported @endcode instead. * * @deprecated - * {"note": "Renamed to @code otel.sdk.exporter.span.exported @endcode.", "reason": "uncategorized"} - *

- * updowncounter + * {"note": "Replaced by @code otel.sdk.exporter.span.exported @endcode.", "reason": "renamed", + * "renamed_to": "otel.sdk.exporter.span.exported"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkExporterSpanExportedCount = "otel.sdk.exporter.span.exported.count"; @@ -379,9 +378,8 @@ CreateAsyncDoubleMetricOtelSdkExporterSpanInflight(metrics::Meter *meter) * Deprecated, use @code otel.sdk.exporter.span.inflight @endcode instead. * * @deprecated - * {"note": "Renamed to @code otel.sdk.exporter.span.inflight @endcode.", "reason": "uncategorized"} - *

- * updowncounter + * {"note": "Replaced by @code otel.sdk.exporter.span.inflight @endcode.", "reason": "renamed", + * "renamed_to": "otel.sdk.exporter.span.inflight"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkExporterSpanInflightCount = "otel.sdk.exporter.span.inflight.count"; @@ -674,8 +672,8 @@ CreateAsyncDoubleMetricOtelSdkProcessorSpanProcessed(metrics::Meter *meter) * Deprecated, use @code otel.sdk.processor.span.processed @endcode instead. * * @deprecated - * {"note": "Renamed to @code otel.sdk.processor.span.processed @endcode.", "reason": - * "uncategorized"}

updowncounter + * {"note": "Replaced by @code otel.sdk.processor.span.processed @endcode.", "reason": "renamed", + * "renamed_to": "otel.sdk.processor.span.processed"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkProcessorSpanProcessedCount = "otel.sdk.processor.span.processed.count"; @@ -852,9 +850,8 @@ CreateAsyncDoubleMetricOtelSdkSpanEnded(metrics::Meter *meter) * Deprecated, use @code otel.sdk.span.ended @endcode instead. * * @deprecated - * {"note": "Renamed to @code otel.sdk.span.ended @endcode.", "reason": "uncategorized"} - *

- * counter + * {"note": "Replaced by @code otel.sdk.span.ended @endcode.", "reason": "renamed", "renamed_to": + * "otel.sdk.span.ended"}

counter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkSpanEndedCount = "otel.sdk.span.ended.count"; @@ -937,9 +934,8 @@ CreateAsyncDoubleMetricOtelSdkSpanLive(metrics::Meter *meter) * Deprecated, use @code otel.sdk.span.live @endcode instead. * * @deprecated - * {"note": "Renamed to @code otel.sdk.span.live @endcode.", "reason": "uncategorized"} - *

- * updowncounter + * {"note": "Replaced by @code otel.sdk.span.live @endcode.", "reason": "renamed", "renamed_to": + * "otel.sdk.span.live"}

updowncounter */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkSpanLiveCount = "otel.sdk.span.live.count"; diff --git a/api/include/opentelemetry/semconv/incubating/other_attributes.h b/api/include/opentelemetry/semconv/incubating/other_attributes.h index 1a757f7eda..c8b1b72f3c 100644 --- a/api/include/opentelemetry/semconv/incubating/other_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/other_attributes.h @@ -23,7 +23,8 @@ namespace other * Deprecated, use @code db.client.connection.state @endcode instead. * * @deprecated - * {"note": "Replaced by @code db.client.connection.state @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code db.client.connection.state @endcode.", "reason": "renamed", + * "renamed_to": "db.client.connection.state"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kState = "state"; diff --git a/api/include/opentelemetry/semconv/incubating/pool_attributes.h b/api/include/opentelemetry/semconv/incubating/pool_attributes.h index fecd19fd8e..e273ee2e89 100644 --- a/api/include/opentelemetry/semconv/incubating/pool_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/pool_attributes.h @@ -23,7 +23,8 @@ namespace pool * Deprecated, use @code db.client.connection.pool.name @endcode instead. * * @deprecated - * {"note": "Replaced by @code db.client.connection.pool.name @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code db.client.connection.pool.name @endcode.", "reason": "renamed", + * "renamed_to": "db.client.connection.pool.name"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kPoolName = "pool.name"; diff --git a/api/include/opentelemetry/semconv/incubating/process_attributes.h b/api/include/opentelemetry/semconv/incubating/process_attributes.h index 5ad0eda7ce..754eaf2ee9 100644 --- a/api/include/opentelemetry/semconv/incubating/process_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/process_attributes.h @@ -38,14 +38,16 @@ static constexpr const char *kProcessCommand = "process.command"; * All the command arguments (including the command/executable itself) as received by the process. * On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according * to the list of null-delimited strings extracted from @code proc/[pid]/cmdline @endcode. For - * libc-based executables, this would be the full argv vector passed to @code main @endcode. + * libc-based executables, this would be the full argv vector passed to @code main @endcode. SHOULD + * NOT be collected by default unless there is sanitization that excludes sensitive data. */ static constexpr const char *kProcessCommandArgs = "process.command_args"; /** * The full command used to launch the process as a single string representing the full command. On * Windows, can be set to the result of @code GetCommandLineW @endcode. Do not set this if you have - * to assemble it just for monitoring; use @code process.command_args @endcode instead. + * to assemble it just for monitoring; use @code process.command_args @endcode instead. SHOULD NOT + * be collected by default unless there is sanitization that excludes sensitive data. */ static constexpr const char *kProcessCommandLine = "process.command_line"; @@ -58,7 +60,7 @@ static constexpr const char *kProcessContextSwitchType = "process.context_switch * Deprecated, use @code cpu.mode @endcode instead. * * @deprecated - * {"note": "Replaced by @code cpu.mode @endcode", "reason": "uncategorized"} + * {"note": "Replaced by @code cpu.mode @endcode.", "reason": "renamed", "renamed_to": "cpu.mode"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessCpuState = "process.cpu.state"; @@ -100,8 +102,8 @@ static constexpr const char *kProcessExecutableBuildIdHtlhash = * "Deprecated, use @code process.executable.build_id.htlhash @endcode instead." * * @deprecated - * {"note": "Replaced by @code process.executable.build_id.htlhash @endcode", "reason": - * "uncategorized"} + * {"note": "Replaced by @code process.executable.build_id.htlhash @endcode.", "reason": "renamed", + * "renamed_to": "process.executable.build_id.htlhash"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessExecutableBuildIdProfiling = "process.executable.build_id.profiling"; diff --git a/api/include/opentelemetry/semconv/incubating/system_attributes.h b/api/include/opentelemetry/semconv/incubating/system_attributes.h index d005ffb3b6..d2410baf5a 100644 --- a/api/include/opentelemetry/semconv/incubating/system_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/system_attributes.h @@ -28,7 +28,7 @@ static constexpr const char *kSystemCpuLogicalNumber = "system.cpu.logical_numbe * Deprecated, use @code cpu.mode @endcode instead. * * @deprecated - * {"note": "Replaced by @code cpu.mode @endcode", "reason": "uncategorized"} + * {"note": "Replaced by @code cpu.mode @endcode.", "reason": "renamed", "renamed_to": "cpu.mode"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemCpuState = "system.cpu.state"; @@ -66,8 +66,8 @@ static constexpr const char *kSystemMemoryState = "system.memory.state"; * Deprecated, use @code network.connection.state @endcode instead. * * @deprecated - * {"note": "Removed, report network connection state with @code network.connection.state @endcode - * attribute", "reason": "uncategorized"} + * {"note": "Replaced by @code network.connection.state @endcode.", "reason": "renamed", + * "renamed_to": "network.connection.state"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemNetworkState = "system.network.state"; @@ -97,7 +97,8 @@ static constexpr const char *kSystemProcessStatus = "system.process.status"; * Deprecated, use @code system.process.status @endcode instead. * * @deprecated - * {"note": "Replaced by @code system.process.status @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code system.process.status @endcode.", "reason": "renamed", "renamed_to": + * "system.process.status"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemProcessesStatus = "system.processes.status"; diff --git a/api/include/opentelemetry/semconv/incubating/system_metrics.h b/api/include/opentelemetry/semconv/incubating/system_metrics.h index a985dac901..a72e7a7803 100644 --- a/api/include/opentelemetry/semconv/incubating/system_metrics.h +++ b/api/include/opentelemetry/semconv/incubating/system_metrics.h @@ -24,9 +24,8 @@ namespace system * Deprecated. Use @code cpu.frequency @endcode instead. * * @deprecated - * {"note": "Replaced by @code cpu.frequency @endcode.", "reason": "uncategorized"} - *

- * gauge + * {"note": "Replaced by @code cpu.frequency @endcode.", "reason": "renamed", "renamed_to": + * "cpu.frequency"}

gauge */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuFrequency = "system.cpu.frequency"; @@ -156,7 +155,7 @@ CreateAsyncDoubleMetricSystemCpuPhysicalCount(metrics::Meter *meter) * Deprecated. Use @code cpu.time @endcode instead. * * @deprecated - * {"note": "Replaced by @code cpu.time @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code cpu.time @endcode.", "reason": "renamed", "renamed_to": "cpu.time"} *

* counter */ @@ -197,9 +196,8 @@ CreateAsyncDoubleMetricSystemCpuTime(metrics::Meter *meter) * Deprecated. Use @code cpu.utilization @endcode instead. * * @deprecated - * {"note": "Replaced by @code cpu.utilization @endcode.", "reason": "uncategorized"} - *

- * gauge + * {"note": "Replaced by @code cpu.utilization @endcode.", "reason": "renamed", "renamed_to": + * "cpu.utilization"}

gauge */ OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuUtilization = "system.cpu.utilization"; diff --git a/api/include/opentelemetry/semconv/incubating/tls_attributes.h b/api/include/opentelemetry/semconv/incubating/tls_attributes.h index da7ed78b99..89e5ef052e 100644 --- a/api/include/opentelemetry/semconv/incubating/tls_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/tls_attributes.h @@ -89,7 +89,8 @@ static constexpr const char *kTlsClientNotBefore = "tls.client.not_before"; * Deprecated, use @code server.address @endcode instead. * * @deprecated - * {"note": "Replaced by @code server.address @endcode.", "reason": "uncategorized"} + * {"note": "Replaced by @code server.address @endcode.", "reason": "renamed", "renamed_to": + * "server.address"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kTlsClientServerName = "tls.client.server_name"; diff --git a/api/include/opentelemetry/semconv/incubating/vcs_attributes.h b/api/include/opentelemetry/semconv/incubating/vcs_attributes.h index aae8215722..e255bb7b2e 100644 --- a/api/include/opentelemetry/semconv/incubating/vcs_attributes.h +++ b/api/include/opentelemetry/semconv/incubating/vcs_attributes.h @@ -132,7 +132,8 @@ static constexpr const char *kVcsRefType = "vcs.ref.type"; * Deprecated, use @code vcs.change.id @endcode instead. * * @deprecated - * {"note": "Deprecated, use @code vcs.change.id @endcode instead.", "reason": "uncategorized"} + * {"note": "Replaced by @code vcs.change.id @endcode.", "reason": "renamed", "renamed_to": + * "vcs.change.id"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryChangeId = "vcs.repository.change.id"; @@ -141,7 +142,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryChangeId = * Deprecated, use @code vcs.change.title @endcode instead. * * @deprecated - * {"note": "Deprecated, use @code vcs.change.title @endcode instead.", "reason": "uncategorized"} + * {"note": "Replaced by @code vcs.change.title @endcode.", "reason": "renamed", "renamed_to": + * "vcs.change.title"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryChangeTitle = "vcs.repository.change.title"; @@ -158,7 +160,8 @@ static constexpr const char *kVcsRepositoryName = "vcs.repository.name"; * Deprecated, use @code vcs.ref.head.name @endcode instead. * * @deprecated - * {"note": "Deprecated, use @code vcs.ref.head.name @endcode instead.", "reason": "uncategorized"} + * {"note": "Replaced by @code vcs.ref.head.name @endcode.", "reason": "renamed", "renamed_to": + * "vcs.ref.head.name"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefName = "vcs.repository.ref.name"; @@ -167,8 +170,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefName = * Deprecated, use @code vcs.ref.head.revision @endcode instead. * * @deprecated - * {"note": "Deprecated, use @code vcs.ref.head.revision @endcode instead.", "reason": - * "uncategorized"} + * {"note": "Replaced by @code vcs.ref.head.revision @endcode.", "reason": "renamed", "renamed_to": + * "vcs.ref.head.revision"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefRevision = "vcs.repository.ref.revision"; @@ -177,7 +180,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefRevision * Deprecated, use @code vcs.ref.head.type @endcode instead. * * @deprecated - * {"note": "Deprecated, use @code vcs.ref.head.type @endcode instead.", "reason": "uncategorized"} + * {"note": "Replaced by @code vcs.ref.head.type @endcode.", "reason": "renamed", "renamed_to": + * "vcs.ref.head.type"} */ OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefType = "vcs.repository.ref.type"; diff --git a/api/include/opentelemetry/semconv/schema_url.h b/api/include/opentelemetry/semconv/schema_url.h index f389cba3f6..bc36ae2355 100644 --- a/api/include/opentelemetry/semconv/schema_url.h +++ b/api/include/opentelemetry/semconv/schema_url.h @@ -19,6 +19,6 @@ namespace semconv /** * The URL of the OpenTelemetry schema for these keys and values. */ -static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.33.0"; +static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.34.0"; } // namespace semconv OPENTELEMETRY_END_NAMESPACE diff --git a/buildscripts/semantic-convention/generate.sh b/buildscripts/semantic-convention/generate.sh index 6d03b74756..703e4bccbe 100755 --- a/buildscripts/semantic-convention/generate.sh +++ b/buildscripts/semantic-convention/generate.sh @@ -16,7 +16,7 @@ ROOT_DIR="${SCRIPT_DIR}/../../" # freeze the spec & generator tools versions to make the generation reproducible # repository: https://github.com/open-telemetry/semantic-conventions -SEMCONV_VERSION=1.33.0 +SEMCONV_VERSION=1.34.0 # repository: https://github.com/open-telemetry/weaver WEAVER_VERSION=0.15.0