From fe50d9513af182f90849fdcbf4aa62b2ee149b43 Mon Sep 17 00:00:00 2001
From: Liudmila Molkova <limolkova@microsoft.com>
Date: Fri, 26 Jul 2024 17:48:48 -0700
Subject: [PATCH] up

---
 .../semconv/_incubating/attributes/aws_attributes.py            | 2 --
 .../semconv/_incubating/attributes/cloud_attributes.py          | 2 --
 .../semconv/_incubating/attributes/container_attributes.py      | 2 --
 .../semconv/_incubating/attributes/db_attributes.py             | 2 --
 .../semconv/_incubating/attributes/disk_attributes.py           | 2 --
 .../semconv/_incubating/attributes/faas_attributes.py           | 2 --
 .../semconv/_incubating/attributes/gen_ai_attributes.py         | 2 --
 .../semconv/_incubating/attributes/graphql_attributes.py        | 2 --
 .../semconv/_incubating/attributes/host_attributes.py           | 2 --
 .../semconv/_incubating/attributes/log_attributes.py            | 2 --
 .../semconv/_incubating/attributes/messaging_attributes.py      | 2 --
 .../semconv/_incubating/attributes/opentracing_attributes.py    | 2 --
 .../semconv/_incubating/attributes/os_attributes.py             | 2 --
 .../semconv/_incubating/attributes/process_attributes.py        | 2 --
 .../semconv/_incubating/attributes/rpc_attributes.py            | 2 --
 .../semconv/_incubating/attributes/tls_attributes.py            | 2 --
 .../src/opentelemetry/semconv/attributes/error_attributes.py    | 2 --
 .../src/opentelemetry/semconv/attributes/http_attributes.py     | 2 --
 .../src/opentelemetry/semconv/attributes/network_attributes.py  | 2 --
 .../src/opentelemetry/semconv/attributes/otel_attributes.py     | 2 --
 .../opentelemetry/semconv/attributes/telemetry_attributes.py    | 2 --
 scripts/semconv/templates/registry/common.j2                    | 2 +-
 22 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/aws_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/aws_attributes.py
index 2ef57fdd173..a208e56a601 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/aws_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/aws_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS: Final = (
     "aws.dynamodb.attribute_definitions"
 )
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/cloud_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/cloud_attributes.py
index f0b07059112..507aac0aea7 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/cloud_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/cloud_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 CLOUD_ACCOUNT_ID: Final = "cloud.account.id"
 """
 The cloud account ID the resource is assigned to.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/container_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/container_attributes.py
index 3eaa1e2f195..c83847ed034 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/container_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/container_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 CONTAINER_COMMAND: Final = "container.command"
 """
 The command used to run the container (i.e. the command name).
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/db_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/db_attributes.py
index bc0355bee75..7263e7b9e66 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/db_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/db_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 DB_CASSANDRA_CONSISTENCY_LEVEL: Final = "db.cassandra.consistency_level"
 """
 The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html).
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/disk_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/disk_attributes.py
index bdb5ec1c60c..e100f1af928 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/disk_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/disk_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 DISK_IO_DIRECTION: Final = "disk.io.direction"
 """
 The disk IO operation direction.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/faas_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/faas_attributes.py
index 08e6344ae39..473b6542732 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/faas_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/faas_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 FAAS_COLDSTART: Final = "faas.coldstart"
 """
 A boolean that is true if the serverless function is executed for the first time (aka cold-start).
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/gen_ai_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/gen_ai_attributes.py
index fd7f222bbb4..cbdae684d6d 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/gen_ai_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/gen_ai_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 GEN_AI_COMPLETION: Final = "gen_ai.completion"
 """
 The full response received from the LLM.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/graphql_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/graphql_attributes.py
index a303e32978f..c467771710f 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/graphql_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/graphql_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 GRAPHQL_DOCUMENT: Final = "graphql.document"
 """
 The GraphQL document being executed.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/host_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/host_attributes.py
index aef72680d09..72847e6571a 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/host_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/host_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 HOST_ARCH: Final = "host.arch"
 """
 The CPU architecture the host system is running on.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/log_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/log_attributes.py
index fa80871d360..ae713923b48 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/log_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/log_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 LOG_FILE_NAME: Final = "log.file.name"
 """
 The basename of the file.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/messaging_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/messaging_attributes.py
index 90718e66dc1..df8386bfa9c 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/messaging_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/messaging_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 MESSAGING_BATCH_MESSAGE_COUNT: Final = "messaging.batch.message_count"
 """
 The number of messages sent, received, or processed in the scope of the batching operation.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/opentracing_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/opentracing_attributes.py
index f2b5e054ca5..0c1ae08807d 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/opentracing_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/opentracing_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 OPENTRACING_REF_TYPE: Final = "opentracing.ref_type"
 """
 Parent-child Reference type.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/os_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/os_attributes.py
index ef808ba0ba0..0e899fe2123 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/os_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/os_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 OS_BUILD_ID: Final = "os.build_id"
 """
 Unique identifier for a particular build or compilation of the operating system.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/process_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/process_attributes.py
index a440ec1f006..2f99608c472 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/process_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/process_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 PROCESS_COMMAND: Final = "process.command"
 """
 The command used to launch the process (i.e. the command name). On Linux based systems, can be set to the zeroth string in `proc/[pid]/cmdline`. On Windows, can be set to the first parameter extracted from `GetCommandLineW`.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/rpc_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/rpc_attributes.py
index 109bbeee405..737ea7913f7 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/rpc_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/rpc_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 RPC_CONNECT_RPC_ERROR_CODE: Final = "rpc.connect_rpc.error_code"
 """
 The [error codes](https://connect.build/docs/protocol/#error-codes) of the Connect request. Error codes are always string values.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/tls_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/tls_attributes.py
index 0d73b099307..c182fb52286 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/tls_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/tls_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 TLS_CIPHER: Final = "tls.cipher"
 """
 String indicating the [cipher](https://datatracker.ietf.org/doc/html/rfc5246#appendix-A.5) used during the current connection.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/error_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/error_attributes.py
index 625d58a10e4..6d667c8db90 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/error_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/error_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 ERROR_TYPE: Final = "error.type"
 """
 Describes a class of error the operation ended with.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/http_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/http_attributes.py
index 2ed05f20198..bec7c0c750a 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/http_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/http_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 HTTP_REQUEST_HEADER_TEMPLATE: Final = "http.request.header"
 """
 HTTP request headers, `<key>` being the normalized HTTP Header name (lowercase), the value being the header values.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/network_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/network_attributes.py
index dc79595875f..0181958a7c5 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/network_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/network_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 NETWORK_LOCAL_ADDRESS: Final = "network.local.address"
 """
 Local address of the network connection - IP address or Unix domain socket name.
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/otel_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/otel_attributes.py
index 23148d262a6..134e246e042 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/otel_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/otel_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 OTEL_SCOPE_NAME: Final = "otel.scope.name"
 """
 The name of the instrumentation scope - (`InstrumentationScope.Name` in OTLP).
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/telemetry_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/telemetry_attributes.py
index cf9faa4b75a..29aadeb72ba 100644
--- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/telemetry_attributes.py
+++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/telemetry_attributes.py
@@ -15,8 +15,6 @@
 from enum import Enum
 from typing import Final
 
-from deprecated import deprecated
-
 TELEMETRY_SDK_LANGUAGE: Final = "telemetry.sdk.language"
 """
 The language of the telemetry SDK.
diff --git a/scripts/semconv/templates/registry/common.j2 b/scripts/semconv/templates/registry/common.j2
index c6222f3c518..f09f5e80c3d 100644
--- a/scripts/semconv/templates/registry/common.j2
+++ b/scripts/semconv/templates/registry/common.j2
@@ -36,7 +36,7 @@
 {%- endmacro %}
 
 {%- macro import_deprecated(semconv) -%}
-    {%- if (semconv | rejectattr("deprecated", "none") | list | count > 0) or (ctx.filter == "any" and semconv | selectattr("stability", "equalto", "stable") | list | count > 0) -%}
+    {%- if (semconv | selectattr("deprecated", "defined") | rejectattr("deprecated", "none") | list | count > 0) or (ctx.filter == "any" and semconv | selectattr("stability", "equalto", "stable") | list | count > 0) -%}
 from deprecated import deprecated
     {%- endif -%}
 {%- endmacro-%}