diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79a05ed12..66cdf3752 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -242,31 +242,6 @@ jobs: modules-ignore: otel4s-sdk-common_native0.4_2.13 otel4s-sdk-common_native0.4_3 otel4s-benchmarks_2.13 otel4s-benchmarks_3 otel4s-examples_2.13 otel4s-examples_3 otel4s-sdk-common_sjs1_2.13 otel4s-sdk-common_sjs1_3 otel4s-sdk-trace_sjs1_2.13 otel4s-sdk-trace_sjs1_3 otel4s_2.13 otel4s_3 docs_2.13 docs_3 otel4s-sdk_native0.4_2.13 otel4s-sdk_native0.4_3 otel4s-sdk-common_2.13 otel4s-sdk-common_3 otel4s_2.13 otel4s_3 otel4s_2.13 otel4s_3 otel4s-sdk-trace_native0.4_2.13 otel4s-sdk-trace_native0.4_3 otel4s-sdk_sjs1_2.13 otel4s-sdk_sjs1_3 otel4s-sdk_2.13 otel4s-sdk_3 otel4s-sdk-trace_2.13 otel4s-sdk-trace_3 configs-ignore: test scala-tool scala-doc-tool test-internal - validate-steward: - name: Validate Steward Config - strategy: - matrix: - os: [ubuntu-latest] - java: [temurin@11] - runs-on: ${{ matrix.os }} - steps: - - name: Checkout current branch (fast) - uses: actions/checkout@v4 - - - name: Setup Java (temurin@11) - id: setup-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 11 - - - uses: coursier/setup-action@v1 - with: - apps: scala-steward - - - run: scala-steward validate-repo-config .scala-steward.conf - site: name: Generate Site strategy: diff --git a/.scala-steward.conf b/.scala-steward.conf deleted file mode 100644 index 6417f0b56..000000000 --- a/.scala-steward.conf +++ /dev/null @@ -1,6 +0,0 @@ -postUpdateHooks = [{ - command = ["sbt", "; root/semanticConventionsGenerate; scalafixAll; scalafmtAll"], - commitMessage = "Regenerate semantic conventions", - groupId = "io.opentelemetry.semconv", - artifactId = "opentelemetry-semconv" -}] diff --git a/build.sbt b/build.sbt index 0809b3bff..a9336c2a1 100644 --- a/build.sbt +++ b/build.sbt @@ -326,6 +326,9 @@ lazy val semconv = crossProject(JVMPlatform, JSPlatform, NativePlatform) "openTelemetrySemanticConventionsVersion" -> OpenTelemetrySemConvVersion ) ) + .jsSettings( + scalacOptions += "-Wconf:cat=deprecation:s" + ) .settings(munitDependencies) .settings(scalafixSettings) diff --git a/buildscripts/semantic-convention/templates/SemanticAttributes.scala.j2 b/buildscripts/semantic-convention/templates/SemanticAttributes.scala.j2 index e03746545..0f4fb8af4 100644 --- a/buildscripts/semantic-convention/templates/SemanticAttributes.scala.j2 +++ b/buildscripts/semantic-convention/templates/SemanticAttributes.scala.j2 @@ -128,7 +128,7 @@ object {{class}} { * * @deprecated this item has been removed as of 1.8.0 of the semantic conventions. Please use [[SemanticAttributes.DbName]] instead. */ - @deprecated("Use SemanticAttributes.DbName instead", "") + @deprecated("Use SemanticAttributes.DbName instead", "Semantic Conventions 1.8.0") val DbCassandraKeyspace = string("db.cassandra.keyspace") /** @@ -136,7 +136,7 @@ object {{class}} { * * @deprecated this item has been removed as of 1.8.0 of the semantic conventions. Please use [[SemanticAttributes.DbName]] instead. */ - @deprecated("Use SemanticAttributes.DbName instead", "") + @deprecated("Use SemanticAttributes.DbName instead", "Semantic Conventions 1.8.0") val DbHbaseNameSpace = string("db.hbase.namespace") /** @@ -145,46 +145,46 @@ object {{class}} { * * @deprecated this item has been removed as of 1.13.0 of the semantic conventions. Please use [[SemanticAttributes.HttpRequestContentLength]] instead. */ - @deprecated("Use SemanticAttributes.HttpRequestContentLength instead", "") + @deprecated("Use SemanticAttributes.HttpRequestContentLength instead", "Semantic Conventions 1.13.0") val HttpRequestContentLengthUncompressed = long("http.request_content_length_uncompressed") /** * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use [[SemanticAttributes.HttpResponseContentLength]] instead. */ - @deprecated("Use SemanticAttributes.HttpResponseContentLength instead", "") + @deprecated("Use SemanticAttributes.HttpResponseContentLength instead", "Semantic Conventions 1.13.0") val HttpResponseContentLengthUncompressed = long("http.response_content_length_uncompressed") /** * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use * [[SemanticAttributes.NetHostName]] instead. */ - @deprecated("Use SemanticAttributes.NetHostName instead", "") + @deprecated("Use SemanticAttributes.NetHostName instead", "Semantic Conventions 1.13.0") val HttpServerName = string("http.server_name") /** * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use * [[SemanticAttributes.NetHostName]] instead. */ - @deprecated("Use SemanticAttributes.NetHostName instead", "") + @deprecated("Use SemanticAttributes.NetHostName instead", "Semantic Conventions 1.13.0") val HttpHost = string("http.host") /** * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use [[SemanticAttributes.NetSockPeerAddr]] instead. */ - @deprecated("Use SemanticAttributes.NetSockPeerAddr instead", "") + @deprecated("Use SemanticAttributes.NetSockPeerAddr instead", "Semantic Conventions 1.13.0") val NetPeerIp = string("net.peer.ip") /** * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use [[SemanticAttributes.NetSockHostAddr]] instead. */ - @deprecated("Use SemanticAttributes.NetSockHostAddr instead", "") + @deprecated("Use SemanticAttributes.NetSockHostAddr instead", "Semantic Conventions 1.13.0") val NetHostIp = string("net.host.ip") /** * The ordinal number of request re-sending attempt. * @deprecated This item has been removed as of 1.15.0 of the semantic conventions. Use [[SemanticAttributes.HttpResendCount]] instead. */ - @deprecated("Use SemanticAttributes.HttpResendCount instead", "") + @deprecated("Use SemanticAttributes.HttpResendCount instead", "Semantic Conventions 1.15.0") val HttpRetryCount = long("http.retry_count") @@ -192,35 +192,35 @@ object {{class}} { * A string identifying the messaging system. * @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use [[SemanticAttributes.MessagingDestinationName]] instead. */ - @deprecated("Use SemanticAttributes.MessagingDestinationName instead", "") + @deprecated("Use SemanticAttributes.MessagingDestinationName instead", "Semantic Conventions 1.17.0") val MessagingDestination = string("messaging.destination") /** * A boolean that is true if the message destination is temporary. * @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use [[SemanticAttributes.MessagingDestinationTemporary]] instead. */ - @deprecated("Use SemanticAttributes.MessagingDestinationTemporary instead", "") + @deprecated("Use SemanticAttributes.MessagingDestinationTemporary instead", "Semantic Conventions 1.17.0") val MessagingTempDestination = boolean("messaging.temp_destination") /** * The name of the transport protocol. * @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use [[SemanticAttributes.NetAppProtocolName]] instead. */ - @deprecated("Use SemanticAttributes.NetAppProtocolName instead", "") + @deprecated("Use SemanticAttributes.NetAppProtocolName instead", "Semantic Conventions 1.17.0") val MessagingProtocol = string("messaging.protocol") /** * The version of the transport protocol. * @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use [[SemanticAttributes.NetAppProtocolVersion]] instead. */ - @deprecated("Use SemanticAttributes.NetAppProtocolVersion instead", "") + @deprecated("Use SemanticAttributes.NetAppProtocolVersion instead", "Semantic Conventions 1.17.0") val MessagingProtocolVersion = string("messaging.protocol_version") /** * Connection string. * @deprecated This item has been removed as of 1.17.0 of the semantic conventions. There is no replacement. */ - @deprecated("There is no replacement", "") + @deprecated("There is no replacement", "Semantic Conventions 1.17.0") val MessagingUrl = string("messaging.url") /** @@ -228,42 +228,42 @@ object {{class}} { * message belongs, represented as a string. Sometimes called "Correlation ID". * @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use [[SemanticAttributes.MessagingMessageConversationId]] instead. */ - @deprecated("Use SemanticAttributes.MessagingMessageConversationId instead", "") + @deprecated("Use SemanticAttributes.MessagingMessageConversationId instead", "Semantic Conventions 1.17.0") val MessagingConversationId = string("messaging.conversation_id") /** * RabbitMQ message routing key. * @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use [[SemanticAttributes.MessagingRabbitmqDestinationRoutingKey]] instead. */ - @deprecated("Use SemanticAttributes.MessagingRabbitmqDestinationRoutingKey instead", "") + @deprecated("Use SemanticAttributes.MessagingRabbitmqDestinationRoutingKey instead", "Semantic Conventions 1.17.0") val MessagingRabbitmqRoutingKey = string("messaging.rabbitmq.routing_key") /** * Partition the message is received from. * @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use [[SemanticAttributes.MessagingKafkaSourcePartition]] instead. */ - @deprecated("Use SemanticAttributes.MessagingKafkaSourcePartition instead", "") + @deprecated("Use SemanticAttributes.MessagingKafkaSourcePartition instead", "Semantic Conventions 1.17.0") val MessagingKafkaPartition = long("messaging.kafka.partition") /** * A boolean that is true if the message is a tombstone. * @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use [[SemanticAttributes.MessagingKafkaMessageTombstone]] instead. */ - @deprecated("Use SemanticAttributes.MessagingKafkaMessageTombstone instead", "") + @deprecated("Use SemanticAttributes.MessagingKafkaMessageTombstone instead", "Semantic Conventions 1.17.0") val MessagingKafkaTombstone = boolean("messaging.kafka.tombstone") /** * The timestamp in milliseconds that the delay message is expected to be delivered to consumer. * @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use [[SemanticAttributes.MessagingRocketmqMessageDeliveryTimestamp]] instead. */ - @deprecated("Use SemanticAttributes.MessagingRocketmqMessageDeliveryTimestamp instead", "") + @deprecated("Use SemanticAttributes.MessagingRocketmqMessageDeliveryTimestamp instead", "Semantic Conventions 1.17.0") val MessagingRocketmqDeliveryTimestamp = long("messaging.rocketmq.delivery_timestamp") /** * The delay time level for delay message, which determines the message delay time. * @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use [[SemanticAttributes.MessagingRocketmqMessageDelayTimeLevel]] instead. */ - @deprecated("Use SemanticAttributes.MessagingRocketmqMessageDelayTimeLevel instead", "") + @deprecated("Use SemanticAttributes.MessagingRocketmqMessageDelayTimeLevel instead", "Semantic Conventions 1.17.0") val MessagingRocketmqDelayTimeLevel = long("messaging.rocketmq.delay_time_level") /** @@ -285,7 +285,7 @@ object {{class}} { * @deprecated This item has been renamed in 1.19.0 version of the semantic conventions. * Use [[SemanticAttributes.FaasInvocationId]] instead. */ - @deprecated("Use SemanticAttributes.FaasInvocationId instead", "") + @deprecated("Use SemanticAttributes.FaasInvocationId instead", "Semantic Conventions 1.19.0") val FaasExecution = string("faas.execution") /** @@ -294,7 +294,7 @@ object {{class}} { * @deprecated This item has been renamed in 1.19.0 version of the semantic conventions. * Use [[SemanticAttributes.UserAgentOriginal]] instead. */ - @deprecated("Use SemanticAttributes.UserAgentOriginal instead", "") + @deprecated("Use SemanticAttributes.UserAgentOriginal instead", "Semantic Conventions 1.19.0") val HttpUserAgent = string("http.user_agent") /** @@ -311,7 +311,311 @@ object {{class}} { * @deprecated Deprecated, use the [[org.typelevel.otel4s.semconv.resource.attributes.ResourceAttributes.OtelScopeVersion ResourceAttributes.OtelScopeVersion]] attribute. */ @deprecated("Use ResourceAttributes.OtelScopeVersion instead", "") - val OtelLibraryVersion = string("otel.library.version") + val OtelLibraryVersion = string("otel.library.version") + + /** + * Kind of HTTP protocol used. + * @deprecated This item has been removed as of 1.20.0 of the semantic conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.20.0") + val HttpFlavor = string("http.flavor") + + /** + * Values for [[SemanticAttributes.HttpFlavor]]. + * @deprecated This item has been removed as of 1.20.0 of the semantic conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.20.0") + abstract class HttpFlavorValue(val value: String) + object HttpFlavorValue { + /** HTTP/1.0. */ + case object Http10 extends HttpFlavorValue("1.0") + /** HTTP/1.1. */ + case object Http11 extends HttpFlavorValue("1.1") + /** HTTP/2. */ + case object Http20 extends HttpFlavorValue("2.0") + /** HTTP/3. */ + case object Http30 extends HttpFlavorValue("3.0") + /** SPDY protocol. */ + case object Spdy extends HttpFlavorValue("SPDY") + /** QUIC protocol. */ + case object Quic extends HttpFlavorValue("QUIC") + } + + /** + * Application layer protocol used. The value SHOULD be normalized to lowercase. + * @deprecated This item has been removed as of 1.20.0 of the semantic conventions. Use [[SemanticAttributes.NetProtocolName]] instead. + */ + @deprecated("Use SemanticAttributes.NetProtocolName instead", "Semantic Conventions 1.20.0") + val NetAppProtocolName = string("net.app.protocol.name") + + /** + * Version of the application layer protocol used. See note below. + * + *

Notes: + * + *

+ * @deprecated This item has been removed as of 1.20.0 of the semantic conventions. Use [[SemanticAttributes.NetProtocolVersion]] instead. + */ + @deprecated("Use SemanticAttributes.NetProtocolVersion instead", "Semantic Conventions 1.20.0") + val NetAppProtocolVersion = string("net.app.protocol.version") + + /** + * The kind of message destination. + * @deprecated This item has been removed as of 1.20.0 of the semantic conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.20.0") + val MessagingDestinationKind = string("messaging.destination.kind") + + /** + * Enum values for [[SemanticAttributes.MessagingDestinationKind]]. + * @deprecated This item has been removed as of 1.20.0 of the semantic conventions. + */ + @deprecated("There is not replacement", "Semantic Conventions 1.20.0") + abstract class MessagingDestinationKindValue(val value: String) + object MessagingDestinationKindValue { + /** A message sent to a queue. */ + case object Queue extends MessagingDestinationKindValue("queue") + /** A message sent to a topic. */ + case object Topic extends MessagingDestinationKindValue("topic") + } + + /** + * The kind of message source. + * @deprecated This item has been removed as of 1.20.0 of the semantic conventions. + */ + @deprecated("There is not replacement", "Semantic Conventions 1.20.0") + val MessagingSourceKind = string("messaging.source.kind") + + /** + * Values for [[SemanticAttributes.MessagingSourceKind]]. + * @deprecated This item has been removed as of 1.20.0 of the semantic conventions. + */ + @deprecated("There is not replacement", "Semantic Conventions 1.20.0") + abstract class MessagingSourceKindValue(val value: String) + object MessagingSourceKindValue { + /** A message received from a queue. */ + case object Queue extends MessagingSourceKindValue("queue") + /** A message received from a topic. */ + case object Topic extends MessagingSourceKindValue("topic") + } + + /** + * The internet connection type currently being used by the host. + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. Use [[SemanticAttributes.NetworkConnectionType]] instead. + */ + @deprecated("Use SemanticAttributes.NetworkConnectionType instead", "Semantic Conventions 1.21.0") + val NetHostConnectionType = string("net.host.connection.type") + + /** + * This describes more details regarding the connection.type. It may be the type of cell + * technology connection, but it could be used for describing details about a wifi connection. + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. Use [[SemanticAttributes.NetworkConnectionSubtype]] instead. + */ + @deprecated("Use SemanticAttributes.NetworkConnectionSubtype instead", "Semantic Conventions 1.21.0") + val NetHostConnectionSubtype = string("net.host.connection.subtype") + + /** + * The name of the mobile carrier. + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. Use [[SemanticAttributes.NetworkCarrierName]] instead. + */ + @deprecated("Use SemanticAttributes.NetworkCarrierName instead", "Semantic Conventions 1.21.0") + val NetHostCarrierName = string("net.host.carrier.name") + + /** + * The mobile carrier country code. + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. Use [[SemanticAttributes.NetworkCarrierMcc]] instead. + */ + @deprecated("Use SemanticAttributes.NetworkCarrierMcc instead", "Semantic Conventions 1.21.0") + val NetHostCarrierMcc = string("net.host.carrier.mcc") + + /** + * The mobile carrier network code. + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. Use [[SemanticAttributes.NetworkCarrierMnc]] instead. + */ + @deprecated("Use SemanticAttributes.NetworkCarrierMnc instead", "Semantic Conventions 1.21.0") + val NetHostCarrierMnc = string("net.host.carrier.mnc") + + /** + * The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network. + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. Use [[SemanticAttributes.NetworkCarrierIcc]] instead. + */ + @deprecated("Use SemanticAttributes.NetworkCarrierIcc instead", "Semantic Conventions 1.21.0") + val NetHostCarrierIcc = string("net.host.carrier.icc") + + /** + * The IP address of the original client behind all proxies, if known (e.g. from X-Forwarded-For). + * + *

Notes: + * + *

+ * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. Use [[SemanticAttributes.ClientAddress]] instead. + */ + @deprecated("Use SemanticAttributes.ClientAddress instead", "Semantic Conventions 1.21.0") + val HttpClientIp = string("http.client_ip") + + /** + * The message source name. + * + *

Notes: + * + *

+ * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.21.0") + val MessagingSourceName = string("messaging.source.name") + + /** + * Low cardinality representation of the messaging source name. + * + *

Notes: + * + *

+ * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.21.0") + val MessagingSourceTemplate = string("messaging.source.template") + + /** + * A boolean that is true if the message source is temporary and might not exist anymore after + * messages are processed. + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.21.0") + val MessagingSourceTemporary = boolean("messaging.source.temporary") + + /** + * A boolean that is true if the message source is anonymous (could be unnamed or have + * auto-generated name). + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.21.0") + val MessagingSourceAnonymous = boolean("messaging.source.anonymous") + + /** + * The identifier for the consumer receiving a message. For Kafka, set it to + * `{messaging.kafka.consumer.group} - {messaging.kafka.client_id}`, if both are present, or only + * `messaging.kafka.consumer.group`. For brokers, such as RabbitMQ and Artemis, set it to + * the `client_id` of the client consuming the message. + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. See [[SemanticAttributes.MessagingClientId]]. + */ + @deprecated("Use SemanticAttributes.MessagingClientId instead", "Semantic Conventions 1.21.0") + val MessagingConsumerId = string("messaging.consumer.id") + + /** + * Client Id for the Consumer or Producer that is handling the message. + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. See [[SemanticAttributes.MessagingClientId]]. + */ + @deprecated("Use SemanticAttributes.MessagingClientId instead", "Semantic Conventions 1.21.0") + val MessagingKafkaClientId = string("messaging.kafka.client_id") + + /** + * Partition the message is received from. + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.21.0") + val MessagingKafkaSourcePartition = long("messaging.kafka.source.partition") + + /** + * The unique identifier for each client. + * @deprecated This item has been removed in 1.21.0 version of the semantic conventions. See [[SemanticAttributes.MessagingClientId]]. + */ + @deprecated("Use SemanticAttributes.MessagingClientId instead", "Semantic Conventions 1.21.0") + val MessagingRocketmqClientId = string("messaging.rocketmq.client_id") + + /** + * Values for [[SemanticAttributes.NetHostConnectionType]]. + * @deprecated This item has been removed as of 1.21.0 of the semantic conventions. Use [[SemanticAttributes.NetworkConnectionTypeValue]] instead. + */ + @deprecated("Use SemanticAttributes.NetworkConnectionTypeValue", "Semantic Conventions 1.21.0") + abstract class NetHostConnectionTypeValue(val value: String) + object NetHostConnectionTypeValue { + /** wifi. */ + case object Wifi extends NetHostConnectionTypeValue("wifi") + /** wired. */ + case object Wired extends NetHostConnectionTypeValue("wired") + /** cell. */ + case object Cell extends NetHostConnectionTypeValue("cell") + /** unavailable. */ + case object Unavailable extends NetHostConnectionTypeValue("unavailable") + /** unknown. */ + case object Unknown extends NetHostConnectionTypeValue("unknown") + } + + /** + * Values for [[SemanticAttributes.NetHostConnectionSubtype]]. + * @deprecated This item has been removed as of 1.21.0 of the semantic conventions. Use [[SemanticAttributes.NetworkConnectionSubtypeValue]] instead. + */ + @deprecated("Use SemanticAttributes.NetworkConnectionSubtypeValue", "Semantic Conventions 1.21.0") + abstract class NetHostConnectionSubtypeValue(val value: String) + object NetHostConnectionSubtypeValue { + /** GPRS. */ + case object Gprs extends NetHostConnectionSubtypeValue("gprs") + /** EDGE. */ + case object Edge extends NetHostConnectionSubtypeValue("edge") + /** UMTS. */ + case object Umts extends NetHostConnectionSubtypeValue("umts") + /** CDMA. */ + case object Cdma extends NetHostConnectionSubtypeValue("cdma") + /** EVDO Rel. 0. */ + case object Evdo0 extends NetHostConnectionSubtypeValue("evdo_0") + /** EVDO Rev. A. */ + case object EvdoA extends NetHostConnectionSubtypeValue("evdo_a") + /** CDMA2000 1XRTT. */ + case object Cdma20001xrtt extends NetHostConnectionSubtypeValue("cdma2000_1xrtt") + /** HSDPA. */ + case object Hsdpa extends NetHostConnectionSubtypeValue("hsdpa") + /** HSUPA. */ + case object Hsupa extends NetHostConnectionSubtypeValue("hsupa") + /** HSPA. */ + case object Hspa extends NetHostConnectionSubtypeValue("hspa") + /** IDEN. */ + case object Iden extends NetHostConnectionSubtypeValue("iden") + /** EVDO Rev. B. */ + case object EvdoB extends NetHostConnectionSubtypeValue("evdo_b") + /** LTE. */ + case object Lte extends NetHostConnectionSubtypeValue("lte") + /** EHRPD. */ + case object Ehrpd extends NetHostConnectionSubtypeValue("ehrpd") + /** HSPAP. */ + case object Hspap extends NetHostConnectionSubtypeValue("hspap") + /** GSM. */ + case object Gsm extends NetHostConnectionSubtypeValue("gsm") + /** TD-SCDMA. */ + case object TdScdma extends NetHostConnectionSubtypeValue("td_scdma") + /** IWLAN. */ + case object Iwlan extends NetHostConnectionSubtypeValue("iwlan") + /** 5G NR (New Radio). */ + case object Nr extends NetHostConnectionSubtypeValue("nr") + /** 5G NRNSA (New Radio Non-Standalone). */ + case object Nrnsa extends NetHostConnectionSubtypeValue("nrnsa") + /** LTE CA. */ + case object LteCa extends NetHostConnectionSubtypeValue("lte_ca") + } {% endif %} diff --git a/semconv/src/main/scala/org/typelevel/otel4s/semconv/trace/attributes/SemanticAttributes.scala b/semconv/src/main/scala/org/typelevel/otel4s/semconv/trace/attributes/SemanticAttributes.scala index 2d2556a5b..9aaa0e8a6 100644 --- a/semconv/src/main/scala/org/typelevel/otel4s/semconv/trace/attributes/SemanticAttributes.scala +++ b/semconv/src/main/scala/org/typelevel/otel4s/semconv/trace/attributes/SemanticAttributes.scala @@ -2284,7 +2284,10 @@ object SemanticAttributes { * this item has been removed as of 1.8.0 of the semantic conventions. * Please use [[SemanticAttributes.DbName]] instead. */ - @deprecated("Use SemanticAttributes.DbName instead", "") + @deprecated( + "Use SemanticAttributes.DbName instead", + "Semantic Conventions 1.8.0" + ) val DbCassandraKeyspace = string("db.cassandra.keyspace") /** The HBase @@ -2294,7 +2297,10 @@ object SemanticAttributes { * this item has been removed as of 1.8.0 of the semantic conventions. * Please use [[SemanticAttributes.DbName]] instead. */ - @deprecated("Use SemanticAttributes.DbName instead", "") + @deprecated( + "Use SemanticAttributes.DbName instead", + "Semantic Conventions 1.8.0" + ) val DbHbaseNameSpace = string("db.hbase.namespace") /** The size of the uncompressed request payload body after transport @@ -2304,7 +2310,10 @@ object SemanticAttributes { * this item has been removed as of 1.13.0 of the semantic conventions. * Please use [[SemanticAttributes.HttpRequestContentLength]] instead. */ - @deprecated("Use SemanticAttributes.HttpRequestContentLength instead", "") + @deprecated( + "Use SemanticAttributes.HttpRequestContentLength instead", + "Semantic Conventions 1.13.0" + ) val HttpRequestContentLengthUncompressed = long( "http.request_content_length_uncompressed" ) @@ -2313,7 +2322,10 @@ object SemanticAttributes { * This item has been removed as of 1.13.0 of the semantic conventions. * Please use [[SemanticAttributes.HttpResponseContentLength]] instead. */ - @deprecated("Use SemanticAttributes.HttpResponseContentLength instead", "") + @deprecated( + "Use SemanticAttributes.HttpResponseContentLength instead", + "Semantic Conventions 1.13.0" + ) val HttpResponseContentLengthUncompressed = long( "http.response_content_length_uncompressed" ) @@ -2322,28 +2334,40 @@ object SemanticAttributes { * This item has been removed as of 1.13.0 of the semantic conventions. * Please use [[SemanticAttributes.NetHostName]] instead. */ - @deprecated("Use SemanticAttributes.NetHostName instead", "") + @deprecated( + "Use SemanticAttributes.NetHostName instead", + "Semantic Conventions 1.13.0" + ) val HttpServerName = string("http.server_name") /** @deprecated * This item has been removed as of 1.13.0 of the semantic conventions. * Please use [[SemanticAttributes.NetHostName]] instead. */ - @deprecated("Use SemanticAttributes.NetHostName instead", "") + @deprecated( + "Use SemanticAttributes.NetHostName instead", + "Semantic Conventions 1.13.0" + ) val HttpHost = string("http.host") /** @deprecated * This item has been removed as of 1.13.0 of the semantic conventions. * Please use [[SemanticAttributes.NetSockPeerAddr]] instead. */ - @deprecated("Use SemanticAttributes.NetSockPeerAddr instead", "") + @deprecated( + "Use SemanticAttributes.NetSockPeerAddr instead", + "Semantic Conventions 1.13.0" + ) val NetPeerIp = string("net.peer.ip") /** @deprecated * This item has been removed as of 1.13.0 of the semantic conventions. * Please use [[SemanticAttributes.NetSockHostAddr]] instead. */ - @deprecated("Use SemanticAttributes.NetSockHostAddr instead", "") + @deprecated( + "Use SemanticAttributes.NetSockHostAddr instead", + "Semantic Conventions 1.13.0" + ) val NetHostIp = string("net.host.ip") /** The ordinal number of request re-sending attempt. @@ -2351,7 +2375,10 @@ object SemanticAttributes { * This item has been removed as of 1.15.0 of the semantic conventions. Use * [[SemanticAttributes.HttpResendCount]] instead. */ - @deprecated("Use SemanticAttributes.HttpResendCount instead", "") + @deprecated( + "Use SemanticAttributes.HttpResendCount instead", + "Semantic Conventions 1.15.0" + ) val HttpRetryCount = long("http.retry_count") /** A string identifying the messaging system. @@ -2359,7 +2386,10 @@ object SemanticAttributes { * This item has been removed as of 1.17.0 of the semantic conventions. Use * [[SemanticAttributes.MessagingDestinationName]] instead. */ - @deprecated("Use SemanticAttributes.MessagingDestinationName instead", "") + @deprecated( + "Use SemanticAttributes.MessagingDestinationName instead", + "Semantic Conventions 1.17.0" + ) val MessagingDestination = string("messaging.destination") /** A boolean that is true if the message destination is temporary. @@ -2369,7 +2399,7 @@ object SemanticAttributes { */ @deprecated( "Use SemanticAttributes.MessagingDestinationTemporary instead", - "" + "Semantic Conventions 1.17.0" ) val MessagingTempDestination = boolean("messaging.temp_destination") @@ -2378,7 +2408,10 @@ object SemanticAttributes { * This item has been removed as of 1.17.0 of the semantic conventions. Use * [[SemanticAttributes.NetAppProtocolName]] instead. */ - @deprecated("Use SemanticAttributes.NetAppProtocolName instead", "") + @deprecated( + "Use SemanticAttributes.NetAppProtocolName instead", + "Semantic Conventions 1.17.0" + ) val MessagingProtocol = string("messaging.protocol") /** The version of the transport protocol. @@ -2386,7 +2419,10 @@ object SemanticAttributes { * This item has been removed as of 1.17.0 of the semantic conventions. Use * [[SemanticAttributes.NetAppProtocolVersion]] instead. */ - @deprecated("Use SemanticAttributes.NetAppProtocolVersion instead", "") + @deprecated( + "Use SemanticAttributes.NetAppProtocolVersion instead", + "Semantic Conventions 1.17.0" + ) val MessagingProtocolVersion = string("messaging.protocol_version") /** Connection string. @@ -2394,7 +2430,7 @@ object SemanticAttributes { * This item has been removed as of 1.17.0 of the semantic conventions. * There is no replacement. */ - @deprecated("There is no replacement", "") + @deprecated("There is no replacement", "Semantic Conventions 1.17.0") val MessagingUrl = string("messaging.url") /** The conversation ID identifying the @@ -2406,7 +2442,7 @@ object SemanticAttributes { */ @deprecated( "Use SemanticAttributes.MessagingMessageConversationId instead", - "" + "Semantic Conventions 1.17.0" ) val MessagingConversationId = string("messaging.conversation_id") @@ -2417,7 +2453,7 @@ object SemanticAttributes { */ @deprecated( "Use SemanticAttributes.MessagingRabbitmqDestinationRoutingKey instead", - "" + "Semantic Conventions 1.17.0" ) val MessagingRabbitmqRoutingKey = string("messaging.rabbitmq.routing_key") @@ -2428,7 +2464,7 @@ object SemanticAttributes { */ @deprecated( "Use SemanticAttributes.MessagingKafkaSourcePartition instead", - "" + "Semantic Conventions 1.17.0" ) val MessagingKafkaPartition = long("messaging.kafka.partition") @@ -2439,7 +2475,7 @@ object SemanticAttributes { */ @deprecated( "Use SemanticAttributes.MessagingKafkaMessageTombstone instead", - "" + "Semantic Conventions 1.17.0" ) val MessagingKafkaTombstone = boolean("messaging.kafka.tombstone") @@ -2452,7 +2488,7 @@ object SemanticAttributes { */ @deprecated( "Use SemanticAttributes.MessagingRocketmqMessageDeliveryTimestamp instead", - "" + "Semantic Conventions 1.17.0" ) val MessagingRocketmqDeliveryTimestamp = long( "messaging.rocketmq.delivery_timestamp" @@ -2466,7 +2502,7 @@ object SemanticAttributes { */ @deprecated( "Use SemanticAttributes.MessagingRocketmqMessageDelayTimeLevel instead", - "" + "Semantic Conventions 1.17.0" ) val MessagingRocketmqDelayTimeLevel = long( "messaging.rocketmq.delay_time_level" @@ -2497,7 +2533,10 @@ object SemanticAttributes { * This item has been renamed in 1.19.0 version of the semantic * conventions. Use [[SemanticAttributes.FaasInvocationId]] instead. */ - @deprecated("Use SemanticAttributes.FaasInvocationId instead", "") + @deprecated( + "Use SemanticAttributes.FaasInvocationId instead", + "Semantic Conventions 1.19.0" + ) val FaasExecution = string("faas.execution") /** Value of the Notes: + * + * + * @deprecated + * This item has been removed as of 1.20.0 of the semantic conventions. Use + * [[SemanticAttributes.NetProtocolVersion]] instead. + */ + @deprecated( + "Use SemanticAttributes.NetProtocolVersion instead", + "Semantic Conventions 1.20.0" + ) + val NetAppProtocolVersion = string("net.app.protocol.version") + + /** The kind of message destination. + * @deprecated + * This item has been removed as of 1.20.0 of the semantic conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.20.0") + val MessagingDestinationKind = string("messaging.destination.kind") + + /** Enum values for [[SemanticAttributes.MessagingDestinationKind]]. + * @deprecated + * This item has been removed as of 1.20.0 of the semantic conventions. + */ + @deprecated("There is not replacement", "Semantic Conventions 1.20.0") + abstract class MessagingDestinationKindValue(val value: String) + object MessagingDestinationKindValue { + + /** A message sent to a queue. */ + case object Queue extends MessagingDestinationKindValue("queue") + + /** A message sent to a topic. */ + case object Topic extends MessagingDestinationKindValue("topic") + } + + /** The kind of message source. + * @deprecated + * This item has been removed as of 1.20.0 of the semantic conventions. + */ + @deprecated("There is not replacement", "Semantic Conventions 1.20.0") + val MessagingSourceKind = string("messaging.source.kind") + + /** Values for [[SemanticAttributes.MessagingSourceKind]]. + * @deprecated + * This item has been removed as of 1.20.0 of the semantic conventions. + */ + @deprecated("There is not replacement", "Semantic Conventions 1.20.0") + abstract class MessagingSourceKindValue(val value: String) + object MessagingSourceKindValue { + + /** A message received from a queue. */ + case object Queue extends MessagingSourceKindValue("queue") + + /** A message received from a topic. */ + case object Topic extends MessagingSourceKindValue("topic") + } + + /** The internet connection type currently being used by the host. + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. Use [[SemanticAttributes.NetworkConnectionType]] instead. + */ + @deprecated( + "Use SemanticAttributes.NetworkConnectionType instead", + "Semantic Conventions 1.21.0" + ) + val NetHostConnectionType = string("net.host.connection.type") + + /** This describes more details regarding the connection.type. It may be the + * type of cell technology connection, but it could be used for describing + * details about a wifi connection. + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. Use [[SemanticAttributes.NetworkConnectionSubtype]] + * instead. + */ + @deprecated( + "Use SemanticAttributes.NetworkConnectionSubtype instead", + "Semantic Conventions 1.21.0" + ) + val NetHostConnectionSubtype = string("net.host.connection.subtype") + + /** The name of the mobile carrier. + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. Use [[SemanticAttributes.NetworkCarrierName]] instead. + */ + @deprecated( + "Use SemanticAttributes.NetworkCarrierName instead", + "Semantic Conventions 1.21.0" + ) + val NetHostCarrierName = string("net.host.carrier.name") + + /** The mobile carrier country code. + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. Use [[SemanticAttributes.NetworkCarrierMcc]] instead. + */ + @deprecated( + "Use SemanticAttributes.NetworkCarrierMcc instead", + "Semantic Conventions 1.21.0" + ) + val NetHostCarrierMcc = string("net.host.carrier.mcc") + + /** The mobile carrier network code. + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. Use [[SemanticAttributes.NetworkCarrierMnc]] instead. + */ + @deprecated( + "Use SemanticAttributes.NetworkCarrierMnc instead", + "Semantic Conventions 1.21.0" + ) + val NetHostCarrierMnc = string("net.host.carrier.mnc") + + /** The ISO 3166-1 alpha-2 2-character country code associated with the mobile + * carrier network. + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. Use [[SemanticAttributes.NetworkCarrierIcc]] instead. + */ + @deprecated( + "Use SemanticAttributes.NetworkCarrierIcc instead", + "Semantic Conventions 1.21.0" + ) + val NetHostCarrierIcc = string("net.host.carrier.icc") + + /** The IP address of the original client behind all proxies, if known (e.g. + * from X-Forwarded-For). + * + *

Notes: + * + *

+ * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. Use [[SemanticAttributes.ClientAddress]] instead. + */ + @deprecated( + "Use SemanticAttributes.ClientAddress instead", + "Semantic Conventions 1.21.0" + ) + val HttpClientIp = string("http.client_ip") + + /** The message source name. + * + *

Notes: + * + *

+ * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.21.0") + val MessagingSourceName = string("messaging.source.name") + + /** Low cardinality representation of the messaging source name. + * + *

Notes: + * + *

+ * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.21.0") + val MessagingSourceTemplate = string("messaging.source.template") + + /** A boolean that is true if the message source is temporary and might not + * exist anymore after messages are processed. + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.21.0") + val MessagingSourceTemporary = boolean("messaging.source.temporary") + + /** A boolean that is true if the message source is anonymous (could be + * unnamed or have auto-generated name). + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.21.0") + val MessagingSourceAnonymous = boolean("messaging.source.anonymous") + + /** The identifier for the consumer receiving a message. For Kafka, set it to + * `{messaging.kafka.consumer.group} - {messaging.kafka.client_id}`, if both + * are present, or only `messaging.kafka.consumer.group`. For brokers, such + * as RabbitMQ and Artemis, set it to the `client_id` of the client consuming + * the message. + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. See [[SemanticAttributes.MessagingClientId]]. + */ + @deprecated( + "Use SemanticAttributes.MessagingClientId instead", + "Semantic Conventions 1.21.0" + ) + val MessagingConsumerId = string("messaging.consumer.id") + + /** Client Id for the Consumer or Producer that is handling the message. + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. See [[SemanticAttributes.MessagingClientId]]. + */ + @deprecated( + "Use SemanticAttributes.MessagingClientId instead", + "Semantic Conventions 1.21.0" + ) + val MessagingKafkaClientId = string("messaging.kafka.client_id") + + /** Partition the message is received from. + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. + */ + @deprecated("There is no replacement", "Semantic Conventions 1.21.0") + val MessagingKafkaSourcePartition = long("messaging.kafka.source.partition") + + /** The unique identifier for each client. + * @deprecated + * This item has been removed in 1.21.0 version of the semantic + * conventions. See [[SemanticAttributes.MessagingClientId]]. + */ + @deprecated( + "Use SemanticAttributes.MessagingClientId instead", + "Semantic Conventions 1.21.0" + ) + val MessagingRocketmqClientId = string("messaging.rocketmq.client_id") + + /** Values for [[SemanticAttributes.NetHostConnectionType]]. + * @deprecated + * This item has been removed as of 1.21.0 of the semantic conventions. Use + * [[SemanticAttributes.NetworkConnectionTypeValue]] instead. + */ + @deprecated( + "Use SemanticAttributes.NetworkConnectionTypeValue", + "Semantic Conventions 1.21.0" + ) + abstract class NetHostConnectionTypeValue(val value: String) + object NetHostConnectionTypeValue { + + /** wifi. */ + case object Wifi extends NetHostConnectionTypeValue("wifi") + + /** wired. */ + case object Wired extends NetHostConnectionTypeValue("wired") + + /** cell. */ + case object Cell extends NetHostConnectionTypeValue("cell") + + /** unavailable. */ + case object Unavailable extends NetHostConnectionTypeValue("unavailable") + + /** unknown. */ + case object Unknown extends NetHostConnectionTypeValue("unknown") + } + + /** Values for [[SemanticAttributes.NetHostConnectionSubtype]]. + * @deprecated + * This item has been removed as of 1.21.0 of the semantic conventions. Use + * [[SemanticAttributes.NetworkConnectionSubtypeValue]] instead. + */ + @deprecated( + "Use SemanticAttributes.NetworkConnectionSubtypeValue", + "Semantic Conventions 1.21.0" + ) + abstract class NetHostConnectionSubtypeValue(val value: String) + object NetHostConnectionSubtypeValue { + + /** GPRS. */ + case object Gprs extends NetHostConnectionSubtypeValue("gprs") + + /** EDGE. */ + case object Edge extends NetHostConnectionSubtypeValue("edge") + + /** UMTS. */ + case object Umts extends NetHostConnectionSubtypeValue("umts") + + /** CDMA. */ + case object Cdma extends NetHostConnectionSubtypeValue("cdma") + + /** EVDO Rel. 0. */ + case object Evdo0 extends NetHostConnectionSubtypeValue("evdo_0") + + /** EVDO Rev. A. */ + case object EvdoA extends NetHostConnectionSubtypeValue("evdo_a") + + /** CDMA2000 1XRTT. */ + case object Cdma20001xrtt + extends NetHostConnectionSubtypeValue("cdma2000_1xrtt") + + /** HSDPA. */ + case object Hsdpa extends NetHostConnectionSubtypeValue("hsdpa") + + /** HSUPA. */ + case object Hsupa extends NetHostConnectionSubtypeValue("hsupa") + + /** HSPA. */ + case object Hspa extends NetHostConnectionSubtypeValue("hspa") + + /** IDEN. */ + case object Iden extends NetHostConnectionSubtypeValue("iden") + + /** EVDO Rev. B. */ + case object EvdoB extends NetHostConnectionSubtypeValue("evdo_b") + + /** LTE. */ + case object Lte extends NetHostConnectionSubtypeValue("lte") + + /** EHRPD. */ + case object Ehrpd extends NetHostConnectionSubtypeValue("ehrpd") + + /** HSPAP. */ + case object Hspap extends NetHostConnectionSubtypeValue("hspap") + + /** GSM. */ + case object Gsm extends NetHostConnectionSubtypeValue("gsm") + + /** TD-SCDMA. */ + case object TdScdma extends NetHostConnectionSubtypeValue("td_scdma") + + /** IWLAN. */ + case object Iwlan extends NetHostConnectionSubtypeValue("iwlan") + + /** 5G NR (New Radio). */ + case object Nr extends NetHostConnectionSubtypeValue("nr") + + /** 5G NRNSA (New Radio Non-Standalone). */ + case object Nrnsa extends NetHostConnectionSubtypeValue("nrnsa") + + /** LTE CA. */ + case object LteCa extends NetHostConnectionSubtypeValue("lte_ca") + } + }