diff --git a/.clang-format b/.clang-format
index 2640295e65..1b5d0d488f 100644
--- a/.clang-format
+++ b/.clang-format
@@ -59,3 +59,15 @@ IndentPPDirectives: AfterHash
 
 # Include blocks style
 IncludeBlocks: Preserve
+
+AttributeMacros:
+  - OPENTELEMETRY_UNLIKELY
+  - OPENTELEMETRY_LIKELY
+  - OPENTELEMETRY_MAYBE_UNUSED
+  - OPENTELEMETRY_DEPRECATED
+  - OPENTELEMETRY_API_SINGLETON
+  - OPENTELEMETRY_LOCAL_SYMBOL
+  - OPENTELEMETRY_EXPORT
+  - OPENTELEMETRY_SANITIZER_NO_MEMORY
+  - OPENTELEMETRY_SANITIZER_NO_THREAD
+  - OPENTELEMETRY_SANITIZER_NO_ADDRESS
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80e5b81a14..dc0a3af9db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -603,6 +603,7 @@ if(OTELCPP_MAINTAINER_MODE)
     add_compile_options(/wd4127)
     add_compile_options(/wd4512)
     add_compile_options(/wd4267)
+    add_compile_options(/wd4996)
 
     # Enforced warnings
     add_compile_options(/we4265) # 'class': class has virtual functions, but
diff --git a/api/include/opentelemetry/logs/event_logger.h b/api/include/opentelemetry/logs/event_logger.h
index d3049953bc..bcc1035625 100644
--- a/api/include/opentelemetry/logs/event_logger.h
+++ b/api/include/opentelemetry/logs/event_logger.h
@@ -14,10 +14,11 @@
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace logs
 {
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 /**
  * Handles event log record creation.
  **/
-class EventLogger
+class OPENTELEMETRY_DEPRECATED EventLogger
 {
 public:
   virtual ~EventLogger() = default;
@@ -76,5 +77,6 @@ class EventLogger
   void IgnoreTraitResult(ValueType &&...)
   {}
 };
+#endif
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE
diff --git a/api/include/opentelemetry/logs/event_logger_provider.h b/api/include/opentelemetry/logs/event_logger_provider.h
index 8fba83c759..9eea0ca23b 100644
--- a/api/include/opentelemetry/logs/event_logger_provider.h
+++ b/api/include/opentelemetry/logs/event_logger_provider.h
@@ -14,10 +14,11 @@ namespace logs
 class EventLogger;
 class Logger;
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 /**
  * Creates new EventLogger instances.
  */
-class EventLoggerProvider
+class OPENTELEMETRY_DEPRECATED EventLoggerProvider
 {
 public:
   virtual ~EventLoggerProvider() = default;
@@ -31,5 +32,6 @@ class EventLoggerProvider
       nostd::shared_ptr<Logger> delegate_logger,
       nostd::string_view event_domain) noexcept = 0;
 };
+#endif
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE
diff --git a/api/include/opentelemetry/logs/noop.h b/api/include/opentelemetry/logs/noop.h
index 9876f40bfd..24312f061c 100644
--- a/api/include/opentelemetry/logs/noop.h
+++ b/api/include/opentelemetry/logs/noop.h
@@ -90,6 +90,7 @@ class NoopLoggerProvider final : public LoggerProvider
   nostd::shared_ptr<Logger> logger_;
 };
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 class NoopEventLogger final : public EventLogger
 {
 public:
@@ -124,6 +125,7 @@ class NoopEventLoggerProvider final : public EventLoggerProvider
 private:
   nostd::shared_ptr<EventLogger> event_logger_;
 };
+#endif
 
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE
diff --git a/api/include/opentelemetry/logs/provider.h b/api/include/opentelemetry/logs/provider.h
index 1d8a1901d8..0c1b4deea8 100644
--- a/api/include/opentelemetry/logs/provider.h
+++ b/api/include/opentelemetry/logs/provider.h
@@ -15,7 +15,9 @@ OPENTELEMETRY_BEGIN_NAMESPACE
 namespace logs
 {
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 class EventLoggerProvider;
+#endif
 class LoggerProvider;
 
 /**
@@ -45,13 +47,15 @@ class OPENTELEMETRY_EXPORT Provider
     GetProvider() = tp;
   }
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
   /**
    * Returns the singleton EventLoggerProvider.
    *
    * By default, a no-op EventLoggerProvider is returned. This will never return a
    * nullptr EventLoggerProvider.
    */
-  static nostd::shared_ptr<EventLoggerProvider> GetEventLoggerProvider() noexcept
+  OPENTELEMETRY_DEPRECATED static nostd::shared_ptr<EventLoggerProvider>
+  GetEventLoggerProvider() noexcept
   {
     std::lock_guard<common::SpinLockMutex> guard(GetLock());
     return nostd::shared_ptr<EventLoggerProvider>(GetEventProvider());
@@ -60,11 +64,13 @@ class OPENTELEMETRY_EXPORT Provider
   /**
    * Changes the singleton EventLoggerProvider.
    */
-  static void SetEventLoggerProvider(const nostd::shared_ptr<EventLoggerProvider> &tp) noexcept
+  OPENTELEMETRY_DEPRECATED static void SetEventLoggerProvider(
+      const nostd::shared_ptr<EventLoggerProvider> &tp) noexcept
   {
     std::lock_guard<common::SpinLockMutex> guard(GetLock());
     GetEventProvider() = tp;
   }
+#endif
 
 private:
   OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<LoggerProvider> &GetProvider() noexcept
@@ -73,12 +79,15 @@ class OPENTELEMETRY_EXPORT Provider
     return provider;
   }
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
+  OPENTELEMETRY_DEPRECATED
   OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<EventLoggerProvider> &
   GetEventProvider() noexcept
   {
     static nostd::shared_ptr<EventLoggerProvider> provider(new NoopEventLoggerProvider);
     return provider;
   }
+#endif
 
   OPENTELEMETRY_API_SINGLETON static common::SpinLockMutex &GetLock() noexcept
   {
diff --git a/api/include/opentelemetry/semconv/exception_attributes.h b/api/include/opentelemetry/semconv/exception_attributes.h
index 1ad6988833..980e4525f9 100644
--- a/api/include/opentelemetry/semconv/exception_attributes.h
+++ b/api/include/opentelemetry/semconv/exception_attributes.h
@@ -26,8 +26,7 @@ namespace exception
  * It's no longer recommended to record exceptions that are handled and do not escape the scope of a
  * span.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kExceptionEscaped = "exception.escaped";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kExceptionEscaped = "exception.escaped";
 
 /**
  * The exception message.
diff --git a/api/include/opentelemetry/semconv/incubating/code_attributes.h b/api/include/opentelemetry/semconv/incubating/code_attributes.h
index de30e49dfc..100b81b8a1 100644
--- a/api/include/opentelemetry/semconv/incubating/code_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/code_attributes.h
@@ -25,8 +25,7 @@ namespace code
  * @deprecated
  * Replaced by @code code.column.number @endcode
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kCodeColumn = "code.column";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeColumn = "code.column";
 
 /**
  * The column number in @code code.file.path @endcode best representing the operation. It SHOULD
@@ -51,8 +50,7 @@ static constexpr const char *kCodeFilepath = "code.filepath";
  * @deprecated
  * Replaced by @code code.function.name @endcode
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kCodeFunction = "code.function";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeFunction = "code.function";
 
 /**
  * The method or function name, or equivalent (usually rightmost part of the code unit's name).
@@ -71,8 +69,7 @@ static constexpr const char *kCodeLineNumber = "code.line.number";
  * @deprecated
  * Replaced by @code code.line.number @endcode
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kCodeLineno = "code.lineno";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeLineno = "code.lineno";
 
 /**
  * The "namespace" within which @code code.function.name @endcode is defined. Usually the qualified
diff --git a/api/include/opentelemetry/semconv/incubating/container_attributes.h b/api/include/opentelemetry/semconv/incubating/container_attributes.h
index 2ea7810b30..ecb8c7cd2c 100644
--- a/api/include/opentelemetry/semconv/incubating/container_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/container_attributes.h
@@ -43,8 +43,7 @@ static constexpr const char *kContainerCommandLine = "container.command_line";
  * @deprecated
  * Replaced by @code cpu.mode @endcode
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kContainerCpuState = "container.cpu.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerCpuState = "container.cpu.state";
 
 /**
  * The name of the CSI (<a href="https://github.com/container-storage-interface/spec">Container
@@ -118,8 +117,7 @@ static constexpr const char *kContainerLabel = "container.label";
  * @deprecated
  * Replaced by @code container.label @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kContainerLabels = "container.labels";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerLabels = "container.labels";
 
 /**
  * Container name used by container runtime.
diff --git a/api/include/opentelemetry/semconv/incubating/db_attributes.h b/api/include/opentelemetry/semconv/incubating/db_attributes.h
index b85e508940..719d53900a 100644
--- a/api/include/opentelemetry/semconv/incubating/db_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/db_attributes.h
@@ -25,8 +25,8 @@ namespace db
  * @deprecated
  * Replaced by @code cassandra.consistency.level @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCassandraConsistencyLevel = "db.cassandra.consistency_level";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraConsistencyLevel =
+    "db.cassandra.consistency_level";
 
 /**
  * Deprecated, use @code cassandra.coordinator.dc @endcode instead.
@@ -34,8 +34,8 @@ static constexpr const char *kDbCassandraConsistencyLevel = "db.cassandra.consis
  * @deprecated
  * Replaced by @code cassandra.coordinator.dc @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCassandraCoordinatorDc = "db.cassandra.coordinator.dc";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraCoordinatorDc =
+    "db.cassandra.coordinator.dc";
 
 /**
  * Deprecated, use @code cassandra.coordinator.id @endcode instead.
@@ -43,8 +43,8 @@ static constexpr const char *kDbCassandraCoordinatorDc = "db.cassandra.coordinat
  * @deprecated
  * Replaced by @code cassandra.coordinator.id @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCassandraCoordinatorId = "db.cassandra.coordinator.id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraCoordinatorId =
+    "db.cassandra.coordinator.id";
 
 /**
  * Deprecated, use @code cassandra.query.idempotent @endcode instead.
@@ -52,8 +52,8 @@ static constexpr const char *kDbCassandraCoordinatorId = "db.cassandra.coordinat
  * @deprecated
  * Replaced by @code cassandra.query.idempotent @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCassandraIdempotence = "db.cassandra.idempotence";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraIdempotence =
+    "db.cassandra.idempotence";
 
 /**
  * Deprecated, use @code cassandra.page.size @endcode instead.
@@ -61,8 +61,8 @@ static constexpr const char *kDbCassandraIdempotence = "db.cassandra.idempotence
  * @deprecated
  * Replaced by @code cassandra.page.size @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCassandraPageSize = "db.cassandra.page_size";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraPageSize =
+    "db.cassandra.page_size";
 
 /**
  * Deprecated, use @code cassandra.speculative_execution.count @endcode instead.
@@ -70,8 +70,7 @@ static constexpr const char *kDbCassandraPageSize = "db.cassandra.page_size";
  * @deprecated
  * Replaced by @code cassandra.speculative_execution.count @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCassandraSpeculativeExecutionCount =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraSpeculativeExecutionCount =
     "db.cassandra.speculative_execution_count";
 
 /**
@@ -80,8 +79,7 @@ static constexpr const char *kDbCassandraSpeculativeExecutionCount =
  * @deprecated
  * Replaced by @code db.collection.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCassandraTable = "db.cassandra.table";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraTable = "db.cassandra.table";
 
 /**
  * The name of the connection pool; unique within the instrumented application. In case the
@@ -104,8 +102,8 @@ static constexpr const char *kDbClientConnectionState = "db.client.connection.st
  * @deprecated
  * Replaced by @code db.client.connection.pool.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbClientConnectionsPoolName = "db.client.connections.pool.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsPoolName =
+    "db.client.connections.pool.name";
 
 /**
  * Deprecated, use @code db.client.connection.state @endcode instead.
@@ -113,8 +111,8 @@ static constexpr const char *kDbClientConnectionsPoolName = "db.client.connectio
  * @deprecated
  * Replaced by @code db.client.connection.state @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbClientConnectionsState = "db.client.connections.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsState =
+    "db.client.connections.state";
 
 /**
  * The name of a collection (table, container) within the database.
@@ -134,8 +132,7 @@ static constexpr const char *kDbCollectionName = "db.collection.name";
  * @deprecated
  * Replaced by @code server.address @endcode and @code server.port @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbConnectionString = "db.connection_string";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbConnectionString = "db.connection_string";
 
 /**
  * Deprecated, use @code azure.client.id @endcode instead.
@@ -143,8 +140,7 @@ static constexpr const char *kDbConnectionString = "db.connection_string";
  * @deprecated
  * Replaced by @code azure.client.id @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbClientId = "db.cosmosdb.client_id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbClientId = "db.cosmosdb.client_id";
 
 /**
  * Deprecated, use @code azure.cosmosdb.connection.mode @endcode instead.
@@ -152,8 +148,8 @@ static constexpr const char *kDbCosmosdbClientId = "db.cosmosdb.client_id";
  * @deprecated
  * Replaced by @code azure.cosmosdb.connection.mode @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbConnectionMode = "db.cosmosdb.connection_mode";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbConnectionMode =
+    "db.cosmosdb.connection_mode";
 
 /**
  * Deprecated, use @code cosmosdb.consistency.level @endcode instead.
@@ -161,8 +157,8 @@ static constexpr const char *kDbCosmosdbConnectionMode = "db.cosmosdb.connection
  * @deprecated
  * Replaced by @code azure.cosmosdb.consistency.level @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbConsistencyLevel = "db.cosmosdb.consistency_level";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbConsistencyLevel =
+    "db.cosmosdb.consistency_level";
 
 /**
  * Deprecated, use @code db.collection.name @endcode instead.
@@ -170,8 +166,8 @@ static constexpr const char *kDbCosmosdbConsistencyLevel = "db.cosmosdb.consiste
  * @deprecated
  * Replaced by @code db.collection.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbContainer = "db.cosmosdb.container";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbContainer =
+    "db.cosmosdb.container";
 
 /**
  * Deprecated, no replacement at this time.
@@ -179,8 +175,8 @@ static constexpr const char *kDbCosmosdbContainer = "db.cosmosdb.container";
  * @deprecated
  * No replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbOperationType = "db.cosmosdb.operation_type";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbOperationType =
+    "db.cosmosdb.operation_type";
 
 /**
  * Deprecated, use @code azure.cosmosdb.operation.contacted_regions @endcode instead.
@@ -188,8 +184,8 @@ static constexpr const char *kDbCosmosdbOperationType = "db.cosmosdb.operation_t
  * @deprecated
  * Replaced by @code azure.cosmosdb.operation.contacted_regions @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbRegionsContacted = "db.cosmosdb.regions_contacted";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbRegionsContacted =
+    "db.cosmosdb.regions_contacted";
 
 /**
  * Deprecated, use @code azure.cosmosdb.operation.request_charge @endcode instead.
@@ -197,8 +193,8 @@ static constexpr const char *kDbCosmosdbRegionsContacted = "db.cosmosdb.regions_
  * @deprecated
  * Replaced by @code azure.cosmosdb.operation.request_charge @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbRequestCharge = "db.cosmosdb.request_charge";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbRequestCharge =
+    "db.cosmosdb.request_charge";
 
 /**
  * Deprecated, use @code azure.cosmosdb.request.body.size @endcode instead.
@@ -206,8 +202,8 @@ static constexpr const char *kDbCosmosdbRequestCharge = "db.cosmosdb.request_cha
  * @deprecated
  * Replaced by @code azure.cosmosdb.request.body.size @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbRequestContentLength = "db.cosmosdb.request_content_length";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbRequestContentLength =
+    "db.cosmosdb.request_content_length";
 
 /**
  * Deprecated, use @code db.response.status_code @endcode instead.
@@ -215,8 +211,8 @@ static constexpr const char *kDbCosmosdbRequestContentLength = "db.cosmosdb.requ
  * @deprecated
  * Replaced by @code db.response.status_code @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbStatusCode = "db.cosmosdb.status_code";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbStatusCode =
+    "db.cosmosdb.status_code";
 
 /**
  * Deprecated, use @code azure.cosmosdb.response.sub_status_code @endcode instead.
@@ -224,8 +220,8 @@ static constexpr const char *kDbCosmosdbStatusCode = "db.cosmosdb.status_code";
  * @deprecated
  * Replaced by @code azure.cosmosdb.response.sub_status_code @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbSubStatusCode = "db.cosmosdb.sub_status_code";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbSubStatusCode =
+    "db.cosmosdb.sub_status_code";
 
 /**
  * Deprecated, use @code db.namespace @endcode instead.
@@ -233,8 +229,8 @@ static constexpr const char *kDbCosmosdbSubStatusCode = "db.cosmosdb.sub_status_
  * @deprecated
  * Replaced by @code db.namespace @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbElasticsearchClusterName = "db.elasticsearch.cluster.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchClusterName =
+    "db.elasticsearch.cluster.name";
 
 /**
  * Deprecated, use @code elasticsearch.node.name @endcode instead.
@@ -242,8 +238,8 @@ static constexpr const char *kDbElasticsearchClusterName = "db.elasticsearch.clu
  * @deprecated
  * Replaced by @code elasticsearch.node.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbElasticsearchNodeName = "db.elasticsearch.node.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchNodeName =
+    "db.elasticsearch.node.name";
 
 /**
  * Deprecated, use @code db.operation.parameter @endcode instead.
@@ -251,8 +247,8 @@ static constexpr const char *kDbElasticsearchNodeName = "db.elasticsearch.node.n
  * @deprecated
  * Replaced by @code db.operation.parameter @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbElasticsearchPathParts = "db.elasticsearch.path_parts";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchPathParts =
+    "db.elasticsearch.path_parts";
 
 /**
  * Deprecated, no general replacement at this time. For Elasticsearch, use @code
@@ -261,8 +257,7 @@ static constexpr const char *kDbElasticsearchPathParts = "db.elasticsearch.path_
  * Deprecated, no general replacement at this time. For Elasticsearch, use @code
  * db.elasticsearch.node.name @endcode instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbInstanceId = "db.instance.id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbInstanceId = "db.instance.id";
 
 /**
  * Removed, no replacement at this time.
@@ -270,8 +265,8 @@ static constexpr const char *kDbInstanceId = "db.instance.id";
  * @deprecated
  * Removed as not used.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbJdbcDriverClassname = "db.jdbc.driver_classname";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbJdbcDriverClassname =
+    "db.jdbc.driver_classname";
 
 /**
  * Deprecated, use @code db.collection.name @endcode instead.
@@ -279,8 +274,8 @@ static constexpr const char *kDbJdbcDriverClassname = "db.jdbc.driver_classname"
  * @deprecated
  * Replaced by @code db.collection.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbMongodbCollection = "db.mongodb.collection";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMongodbCollection =
+    "db.mongodb.collection";
 
 /**
  * Deprecated, SQL Server instance is now populated as a part of @code db.namespace @endcode
@@ -288,8 +283,8 @@ static constexpr const char *kDbMongodbCollection = "db.mongodb.collection";
  * @deprecated
  * Deprecated, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbMssqlInstanceName = "db.mssql.instance_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMssqlInstanceName =
+    "db.mssql.instance_name";
 
 /**
  * Deprecated, use @code db.namespace @endcode instead.
@@ -297,8 +292,7 @@ static constexpr const char *kDbMssqlInstanceName = "db.mssql.instance_name";
  * @deprecated
  * Replaced by @code db.namespace @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbName = "db.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbName = "db.name";
 
 /**
  * The name of the database, fully qualified within the server address and port.
@@ -319,8 +313,7 @@ static constexpr const char *kDbNamespace = "db.namespace";
  * @deprecated
  * Replaced by @code db.operation.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbOperation = "db.operation";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbOperation = "db.operation";
 
 /**
  * The number of queries included in a batch operation.
@@ -362,8 +355,7 @@ static constexpr const char *kDbOperationParameter = "db.operation.parameter";
  * @deprecated
  * Replaced by @code db.operation.parameter @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbQueryParameter = "db.query.parameter";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbQueryParameter = "db.query.parameter";
 
 /**
  * Low cardinality representation of a database query text.
@@ -399,8 +391,8 @@ static constexpr const char *kDbQueryText = "db.query.text";
  * @deprecated
  * Replaced by @code db.namespace @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbRedisDatabaseIndex = "db.redis.database_index";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbRedisDatabaseIndex =
+    "db.redis.database_index";
 
 /**
  * Number of rows returned by the operation.
@@ -423,8 +415,7 @@ static constexpr const char *kDbResponseStatusCode = "db.response.status_code";
  * @deprecated
  * Replaced by @code db.collection.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbSqlTable = "db.sql.table";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbSqlTable = "db.sql.table";
 
 /**
  * The database statement being executed.
@@ -432,8 +423,7 @@ static constexpr const char *kDbSqlTable = "db.sql.table";
  * @deprecated
  * Replaced by @code db.query.text @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbStatement = "db.statement";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbStatement = "db.statement";
 
 /**
  * Deprecated, use @code db.system.name @endcode instead.
@@ -441,8 +431,7 @@ static constexpr const char *kDbStatement = "db.statement";
  * @deprecated
  * Replaced by @code db.system.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbSystem = "db.system";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbSystem = "db.system";
 
 /**
  * The database management system (DBMS) product as identified by the client instrumentation.
@@ -459,8 +448,7 @@ static constexpr const char *kDbSystemName = "db.system.name";
  * @deprecated
  * No replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbUser = "db.user";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbUser = "db.user";
 
 namespace DbCassandraConsistencyLevelValues
 {
@@ -689,8 +677,7 @@ static constexpr const char *kAdabas = "adabas";
  * @deprecated
  * Replaced by @code intersystems_cache @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kCache = "cache";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kCache = "cache";
 
 /**
  * InterSystems Caché
@@ -713,8 +700,7 @@ static constexpr const char *kClickhouse = "clickhouse";
  * @deprecated
  * Replaced by @code other_sql @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kCloudscape = "cloudscape";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kCloudscape = "cloudscape";
 
 /**
  * CockroachDB
@@ -727,8 +713,7 @@ static constexpr const char *kCockroachdb = "cockroachdb";
  * @deprecated
  * Removed.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kColdfusion = "coldfusion";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kColdfusion = "coldfusion";
 
 /**
  * Microsoft Azure Cosmos DB
@@ -786,8 +771,7 @@ static constexpr const char *kFirebird = "firebird";
  * @deprecated
  * Replaced by @code other_sql @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kFirstsql = "firstsql";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kFirstsql = "firstsql";
 
 /**
  * Apache Geode
@@ -875,8 +859,7 @@ static constexpr const char *kMssql = "mssql";
  * @deprecated
  * Removed, use @code other_sql @endcode instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMssqlcompact = "mssqlcompact";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMssqlcompact = "mssqlcompact";
 
 /**
  * MySQL (This value has stability level RELEASE CANDIDATE)
diff --git a/api/include/opentelemetry/semconv/incubating/db_metrics.h b/api/include/opentelemetry/semconv/incubating/db_metrics.h
index 643b5cf403..d26662fcc7 100644
--- a/api/include/opentelemetry/semconv/incubating/db_metrics.h
+++ b/api/include/opentelemetry/semconv/incubating/db_metrics.h
@@ -359,18 +359,15 @@ CreateSyncDoubleMetricDbClientConnectionWaitTime(metrics::Meter *meter)
  * Replaced by @code db.client.connection.create_time @endcode. Note: the unit also changed from
  * @code ms @endcode to @code s @endcode. <p> histogram
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricDbClientConnectionsCreateTime =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsCreateTime =
     "db.client.connections.create_time";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricDbClientConnectionsCreateTime =
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsCreateTime =
     "Deprecated, use `db.client.connection.create_time` instead. Note: the unit also changed from "
     "`ms` to `s`.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricDbClientConnectionsCreateTime = "ms";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsCreateTime =
+    "ms";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricDbClientConnectionsCreateTime(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricDbClientConnectionsCreateTime,
@@ -378,8 +375,7 @@ CreateSyncInt64MetricDbClientConnectionsCreateTime(metrics::Meter *meter)
                                       unitMetricDbClientConnectionsCreateTime);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
 CreateSyncDoubleMetricDbClientConnectionsCreateTime(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricDbClientConnectionsCreateTime,
@@ -395,16 +391,14 @@ CreateSyncDoubleMetricDbClientConnectionsCreateTime(metrics::Meter *meter)
  * <p>
  * updowncounter
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricDbClientConnectionsIdleMax = "db.client.connections.idle.max";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricDbClientConnectionsIdleMax =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsIdleMax =
+    "db.client.connections.idle.max";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsIdleMax =
     "Deprecated, use `db.client.connection.idle.max` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricDbClientConnectionsIdleMax = "{connection}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsIdleMax =
+    "{connection}";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricDbClientConnectionsIdleMax(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsIdleMax,
@@ -412,8 +406,7 @@ CreateSyncInt64MetricDbClientConnectionsIdleMax(metrics::Meter *meter)
                                          unitMetricDbClientConnectionsIdleMax);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricDbClientConnectionsIdleMax(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsIdleMax,
@@ -421,8 +414,7 @@ CreateSyncDoubleMetricDbClientConnectionsIdleMax(metrics::Meter *meter)
                                           unitMetricDbClientConnectionsIdleMax);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricDbClientConnectionsIdleMax(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsIdleMax,
@@ -430,8 +422,7 @@ CreateAsyncInt64MetricDbClientConnectionsIdleMax(metrics::Meter *meter)
                                                    unitMetricDbClientConnectionsIdleMax);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricDbClientConnectionsIdleMax(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsIdleMax,
@@ -447,16 +438,14 @@ CreateAsyncDoubleMetricDbClientConnectionsIdleMax(metrics::Meter *meter)
  * <p>
  * updowncounter
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricDbClientConnectionsIdleMin = "db.client.connections.idle.min";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricDbClientConnectionsIdleMin =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsIdleMin =
+    "db.client.connections.idle.min";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsIdleMin =
     "Deprecated, use `db.client.connection.idle.min` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricDbClientConnectionsIdleMin = "{connection}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsIdleMin =
+    "{connection}";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricDbClientConnectionsIdleMin(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsIdleMin,
@@ -464,8 +453,7 @@ CreateSyncInt64MetricDbClientConnectionsIdleMin(metrics::Meter *meter)
                                          unitMetricDbClientConnectionsIdleMin);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricDbClientConnectionsIdleMin(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsIdleMin,
@@ -473,8 +461,7 @@ CreateSyncDoubleMetricDbClientConnectionsIdleMin(metrics::Meter *meter)
                                           unitMetricDbClientConnectionsIdleMin);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricDbClientConnectionsIdleMin(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsIdleMin,
@@ -482,8 +469,7 @@ CreateAsyncInt64MetricDbClientConnectionsIdleMin(metrics::Meter *meter)
                                                    unitMetricDbClientConnectionsIdleMin);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricDbClientConnectionsIdleMin(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsIdleMin,
@@ -499,16 +485,14 @@ CreateAsyncDoubleMetricDbClientConnectionsIdleMin(metrics::Meter *meter)
  * <p>
  * updowncounter
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricDbClientConnectionsMax = "db.client.connections.max";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricDbClientConnectionsMax =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsMax =
+    "db.client.connections.max";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsMax =
     "Deprecated, use `db.client.connection.max` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricDbClientConnectionsMax = "{connection}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsMax =
+    "{connection}";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricDbClientConnectionsMax(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsMax,
@@ -516,8 +500,7 @@ CreateSyncInt64MetricDbClientConnectionsMax(metrics::Meter *meter)
                                          unitMetricDbClientConnectionsMax);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricDbClientConnectionsMax(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsMax,
@@ -525,8 +508,7 @@ CreateSyncDoubleMetricDbClientConnectionsMax(metrics::Meter *meter)
                                           unitMetricDbClientConnectionsMax);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricDbClientConnectionsMax(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsMax,
@@ -534,8 +516,7 @@ CreateAsyncInt64MetricDbClientConnectionsMax(metrics::Meter *meter)
                                                    unitMetricDbClientConnectionsMax);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricDbClientConnectionsMax(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsMax,
@@ -551,17 +532,15 @@ CreateAsyncDoubleMetricDbClientConnectionsMax(metrics::Meter *meter)
  * <p>
  * updowncounter
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricDbClientConnectionsPendingRequests =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsPendingRequests =
     "db.client.connections.pending_requests";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricDbClientConnectionsPendingRequests =
-    "Deprecated, use `db.client.connection.pending_requests` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricDbClientConnectionsPendingRequests = "{request}";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *descrMetricDbClientConnectionsPendingRequests =
+        "Deprecated, use `db.client.connection.pending_requests` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsPendingRequests =
+    "{request}";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsPendingRequests,
@@ -569,8 +548,7 @@ CreateSyncInt64MetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
                                          unitMetricDbClientConnectionsPendingRequests);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsPendingRequests,
@@ -578,8 +556,7 @@ CreateSyncDoubleMetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
                                           unitMetricDbClientConnectionsPendingRequests);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsPendingRequests,
@@ -587,8 +564,7 @@ CreateAsyncInt64MetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
                                                    unitMetricDbClientConnectionsPendingRequests);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsPendingRequests,
@@ -604,16 +580,14 @@ CreateAsyncDoubleMetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
  * <p>
  * counter
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricDbClientConnectionsTimeouts = "db.client.connections.timeouts";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricDbClientConnectionsTimeouts =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsTimeouts =
+    "db.client.connections.timeouts";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsTimeouts =
     "Deprecated, use `db.client.connection.timeouts` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricDbClientConnectionsTimeouts = "{timeout}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsTimeouts =
+    "{timeout}";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
 CreateSyncInt64MetricDbClientConnectionsTimeouts(metrics::Meter *meter)
 {
   return meter->CreateUInt64Counter(kMetricDbClientConnectionsTimeouts,
@@ -621,8 +595,7 @@ CreateSyncInt64MetricDbClientConnectionsTimeouts(metrics::Meter *meter)
                                     unitMetricDbClientConnectionsTimeouts);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Counter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
 CreateSyncDoubleMetricDbClientConnectionsTimeouts(metrics::Meter *meter)
 {
   return meter->CreateDoubleCounter(kMetricDbClientConnectionsTimeouts,
@@ -630,8 +603,7 @@ CreateSyncDoubleMetricDbClientConnectionsTimeouts(metrics::Meter *meter)
                                     unitMetricDbClientConnectionsTimeouts);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricDbClientConnectionsTimeouts(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableCounter(kMetricDbClientConnectionsTimeouts,
@@ -639,8 +611,7 @@ CreateAsyncInt64MetricDbClientConnectionsTimeouts(metrics::Meter *meter)
                                              unitMetricDbClientConnectionsTimeouts);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricDbClientConnectionsTimeouts(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableCounter(kMetricDbClientConnectionsTimeouts,
@@ -656,16 +627,14 @@ CreateAsyncDoubleMetricDbClientConnectionsTimeouts(metrics::Meter *meter)
  * <p>
  * updowncounter
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricDbClientConnectionsUsage = "db.client.connections.usage";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricDbClientConnectionsUsage =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsUsage =
+    "db.client.connections.usage";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsUsage =
     "Deprecated, use `db.client.connection.count` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricDbClientConnectionsUsage = "{connection}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsUsage =
+    "{connection}";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricDbClientConnectionsUsage(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsUsage,
@@ -673,8 +642,7 @@ CreateSyncInt64MetricDbClientConnectionsUsage(metrics::Meter *meter)
                                          unitMetricDbClientConnectionsUsage);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricDbClientConnectionsUsage(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsUsage,
@@ -682,8 +650,7 @@ CreateSyncDoubleMetricDbClientConnectionsUsage(metrics::Meter *meter)
                                           unitMetricDbClientConnectionsUsage);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricDbClientConnectionsUsage(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsUsage,
@@ -691,8 +658,7 @@ CreateAsyncInt64MetricDbClientConnectionsUsage(metrics::Meter *meter)
                                                    unitMetricDbClientConnectionsUsage);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricDbClientConnectionsUsage(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsUsage,
@@ -707,17 +673,14 @@ CreateAsyncDoubleMetricDbClientConnectionsUsage(metrics::Meter *meter)
  * Replaced by @code db.client.connection.use_time @endcode. Note: the unit also changed from @code
  * ms @endcode to @code s @endcode. <p> histogram
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricDbClientConnectionsUseTime = "db.client.connections.use_time";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricDbClientConnectionsUseTime =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsUseTime =
+    "db.client.connections.use_time";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsUseTime =
     "Deprecated, use `db.client.connection.use_time` instead. Note: the unit also changed from "
     "`ms` to `s`.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricDbClientConnectionsUseTime = "ms";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsUseTime = "ms";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricDbClientConnectionsUseTime(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricDbClientConnectionsUseTime,
@@ -725,8 +688,7 @@ CreateSyncInt64MetricDbClientConnectionsUseTime(metrics::Meter *meter)
                                       unitMetricDbClientConnectionsUseTime);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
 CreateSyncDoubleMetricDbClientConnectionsUseTime(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricDbClientConnectionsUseTime,
@@ -741,17 +703,14 @@ CreateSyncDoubleMetricDbClientConnectionsUseTime(metrics::Meter *meter)
  * Replaced by @code db.client.connection.wait_time @endcode. Note: the unit also changed from @code
  * ms @endcode to @code s @endcode. <p> histogram
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricDbClientConnectionsWaitTime = "db.client.connections.wait_time";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricDbClientConnectionsWaitTime =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsWaitTime =
+    "db.client.connections.wait_time";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsWaitTime =
     "Deprecated, use `db.client.connection.wait_time` instead. Note: the unit also changed from "
     "`ms` to `s`.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricDbClientConnectionsWaitTime = "ms";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsWaitTime = "ms";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricDbClientConnectionsWaitTime(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricDbClientConnectionsWaitTime,
@@ -759,8 +718,7 @@ CreateSyncInt64MetricDbClientConnectionsWaitTime(metrics::Meter *meter)
                                       unitMetricDbClientConnectionsWaitTime);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
 CreateSyncDoubleMetricDbClientConnectionsWaitTime(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricDbClientConnectionsWaitTime,
@@ -776,17 +734,15 @@ CreateSyncDoubleMetricDbClientConnectionsWaitTime(metrics::Meter *meter)
  * <p>
  * updowncounter
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricDbClientCosmosdbActiveInstanceCount =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientCosmosdbActiveInstanceCount =
     "db.client.cosmosdb.active_instance.count";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricDbClientCosmosdbActiveInstanceCount =
-    "Deprecated, use `azure.cosmosdb.client.active_instance.count` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricDbClientCosmosdbActiveInstanceCount = "{instance}";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *descrMetricDbClientCosmosdbActiveInstanceCount =
+        "Deprecated, use `azure.cosmosdb.client.active_instance.count` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *unitMetricDbClientCosmosdbActiveInstanceCount = "{instance}";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
@@ -794,8 +750,7 @@ CreateSyncInt64MetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
                                          unitMetricDbClientCosmosdbActiveInstanceCount);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
@@ -803,8 +758,7 @@ CreateSyncDoubleMetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
                                           unitMetricDbClientCosmosdbActiveInstanceCount);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
@@ -812,8 +766,7 @@ CreateAsyncInt64MetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
                                                    unitMetricDbClientCosmosdbActiveInstanceCount);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
@@ -829,17 +782,15 @@ CreateAsyncDoubleMetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter
  * <p>
  * histogram
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricDbClientCosmosdbOperationRequestCharge =
-    "db.client.cosmosdb.operation.request_charge";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricDbClientCosmosdbOperationRequestCharge =
-    "Deprecated, use `azure.cosmosdb.client.operation.request_charge` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricDbClientCosmosdbOperationRequestCharge = "{request_unit}";
-
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *kMetricDbClientCosmosdbOperationRequestCharge = "db.client.cosmosdb.operation.request_charge";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *descrMetricDbClientCosmosdbOperationRequestCharge =
+        "Deprecated, use `azure.cosmosdb.client.operation.request_charge` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *unitMetricDbClientCosmosdbOperationRequestCharge = "{request_unit}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricDbClientCosmosdbOperationRequestCharge(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricDbClientCosmosdbOperationRequestCharge,
@@ -847,8 +798,7 @@ CreateSyncInt64MetricDbClientCosmosdbOperationRequestCharge(metrics::Meter *mete
                                       unitMetricDbClientCosmosdbOperationRequestCharge);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
 CreateSyncDoubleMetricDbClientCosmosdbOperationRequestCharge(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricDbClientCosmosdbOperationRequestCharge,
diff --git a/api/include/opentelemetry/semconv/incubating/deployment_attributes.h b/api/include/opentelemetry/semconv/incubating/deployment_attributes.h
index f6933b4852..534608bb65 100644
--- a/api/include/opentelemetry/semconv/incubating/deployment_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/deployment_attributes.h
@@ -25,8 +25,8 @@ namespace deployment
  * @deprecated
  * Deprecated, use @code deployment.environment.name @endcode instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDeploymentEnvironment = "deployment.environment";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDeploymentEnvironment =
+    "deployment.environment";
 
 /**
  * Name of the <a href="https://wikipedia.org/wiki/Deployment_environment">deployment
diff --git a/api/include/opentelemetry/semconv/incubating/enduser_attributes.h b/api/include/opentelemetry/semconv/incubating/enduser_attributes.h
index 217d5dd414..922ff9c803 100644
--- a/api/include/opentelemetry/semconv/incubating/enduser_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/enduser_attributes.h
@@ -25,8 +25,7 @@ namespace enduser
  * @deprecated
  * Replaced by @code user.id @endcode attribute.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kEnduserId = "enduser.id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserId = "enduser.id";
 
 /**
  * Deprecated, use @code user.roles @endcode instead.
@@ -34,8 +33,7 @@ static constexpr const char *kEnduserId = "enduser.id";
  * @deprecated
  * Replaced by @code user.roles @endcode attribute.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kEnduserRole = "enduser.role";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserRole = "enduser.role";
 
 /**
  * Deprecated, no replacement at this time.
@@ -43,8 +41,7 @@ static constexpr const char *kEnduserRole = "enduser.role";
  * @deprecated
  * Removed.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kEnduserScope = "enduser.scope";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserScope = "enduser.scope";
 
 }  // namespace enduser
 }  // namespace semconv
diff --git a/api/include/opentelemetry/semconv/incubating/event_attributes.h b/api/include/opentelemetry/semconv/incubating/event_attributes.h
index c43df166d0..4342757540 100644
--- a/api/include/opentelemetry/semconv/incubating/event_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/event_attributes.h
@@ -25,8 +25,7 @@ namespace event
  * @deprecated
  * Replaced by EventName top-level field on the LogRecord
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kEventName = "event.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kEventName = "event.name";
 
 }  // namespace event
 }  // namespace semconv
diff --git a/api/include/opentelemetry/semconv/incubating/exception_attributes.h b/api/include/opentelemetry/semconv/incubating/exception_attributes.h
index 1ad6988833..980e4525f9 100644
--- a/api/include/opentelemetry/semconv/incubating/exception_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/exception_attributes.h
@@ -26,8 +26,7 @@ namespace exception
  * It's no longer recommended to record exceptions that are handled and do not escape the scope of a
  * span.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kExceptionEscaped = "exception.escaped";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kExceptionEscaped = "exception.escaped";
 
 /**
  * The exception message.
diff --git a/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h b/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h
index f099afdb58..cab6f8034f 100644
--- a/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h
@@ -25,8 +25,7 @@ namespace gen_ai
  * @deprecated
  * Removed, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kGenAiCompletion = "gen_ai.completion";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiCompletion = "gen_ai.completion";
 
 /**
  * The response format that is requested.
@@ -40,8 +39,8 @@ static constexpr const char *kGenAiOpenaiRequestResponseFormat =
  * @deprecated
  * Replaced by @code gen_ai.request.seed @endcode attribute.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kGenAiOpenaiRequestSeed = "gen_ai.openai.request.seed";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiOpenaiRequestSeed =
+    "gen_ai.openai.request.seed";
 
 /**
  * The service tier requested. May be a specific tier, default, or auto.
@@ -76,8 +75,7 @@ static constexpr const char *kGenAiOperationName = "gen_ai.operation.name";
  * @deprecated
  * Removed, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kGenAiPrompt = "gen_ai.prompt";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiPrompt = "gen_ai.prompt";
 
 /**
  * The encoding formats requested in an embeddings operation, if specified.
@@ -173,8 +171,8 @@ static constexpr const char *kGenAiTokenType = "gen_ai.token.type";
  * @deprecated
  * Replaced by @code gen_ai.usage.output_tokens @endcode attribute.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kGenAiUsageCompletionTokens = "gen_ai.usage.completion_tokens";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsageCompletionTokens =
+    "gen_ai.usage.completion_tokens";
 
 /**
  * The number of tokens used in the GenAI input (prompt).
@@ -192,8 +190,8 @@ static constexpr const char *kGenAiUsageOutputTokens = "gen_ai.usage.output_toke
  * @deprecated
  * Replaced by @code gen_ai.usage.input_tokens @endcode attribute.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kGenAiUsagePromptTokens = "gen_ai.usage.prompt_tokens";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsagePromptTokens =
+    "gen_ai.usage.prompt_tokens";
 
 namespace GenAiOpenaiRequestResponseFormatValues
 {
diff --git a/api/include/opentelemetry/semconv/incubating/http_attributes.h b/api/include/opentelemetry/semconv/incubating/http_attributes.h
index 8f909f5297..0bf4c65ff7 100644
--- a/api/include/opentelemetry/semconv/incubating/http_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/http_attributes.h
@@ -25,8 +25,7 @@ namespace http
  * @deprecated
  * Replaced by @code client.address @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpClientIp = "http.client_ip";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpClientIp = "http.client_ip";
 
 /**
  * State of the HTTP connection in the HTTP connection pool.
@@ -39,8 +38,7 @@ static constexpr const char *kHttpConnectionState = "http.connection.state";
  * @deprecated
  * Replaced by @code network.protocol.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpFlavor = "http.flavor";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpFlavor = "http.flavor";
 
 /**
  * Deprecated, use one of @code server.address @endcode, @code client.address @endcode or @code
@@ -49,8 +47,7 @@ static constexpr const char *kHttpFlavor = "http.flavor";
  * Replaced by one of @code server.address @endcode, @code client.address @endcode or @code
  * http.request.header.host @endcode, depending on the usage.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpHost = "http.host";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpHost = "http.host";
 
 /**
  * Deprecated, use @code http.request.method @endcode instead.
@@ -58,8 +55,7 @@ static constexpr const char *kHttpHost = "http.host";
  * @deprecated
  * Replaced by @code http.request.method @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpMethod = "http.method";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpMethod = "http.method";
 
 /**
  * The size of the request payload body in bytes. This is the number of bytes transferred excluding
@@ -131,8 +127,8 @@ static constexpr const char *kHttpRequestSize = "http.request.size";
  * @deprecated
  * Replaced by @code http.request.header.<key> @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpRequestContentLength = "http.request_content_length";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLength =
+    "http.request_content_length";
 
 /**
  * Deprecated, use @code http.request.body.size @endcode instead.
@@ -140,8 +136,7 @@ static constexpr const char *kHttpRequestContentLength = "http.request_content_l
  * @deprecated
  * Replaced by @code http.request.body.size @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpRequestContentLengthUncompressed =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLengthUncompressed =
     "http.request_content_length_uncompressed";
 
 /**
@@ -182,8 +177,8 @@ static constexpr const char *kHttpResponseStatusCode = "http.response.status_cod
  * @deprecated
  * Replaced by @code http.response.header.<key> @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpResponseContentLength = "http.response_content_length";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLength =
+    "http.response_content_length";
 
 /**
  * Deprecated, use @code http.response.body.size @endcode instead.
@@ -191,8 +186,7 @@ static constexpr const char *kHttpResponseContentLength = "http.response_content
  * @deprecated
  * Replace by @code http.response.body.size @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpResponseContentLengthUncompressed =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLengthUncompressed =
     "http.response_content_length_uncompressed";
 
 /**
@@ -210,8 +204,7 @@ static constexpr const char *kHttpRoute = "http.route";
  * @deprecated
  * Replaced by @code url.scheme @endcode instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpScheme = "http.scheme";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpScheme = "http.scheme";
 
 /**
  * Deprecated, use @code server.address @endcode instead.
@@ -219,8 +212,7 @@ static constexpr const char *kHttpScheme = "http.scheme";
  * @deprecated
  * Replaced by @code server.address @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpServerName = "http.server_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpServerName = "http.server_name";
 
 /**
  * Deprecated, use @code http.response.status_code @endcode instead.
@@ -228,8 +220,7 @@ static constexpr const char *kHttpServerName = "http.server_name";
  * @deprecated
  * Replaced by @code http.response.status_code @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpStatusCode = "http.status_code";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpStatusCode = "http.status_code";
 
 /**
  * Deprecated, use @code url.path @endcode and @code url.query @endcode instead.
@@ -237,8 +228,7 @@ static constexpr const char *kHttpStatusCode = "http.status_code";
  * @deprecated
  * Split to @code url.path @endcode and `url.query.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpTarget = "http.target";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpTarget = "http.target";
 
 /**
  * Deprecated, use @code url.full @endcode instead.
@@ -246,8 +236,7 @@ static constexpr const char *kHttpTarget = "http.target";
  * @deprecated
  * Replaced by @code url.full @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpUrl = "http.url";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUrl = "http.url";
 
 /**
  * Deprecated, use @code user_agent.original @endcode instead.
@@ -255,8 +244,7 @@ static constexpr const char *kHttpUrl = "http.url";
  * @deprecated
  * Replaced by @code user_agent.original @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpUserAgent = "http.user_agent";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUserAgent = "http.user_agent";
 
 namespace HttpConnectionStateValues
 {
diff --git a/api/include/opentelemetry/semconv/incubating/k8s_attributes.h b/api/include/opentelemetry/semconv/incubating/k8s_attributes.h
index e10e71eafb..849dc24655 100644
--- a/api/include/opentelemetry/semconv/incubating/k8s_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/k8s_attributes.h
@@ -149,8 +149,7 @@ static constexpr const char *kK8sPodLabel = "k8s.pod.label";
  * @deprecated
  * Replaced by @code k8s.pod.label @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kK8sPodLabels = "k8s.pod.labels";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kK8sPodLabels = "k8s.pod.labels";
 
 /**
  * The name of the Pod.
diff --git a/api/include/opentelemetry/semconv/incubating/message_attributes.h b/api/include/opentelemetry/semconv/incubating/message_attributes.h
index 508a1e58f6..431af91f1e 100644
--- a/api/include/opentelemetry/semconv/incubating/message_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/message_attributes.h
@@ -25,8 +25,8 @@ namespace message
  * @deprecated
  * Replaced by @code rpc.message.compressed_size @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageCompressedSize = "message.compressed_size";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageCompressedSize =
+    "message.compressed_size";
 
 /**
  * Deprecated, use @code rpc.message.id @endcode instead.
@@ -34,8 +34,7 @@ static constexpr const char *kMessageCompressedSize = "message.compressed_size";
  * @deprecated
  * Replaced by @code rpc.message.id @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageId = "message.id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageId = "message.id";
 
 /**
  * Deprecated, use @code rpc.message.type @endcode instead.
@@ -43,8 +42,7 @@ static constexpr const char *kMessageId = "message.id";
  * @deprecated
  * Replaced by @code rpc.message.type @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageType = "message.type";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageType = "message.type";
 
 /**
  * Deprecated, use @code rpc.message.uncompressed_size @endcode instead.
@@ -52,8 +50,8 @@ static constexpr const char *kMessageType = "message.type";
  * @deprecated
  * Replaced by @code rpc.message.uncompressed_size @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageUncompressedSize = "message.uncompressed_size";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageUncompressedSize =
+    "message.uncompressed_size";
 
 namespace MessageTypeValues
 {
diff --git a/api/include/opentelemetry/semconv/incubating/messaging_attributes.h b/api/include/opentelemetry/semconv/incubating/messaging_attributes.h
index 4cf20365ab..cc06578c3d 100644
--- a/api/include/opentelemetry/semconv/incubating/messaging_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/messaging_attributes.h
@@ -111,8 +111,7 @@ static constexpr const char *kMessagingDestinationTemporary = "messaging.destina
  * @deprecated
  * No replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingDestinationPublishAnonymous =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishAnonymous =
     "messaging.destination_publish.anonymous";
 
 /**
@@ -121,8 +120,7 @@ static constexpr const char *kMessagingDestinationPublishAnonymous =
  * @deprecated
  * No replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingDestinationPublishName =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishName =
     "messaging.destination_publish.name";
 
 /**
@@ -131,8 +129,7 @@ static constexpr const char *kMessagingDestinationPublishName =
  * @deprecated
  * Replaced by @code messaging.consumer.group.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingEventhubsConsumerGroup =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingEventhubsConsumerGroup =
     "messaging.eventhubs.consumer.group";
 
 /**
@@ -172,8 +169,8 @@ static constexpr const char *kMessagingGcpPubsubMessageOrderingKey =
  * @deprecated
  * Replaced by @code messaging.consumer.group.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingKafkaConsumerGroup = "messaging.kafka.consumer.group";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaConsumerGroup =
+    "messaging.kafka.consumer.group";
 
 /**
  * Deprecated, use @code messaging.destination.partition.id @endcode instead.
@@ -181,8 +178,7 @@ static constexpr const char *kMessagingKafkaConsumerGroup = "messaging.kafka.con
  * @deprecated
  * Replaced by @code messaging.destination.partition.id @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingKafkaDestinationPartition =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaDestinationPartition =
     "messaging.kafka.destination.partition";
 
 /**
@@ -200,8 +196,8 @@ static constexpr const char *kMessagingKafkaMessageKey = "messaging.kafka.messag
  * @deprecated
  * Replaced by @code messaging.kafka.offset @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingKafkaMessageOffset = "messaging.kafka.message.offset";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaMessageOffset =
+    "messaging.kafka.message.offset";
 
 /**
  * A boolean that is true if the message is a tombstone.
@@ -246,8 +242,7 @@ static constexpr const char *kMessagingMessageId = "messaging.message.id";
  * @deprecated
  * Replaced by @code messaging.operation.type @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingOperation = "messaging.operation";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingOperation = "messaging.operation";
 
 /**
  * The system-specific name of the messaging operation.
@@ -280,8 +275,8 @@ static constexpr const char *kMessagingRabbitmqMessageDeliveryTag =
  * Replaced by @code messaging.consumer.group.name @endcode on the consumer spans. No replacement
  * for producer spans.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingRocketmqClientGroup = "messaging.rocketmq.client_group";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingRocketmqClientGroup =
+    "messaging.rocketmq.client_group";
 
 /**
  * Model of message consumption. This only applies to consumer spans.
@@ -333,9 +328,9 @@ static constexpr const char *kMessagingRocketmqNamespace = "messaging.rocketmq.n
  * @deprecated
  * Replaced by @code messaging.destination.subscription.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingServicebusDestinationSubscriptionName =
-    "messaging.servicebus.destination.subscription_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *kMessagingServicebusDestinationSubscriptionName =
+        "messaging.servicebus.destination.subscription_name";
 
 /**
  * Describes the <a
@@ -403,8 +398,7 @@ static constexpr const char *kSettle = "settle";
  * @deprecated
  * Replaced by @code process @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDeliver = "deliver";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDeliver = "deliver";
 
 /**
  * Deprecated. Use @code send @endcode instead.
@@ -412,8 +406,7 @@ static constexpr const char *kDeliver = "deliver";
  * @deprecated
  * Replaced by @code send @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kPublish = "publish";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kPublish = "publish";
 
 }  // namespace MessagingOperationTypeValues
 
diff --git a/api/include/opentelemetry/semconv/incubating/messaging_metrics.h b/api/include/opentelemetry/semconv/incubating/messaging_metrics.h
index c08362f20a..77cb7012c9 100644
--- a/api/include/opentelemetry/semconv/incubating/messaging_metrics.h
+++ b/api/include/opentelemetry/semconv/incubating/messaging_metrics.h
@@ -103,17 +103,14 @@ CreateSyncDoubleMetricMessagingClientOperationDuration(metrics::Meter *meter)
  * <p>
  * counter
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricMessagingClientPublishedMessages =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingClientPublishedMessages =
     "messaging.client.published.messages";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricMessagingClientPublishedMessages =
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingClientPublishedMessages =
     "Deprecated. Use `messaging.client.sent.messages` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricMessagingClientPublishedMessages = "{message}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingClientPublishedMessages =
+    "{message}";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
 CreateSyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
 {
   return meter->CreateUInt64Counter(kMetricMessagingClientPublishedMessages,
@@ -121,8 +118,7 @@ CreateSyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
                                     unitMetricMessagingClientPublishedMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Counter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
 CreateSyncDoubleMetricMessagingClientPublishedMessages(metrics::Meter *meter)
 {
   return meter->CreateDoubleCounter(kMetricMessagingClientPublishedMessages,
@@ -130,8 +126,7 @@ CreateSyncDoubleMetricMessagingClientPublishedMessages(metrics::Meter *meter)
                                     unitMetricMessagingClientPublishedMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableCounter(kMetricMessagingClientPublishedMessages,
@@ -139,8 +134,7 @@ CreateAsyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
                                              unitMetricMessagingClientPublishedMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricMessagingClientPublishedMessages(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableCounter(kMetricMessagingClientPublishedMessages,
@@ -227,16 +221,14 @@ CreateSyncDoubleMetricMessagingProcessDuration(metrics::Meter *meter)
  * <p>
  * counter
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricMessagingProcessMessages = "messaging.process.messages";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricMessagingProcessMessages =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingProcessMessages =
+    "messaging.process.messages";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingProcessMessages =
     "Deprecated. Use `messaging.client.consumed.messages` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricMessagingProcessMessages = "{message}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingProcessMessages =
+    "{message}";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
 CreateSyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
 {
   return meter->CreateUInt64Counter(kMetricMessagingProcessMessages,
@@ -244,8 +236,7 @@ CreateSyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
                                     unitMetricMessagingProcessMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Counter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
 CreateSyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
 {
   return meter->CreateDoubleCounter(kMetricMessagingProcessMessages,
@@ -253,8 +244,7 @@ CreateSyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
                                     unitMetricMessagingProcessMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableCounter(kMetricMessagingProcessMessages,
@@ -262,8 +252,7 @@ CreateAsyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
                                              unitMetricMessagingProcessMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableCounter(kMetricMessagingProcessMessages,
@@ -279,16 +268,13 @@ CreateAsyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
  * <p>
  * histogram
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricMessagingPublishDuration = "messaging.publish.duration";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricMessagingPublishDuration =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishDuration =
+    "messaging.publish.duration";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingPublishDuration =
     "Deprecated. Use `messaging.client.operation.duration` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricMessagingPublishDuration = "s";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingPublishDuration = "s";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricMessagingPublishDuration(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricMessagingPublishDuration,
@@ -296,8 +282,7 @@ CreateSyncInt64MetricMessagingPublishDuration(metrics::Meter *meter)
                                       unitMetricMessagingPublishDuration);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
 CreateSyncDoubleMetricMessagingPublishDuration(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricMessagingPublishDuration,
@@ -313,16 +298,14 @@ CreateSyncDoubleMetricMessagingPublishDuration(metrics::Meter *meter)
  * <p>
  * counter
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricMessagingPublishMessages = "messaging.publish.messages";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricMessagingPublishMessages =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishMessages =
+    "messaging.publish.messages";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingPublishMessages =
     "Deprecated. Use `messaging.client.produced.messages` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricMessagingPublishMessages = "{message}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingPublishMessages =
+    "{message}";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
 CreateSyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
 {
   return meter->CreateUInt64Counter(kMetricMessagingPublishMessages,
@@ -330,8 +313,7 @@ CreateSyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
                                     unitMetricMessagingPublishMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Counter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
 CreateSyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
 {
   return meter->CreateDoubleCounter(kMetricMessagingPublishMessages,
@@ -339,8 +321,7 @@ CreateSyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
                                     unitMetricMessagingPublishMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableCounter(kMetricMessagingPublishMessages,
@@ -348,8 +329,7 @@ CreateAsyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
                                              unitMetricMessagingPublishMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableCounter(kMetricMessagingPublishMessages,
@@ -365,16 +345,13 @@ CreateAsyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
  * <p>
  * histogram
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricMessagingReceiveDuration = "messaging.receive.duration";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricMessagingReceiveDuration =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveDuration =
+    "messaging.receive.duration";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingReceiveDuration =
     "Deprecated. Use `messaging.client.operation.duration` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricMessagingReceiveDuration = "s";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingReceiveDuration = "s";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricMessagingReceiveDuration(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricMessagingReceiveDuration,
@@ -382,8 +359,7 @@ CreateSyncInt64MetricMessagingReceiveDuration(metrics::Meter *meter)
                                       unitMetricMessagingReceiveDuration);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Histogram<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
 CreateSyncDoubleMetricMessagingReceiveDuration(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricMessagingReceiveDuration,
@@ -399,16 +375,14 @@ CreateSyncDoubleMetricMessagingReceiveDuration(metrics::Meter *meter)
  * <p>
  * counter
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMetricMessagingReceiveMessages = "messaging.receive.messages";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *descrMetricMessagingReceiveMessages =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveMessages =
+    "messaging.receive.messages";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingReceiveMessages =
     "Deprecated. Use `messaging.client.consumed.messages` instead.";
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *unitMetricMessagingReceiveMessages = "{message}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingReceiveMessages =
+    "{message}";
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
 CreateSyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
 {
   return meter->CreateUInt64Counter(kMetricMessagingReceiveMessages,
@@ -416,8 +390,7 @@ CreateSyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
                                     unitMetricMessagingReceiveMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::unique_ptr<metrics::Counter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
 CreateSyncDoubleMetricMessagingReceiveMessages(metrics::Meter *meter)
 {
   return meter->CreateDoubleCounter(kMetricMessagingReceiveMessages,
@@ -425,8 +398,7 @@ CreateSyncDoubleMetricMessagingReceiveMessages(metrics::Meter *meter)
                                     unitMetricMessagingReceiveMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableCounter(kMetricMessagingReceiveMessages,
@@ -434,8 +406,7 @@ CreateAsyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
                                              unitMetricMessagingReceiveMessages);
 }
 
-OPENTELEMETRY_DEPRECATED
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricMessagingReceiveMessages(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableCounter(kMetricMessagingReceiveMessages,
diff --git a/api/include/opentelemetry/semconv/incubating/net_attributes.h b/api/include/opentelemetry/semconv/incubating/net_attributes.h
index 9562299223..b87a66cd51 100644
--- a/api/include/opentelemetry/semconv/incubating/net_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/net_attributes.h
@@ -25,8 +25,7 @@ namespace net
  * @deprecated
  * Replaced by @code network.local.address @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetHostIp = "net.host.ip";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostIp = "net.host.ip";
 
 /**
  * Deprecated, use @code server.address @endcode.
@@ -34,8 +33,7 @@ static constexpr const char *kNetHostIp = "net.host.ip";
  * @deprecated
  * Replaced by @code server.address @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetHostName = "net.host.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostName = "net.host.name";
 
 /**
  * Deprecated, use @code server.port @endcode.
@@ -43,8 +41,7 @@ static constexpr const char *kNetHostName = "net.host.name";
  * @deprecated
  * Replaced by @code server.port @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetHostPort = "net.host.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostPort = "net.host.port";
 
 /**
  * Deprecated, use @code network.peer.address @endcode.
@@ -52,8 +49,7 @@ static constexpr const char *kNetHostPort = "net.host.port";
  * @deprecated
  * Replaced by @code network.peer.address @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetPeerIp = "net.peer.ip";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerIp = "net.peer.ip";
 
 /**
  * Deprecated, use @code server.address @endcode on client spans and @code client.address @endcode
@@ -62,8 +58,7 @@ static constexpr const char *kNetPeerIp = "net.peer.ip";
  * Replaced by @code server.address @endcode on client spans and @code client.address @endcode on
  * server spans.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetPeerName = "net.peer.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerName = "net.peer.name";
 
 /**
  * Deprecated, use @code server.port @endcode on client spans and @code client.port @endcode on
@@ -72,8 +67,7 @@ static constexpr const char *kNetPeerName = "net.peer.name";
  * Replaced by @code server.port @endcode on client spans and @code client.port @endcode on server
  * spans.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetPeerPort = "net.peer.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerPort = "net.peer.port";
 
 /**
  * Deprecated, use @code network.protocol.name @endcode.
@@ -81,8 +75,7 @@ static constexpr const char *kNetPeerPort = "net.peer.port";
  * @deprecated
  * Replaced by @code network.protocol.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetProtocolName = "net.protocol.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolName = "net.protocol.name";
 
 /**
  * Deprecated, use @code network.protocol.version @endcode.
@@ -90,8 +83,7 @@ static constexpr const char *kNetProtocolName = "net.protocol.name";
  * @deprecated
  * Replaced by @code network.protocol.version @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetProtocolVersion = "net.protocol.version";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolVersion = "net.protocol.version";
 
 /**
  * Deprecated, use @code network.transport @endcode and @code network.type @endcode.
@@ -99,8 +91,7 @@ static constexpr const char *kNetProtocolVersion = "net.protocol.version";
  * @deprecated
  * Split to @code network.transport @endcode and @code network.type @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockFamily = "net.sock.family";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockFamily = "net.sock.family";
 
 /**
  * Deprecated, use @code network.local.address @endcode.
@@ -108,8 +99,7 @@ static constexpr const char *kNetSockFamily = "net.sock.family";
  * @deprecated
  * Replaced by @code network.local.address @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
 
 /**
  * Deprecated, use @code network.local.port @endcode.
@@ -117,8 +107,7 @@ static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
  * @deprecated
  * Replaced by @code network.local.port @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockHostPort = "net.sock.host.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostPort = "net.sock.host.port";
 
 /**
  * Deprecated, use @code network.peer.address @endcode.
@@ -126,8 +115,7 @@ static constexpr const char *kNetSockHostPort = "net.sock.host.port";
  * @deprecated
  * Replaced by @code network.peer.address @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
 
 /**
  * Deprecated, no replacement at this time.
@@ -135,8 +123,7 @@ static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
  * @deprecated
  * Removed.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
 
 /**
  * Deprecated, use @code network.peer.port @endcode.
@@ -144,8 +131,7 @@ static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
  * @deprecated
  * Replaced by @code network.peer.port @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
 
 /**
  * Deprecated, use @code network.transport @endcode.
@@ -153,8 +139,7 @@ static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
  * @deprecated
  * Replaced by @code network.transport @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetTransport = "net.transport";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetTransport = "net.transport";
 
 namespace NetSockFamilyValues
 {
diff --git a/api/include/opentelemetry/semconv/incubating/otel_attributes.h b/api/include/opentelemetry/semconv/incubating/otel_attributes.h
index e3a3251005..a6cf9f50de 100644
--- a/api/include/opentelemetry/semconv/incubating/otel_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/otel_attributes.h
@@ -25,8 +25,7 @@ namespace otel
  * @deprecated
  * Use the @code otel.scope.name @endcode attribute.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kOtelLibraryName = "otel.library.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryName = "otel.library.name";
 
 /**
  * Deprecated. Use the @code otel.scope.version @endcode attribute.
@@ -34,8 +33,7 @@ static constexpr const char *kOtelLibraryName = "otel.library.name";
  * @deprecated
  * Use the @code otel.scope.version @endcode attribute.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kOtelLibraryVersion = "otel.library.version";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryVersion = "otel.library.version";
 
 /**
  * The name of the instrumentation scope - (@code InstrumentationScope.Name @endcode in OTLP).
diff --git a/api/include/opentelemetry/semconv/incubating/other_attributes.h b/api/include/opentelemetry/semconv/incubating/other_attributes.h
index bc6d26ef16..0587c0a6d6 100644
--- a/api/include/opentelemetry/semconv/incubating/other_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/other_attributes.h
@@ -25,8 +25,7 @@ namespace other
  * @deprecated
  * Replaced by @code db.client.connection.state @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kState = "state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kState = "state";
 
 namespace StateValues
 {
diff --git a/api/include/opentelemetry/semconv/incubating/pool_attributes.h b/api/include/opentelemetry/semconv/incubating/pool_attributes.h
index 6c26b22c23..3554e600b9 100644
--- a/api/include/opentelemetry/semconv/incubating/pool_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/pool_attributes.h
@@ -25,8 +25,7 @@ namespace pool
  * @deprecated
  * Replaced by @code db.client.connection.pool.name @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kPoolName = "pool.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kPoolName = "pool.name";
 
 }  // namespace pool
 }  // namespace semconv
diff --git a/api/include/opentelemetry/semconv/incubating/process_attributes.h b/api/include/opentelemetry/semconv/incubating/process_attributes.h
index e6850778d8..09bbacbd3d 100644
--- a/api/include/opentelemetry/semconv/incubating/process_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/process_attributes.h
@@ -60,8 +60,7 @@ static constexpr const char *kProcessContextSwitchType = "process.context_switch
  * @deprecated
  * Replaced by @code cpu.mode @endcode
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kProcessCpuState = "process.cpu.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessCpuState = "process.cpu.state";
 
 /**
  * The date and time the process was created, in ISO 8601 format.
@@ -91,8 +90,7 @@ static constexpr const char *kProcessExecutableBuildIdHtlhash =
  * @deprecated
  * Replaced by @code process.executable.build_id.htlhash @endcode
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kProcessExecutableBuildIdProfiling =
+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 673b18f91c..ae468ac201 100644
--- a/api/include/opentelemetry/semconv/incubating/system_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/system_attributes.h
@@ -30,8 +30,7 @@ static constexpr const char *kSystemCpuLogicalNumber = "system.cpu.logical_numbe
  * @deprecated
  * Replaced by @code cpu.mode @endcode
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kSystemCpuState = "system.cpu.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemCpuState = "system.cpu.state";
 
 /**
  * The device identifier
@@ -69,8 +68,7 @@ static constexpr const char *kSystemMemoryState = "system.memory.state";
  * @deprecated
  * Removed, report network connection state with @code network.connection.state @endcode attribute
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kSystemNetworkState = "system.network.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemNetworkState = "system.network.state";
 
 /**
  * The paging access direction
@@ -100,8 +98,8 @@ static constexpr const char *kSystemProcessStatus = "system.process.status";
  * @deprecated
  * Replaced by @code system.process.status @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kSystemProcessesStatus = "system.processes.status";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemProcessesStatus =
+    "system.processes.status";
 
 namespace SystemCpuStateValues
 {
@@ -213,8 +211,7 @@ static constexpr const char *kFree = "free";
  * @deprecated
  * Removed, report shared memory usage with @code metric.system.memory.shared @endcode metric
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kShared = "shared";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kShared = "shared";
 
 /**
  * none
diff --git a/api/include/opentelemetry/semconv/incubating/tls_attributes.h b/api/include/opentelemetry/semconv/incubating/tls_attributes.h
index 89449453ec..d399f56ef2 100644
--- a/api/include/opentelemetry/semconv/incubating/tls_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/tls_attributes.h
@@ -91,8 +91,8 @@ static constexpr const char *kTlsClientNotBefore = "tls.client.not_before";
  * @deprecated
  * Replaced by @code server.address @endcode.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kTlsClientServerName = "tls.client.server_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kTlsClientServerName =
+    "tls.client.server_name";
 
 /**
  * Distinguished name of subject of the x.509 certificate presented by the client.
diff --git a/api/include/opentelemetry/semconv/incubating/vcs_attributes.h b/api/include/opentelemetry/semconv/incubating/vcs_attributes.h
index 5422a1af54..6906fec5e3 100644
--- a/api/include/opentelemetry/semconv/incubating/vcs_attributes.h
+++ b/api/include/opentelemetry/semconv/incubating/vcs_attributes.h
@@ -124,8 +124,8 @@ static constexpr const char *kVcsRefType = "vcs.ref.type";
  * @deprecated
  * Deprecated, use @code vcs.change.id @endcode instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kVcsRepositoryChangeId = "vcs.repository.change.id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryChangeId =
+    "vcs.repository.change.id";
 
 /**
  * Deprecated, use @code vcs.change.title @endcode instead.
@@ -133,8 +133,8 @@ static constexpr const char *kVcsRepositoryChangeId = "vcs.repository.change.id"
  * @deprecated
  * Deprecated, use @code vcs.change.title @endcode instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kVcsRepositoryChangeTitle = "vcs.repository.change.title";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryChangeTitle =
+    "vcs.repository.change.title";
 
 /**
  * The human readable name of the repository. It SHOULD NOT include any additional identifier like
@@ -150,8 +150,8 @@ static constexpr const char *kVcsRepositoryName = "vcs.repository.name";
  * @deprecated
  * Deprecated, use @code vcs.ref.head.name @endcode instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kVcsRepositoryRefName = "vcs.repository.ref.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefName =
+    "vcs.repository.ref.name";
 
 /**
  * Deprecated, use @code vcs.ref.head.revision @endcode instead.
@@ -159,8 +159,8 @@ static constexpr const char *kVcsRepositoryRefName = "vcs.repository.ref.name";
  * @deprecated
  * Deprecated, use @code vcs.ref.head.revision @endcode instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kVcsRepositoryRefRevision = "vcs.repository.ref.revision";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefRevision =
+    "vcs.repository.ref.revision";
 
 /**
  * Deprecated, use @code vcs.ref.head.type @endcode instead.
@@ -168,8 +168,8 @@ static constexpr const char *kVcsRepositoryRefRevision = "vcs.repository.ref.rev
  * @deprecated
  * Deprecated, use @code vcs.ref.head.type @endcode instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kVcsRepositoryRefType = "vcs.repository.ref.type";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefType =
+    "vcs.repository.ref.type";
 
 /**
  * The <a
diff --git a/api/include/opentelemetry/trace/semantic_conventions.h b/api/include/opentelemetry/trace/semantic_conventions.h
index d6d6591149..2f043dcf5d 100644
--- a/api/include/opentelemetry/trace/semantic_conventions.h
+++ b/api/include/opentelemetry/trace/semantic_conventions.h
@@ -1004,40 +1004,37 @@ static constexpr const char *kAndroidState = "android.state";
  *
  * @deprecated Deprecated, use `cpu.mode` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kContainerCpuState = "container.cpu.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerCpuState = "container.cpu.state";
 
 /**
  * Deprecated, use {@code db.collection.name} instead.
  *
  * @deprecated Deprecated, use `db.collection.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCassandraTable = "db.cassandra.table";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraTable = "db.cassandra.table";
 
 /**
  * Deprecated, use {@code server.address}, {@code server.port} attributes instead.
  *
  * @deprecated Deprecated, use `server.address`, `server.port` attributes instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbConnectionString = "db.connection_string";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbConnectionString = "db.connection_string";
 
 /**
  * Deprecated, use {@code db.collection.name} instead.
  *
  * @deprecated Deprecated, use `db.collection.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbContainer = "db.cosmosdb.container";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbContainer =
+    "db.cosmosdb.container";
 
 /**
  * Deprecated, use {@code db.namespace} instead.
  *
  * @deprecated Deprecated, use `db.namespace` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbElasticsearchClusterName = "db.elasticsearch.cluster.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchClusterName =
+    "db.elasticsearch.cluster.name";
 
 /**
  * Deprecated, no general replacement at this time. For Elasticsearch, use {@code
@@ -1046,24 +1043,23 @@ static constexpr const char *kDbElasticsearchClusterName = "db.elasticsearch.clu
  * @deprecated Deprecated, no general replacement at this time. For Elasticsearch, use
  * `db.elasticsearch.node.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbInstanceId = "db.instance.id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbInstanceId = "db.instance.id";
 
 /**
  * Removed, no replacement at this time.
  *
  * @deprecated Removed, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbJdbcDriverClassname = "db.jdbc.driver_classname";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbJdbcDriverClassname =
+    "db.jdbc.driver_classname";
 
 /**
  * Deprecated, use {@code db.collection.name} instead.
  *
  * @deprecated Deprecated, use `db.collection.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbMongodbCollection = "db.mongodb.collection";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMongodbCollection =
+    "db.mongodb.collection";
 
 /**
  * Deprecated, SQL Server instance is now populated as a part of {@code db.namespace} attribute.
@@ -1071,152 +1067,140 @@ static constexpr const char *kDbMongodbCollection = "db.mongodb.collection";
  * @deprecated Deprecated, SQL Server instance is now populated as a part of `db.namespace`
  * attribute.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbMssqlInstanceName = "db.mssql.instance_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMssqlInstanceName =
+    "db.mssql.instance_name";
 
 /**
  * Deprecated, use {@code db.namespace} instead.
  *
  * @deprecated Deprecated, use `db.namespace` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbName = "db.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbName = "db.name";
 
 /**
  * Deprecated, use {@code db.operation.name} instead.
  *
  * @deprecated Deprecated, use `db.operation.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbOperation = "db.operation";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbOperation = "db.operation";
 
 /**
  * Deprecated, use {@code db.namespace} instead.
  *
  * @deprecated Deprecated, use `db.namespace` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbRedisDatabaseIndex = "db.redis.database_index";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbRedisDatabaseIndex =
+    "db.redis.database_index";
 
 /**
  * Deprecated, use {@code db.collection.name} instead.
  *
  * @deprecated Deprecated, use `db.collection.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbSqlTable = "db.sql.table";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbSqlTable = "db.sql.table";
 
 /**
  * The database statement being executed.
  *
  * @deprecated The database statement being executed.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbStatement = "db.statement";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbStatement = "db.statement";
 
 /**
  * Deprecated, no replacement at this time.
  *
  * @deprecated Deprecated, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbUser = "db.user";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbUser = "db.user";
 
 /**
  * Deprecated, use {@code db.client.connection.pool.name} instead.
  *
  * @deprecated Deprecated, use `db.client.connection.pool.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbClientConnectionsPoolName = "db.client.connections.pool.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsPoolName =
+    "db.client.connections.pool.name";
 
 /**
  * Deprecated, use {@code db.client.connection.state} instead.
  *
  * @deprecated Deprecated, use `db.client.connection.state` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbClientConnectionsState = "db.client.connections.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsState =
+    "db.client.connections.state";
 
 /**
  * Deprecated, use {@code db.client.connection.pool.name} instead.
  *
  * @deprecated Deprecated, use `db.client.connection.pool.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kPoolName = "pool.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kPoolName = "pool.name";
 
 /**
  * Deprecated, use {@code db.client.connection.state} instead.
  *
  * @deprecated Deprecated, use `db.client.connection.state` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kState = "state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kState = "state";
 
 /**
  * 'Deprecated, use {@code deployment.environment.name} instead.'
  *
  * @deprecated 'Deprecated, use `deployment.environment.name` instead.'.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDeploymentEnvironment = "deployment.environment";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDeploymentEnvironment =
+    "deployment.environment";
 
 /**
  * Deprecated, use {@code user.id} instead.
  *
  * @deprecated Deprecated, use `user.id` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kEnduserId = "enduser.id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserId = "enduser.id";
 
 /**
  * Deprecated, use {@code user.roles} instead.
  *
  * @deprecated Deprecated, use `user.roles` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kEnduserRole = "enduser.role";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserRole = "enduser.role";
 
 /**
  * Deprecated, no replacement at this time.
  *
  * @deprecated Deprecated, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kEnduserScope = "enduser.scope";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserScope = "enduser.scope";
 
 /**
  * Deprecated, use {@code gen_ai.usage.output_tokens} instead.
  *
  * @deprecated Deprecated, use `gen_ai.usage.output_tokens` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kGenAiUsageCompletionTokens = "gen_ai.usage.completion_tokens";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsageCompletionTokens =
+    "gen_ai.usage.completion_tokens";
 
 /**
  * Deprecated, use {@code gen_ai.usage.input_tokens} instead.
  *
  * @deprecated Deprecated, use `gen_ai.usage.input_tokens` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kGenAiUsagePromptTokens = "gen_ai.usage.prompt_tokens";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsagePromptTokens =
+    "gen_ai.usage.prompt_tokens";
 
 /**
  * Deprecated, use {@code client.address} instead.
  *
  * @deprecated Deprecated, use `client.address` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpClientIp = "http.client_ip";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpClientIp = "http.client_ip";
 
 /**
  * Deprecated, use {@code network.protocol.name} instead.
  *
  * @deprecated Deprecated, use `network.protocol.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpFlavor = "http.flavor";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpFlavor = "http.flavor";
 
 /**
  * Deprecated, use one of {@code server.address}, {@code client.address} or {@code
@@ -1225,32 +1209,29 @@ static constexpr const char *kHttpFlavor = "http.flavor";
  * @deprecated Deprecated, use one of `server.address`, `client.address` or
  * `http.request.header.host` instead, depending on the usage.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpHost = "http.host";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpHost = "http.host";
 
 /**
  * Deprecated, use {@code http.request.method} instead.
  *
  * @deprecated Deprecated, use `http.request.method` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpMethod = "http.method";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpMethod = "http.method";
 
 /**
  * Deprecated, use {@code http.request.header.content-length} instead.
  *
  * @deprecated Deprecated, use `http.request.header.content-length` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpRequestContentLength = "http.request_content_length";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLength =
+    "http.request_content_length";
 
 /**
  * Deprecated, use {@code http.request.body.size} instead.
  *
  * @deprecated Deprecated, use `http.request.body.size` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpRequestContentLengthUncompressed =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLengthUncompressed =
     "http.request_content_length_uncompressed";
 
 /**
@@ -1258,16 +1239,15 @@ static constexpr const char *kHttpRequestContentLengthUncompressed =
  *
  * @deprecated Deprecated, use `http.response.header.content-length` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpResponseContentLength = "http.response_content_length";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLength =
+    "http.response_content_length";
 
 /**
  * Deprecated, use {@code http.response.body.size} instead.
  *
  * @deprecated Deprecated, use `http.response.body.size` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpResponseContentLengthUncompressed =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLengthUncompressed =
     "http.response_content_length_uncompressed";
 
 /**
@@ -1275,48 +1255,42 @@ static constexpr const char *kHttpResponseContentLengthUncompressed =
  *
  * @deprecated Deprecated, use `url.scheme` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpScheme = "http.scheme";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpScheme = "http.scheme";
 
 /**
  * Deprecated, use {@code server.address} instead.
  *
  * @deprecated Deprecated, use `server.address` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpServerName = "http.server_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpServerName = "http.server_name";
 
 /**
  * Deprecated, use {@code http.response.status_code} instead.
  *
  * @deprecated Deprecated, use `http.response.status_code` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpStatusCode = "http.status_code";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpStatusCode = "http.status_code";
 
 /**
  * Deprecated, use {@code url.path} and {@code url.query} instead.
  *
  * @deprecated Deprecated, use `url.path` and `url.query` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpTarget = "http.target";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpTarget = "http.target";
 
 /**
  * Deprecated, use {@code url.full} instead.
  *
  * @deprecated Deprecated, use `url.full` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpUrl = "http.url";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUrl = "http.url";
 
 /**
  * Deprecated, use {@code user_agent.original} instead.
  *
  * @deprecated Deprecated, use `user_agent.original` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpUserAgent = "http.user_agent";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUserAgent = "http.user_agent";
 
 /**
  * Deprecated use the {@code device.app.lifecycle} event definition including {@code ios.state} as a
@@ -1330,16 +1304,14 @@ static constexpr const char *kHttpUserAgent = "http.user_agent";
  * @deprecated Deprecated use the `device.app.lifecycle` event definition including `ios.state` as a
  payload field instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kIosState = "ios.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kIosState = "ios.state";
 
 /**
  * Deprecated, no replacement at this time.
  *
  * @deprecated Deprecated, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingDestinationPublishAnonymous =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishAnonymous =
     "messaging.destination_publish.anonymous";
 
 /**
@@ -1347,8 +1319,7 @@ static constexpr const char *kMessagingDestinationPublishAnonymous =
  *
  * @deprecated Deprecated, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingDestinationPublishName =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishName =
     "messaging.destination_publish.name";
 
 /**
@@ -1356,8 +1327,7 @@ static constexpr const char *kMessagingDestinationPublishName =
  *
  * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingEventhubsConsumerGroup =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingEventhubsConsumerGroup =
     "messaging.eventhubs.consumer.group";
 
 /**
@@ -1365,16 +1335,15 @@ static constexpr const char *kMessagingEventhubsConsumerGroup =
  *
  * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingKafkaConsumerGroup = "messaging.kafka.consumer.group";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaConsumerGroup =
+    "messaging.kafka.consumer.group";
 
 /**
  * Deprecated, use {@code messaging.destination.partition.id} instead.
  *
  * @deprecated Deprecated, use `messaging.destination.partition.id` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingKafkaDestinationPartition =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaDestinationPartition =
     "messaging.kafka.destination.partition";
 
 /**
@@ -1382,65 +1351,60 @@ static constexpr const char *kMessagingKafkaDestinationPartition =
  *
  * @deprecated Deprecated, use `messaging.kafka.offset` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingKafkaMessageOffset = "messaging.kafka.message.offset";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaMessageOffset =
+    "messaging.kafka.message.offset";
 
 /**
  * Deprecated, use {@code messaging.operation.type} instead.
  *
  * @deprecated Deprecated, use `messaging.operation.type` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingOperation = "messaging.operation";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingOperation = "messaging.operation";
 
 /**
  * Deprecated, use {@code messaging.consumer.group.name} instead.
  *
  * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingRocketmqClientGroup = "messaging.rocketmq.client_group";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingRocketmqClientGroup =
+    "messaging.rocketmq.client_group";
 
 /**
  * Deprecated, use {@code messaging.servicebus.destination.subscription_name} instead.
  *
  * @deprecated Deprecated, use `messaging.servicebus.destination.subscription_name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingServicebusDestinationSubscriptionName =
-    "messaging.servicebus.destination.subscription_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *kMessagingServicebusDestinationSubscriptionName =
+        "messaging.servicebus.destination.subscription_name";
 
 /**
  * Deprecated, use {@code network.local.address}.
  *
  * @deprecated Deprecated, use `network.local.address`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetHostIp = "net.host.ip";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostIp = "net.host.ip";
 
 /**
  * Deprecated, use {@code server.address}.
  *
  * @deprecated Deprecated, use `server.address`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetHostName = "net.host.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostName = "net.host.name";
 
 /**
  * Deprecated, use {@code server.port}.
  *
  * @deprecated Deprecated, use `server.port`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetHostPort = "net.host.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostPort = "net.host.port";
 
 /**
  * Deprecated, use {@code network.peer.address}.
  *
  * @deprecated Deprecated, use `network.peer.address`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetPeerIp = "net.peer.ip";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerIp = "net.peer.ip";
 
 /**
  * Deprecated, use {@code server.address} on client spans and {@code client.address} on server
@@ -1449,168 +1413,151 @@ static constexpr const char *kNetPeerIp = "net.peer.ip";
  * @deprecated Deprecated, use `server.address` on client spans and `client.address` on server
  * spans.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetPeerName = "net.peer.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerName = "net.peer.name";
 
 /**
  * Deprecated, use {@code server.port} on client spans and {@code client.port} on server spans.
  *
  * @deprecated Deprecated, use `server.port` on client spans and `client.port` on server spans.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetPeerPort = "net.peer.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerPort = "net.peer.port";
 
 /**
  * Deprecated, use {@code network.protocol.name}.
  *
  * @deprecated Deprecated, use `network.protocol.name`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetProtocolName = "net.protocol.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolName = "net.protocol.name";
 
 /**
  * Deprecated, use {@code network.protocol.version}.
  *
  * @deprecated Deprecated, use `network.protocol.version`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetProtocolVersion = "net.protocol.version";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolVersion = "net.protocol.version";
 
 /**
  * Deprecated, use {@code network.transport} and {@code network.type}.
  *
  * @deprecated Deprecated, use `network.transport` and `network.type`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockFamily = "net.sock.family";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockFamily = "net.sock.family";
 
 /**
  * Deprecated, use {@code network.local.address}.
  *
  * @deprecated Deprecated, use `network.local.address`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
 
 /**
  * Deprecated, use {@code network.local.port}.
  *
  * @deprecated Deprecated, use `network.local.port`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockHostPort = "net.sock.host.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostPort = "net.sock.host.port";
 
 /**
  * Deprecated, use {@code network.peer.address}.
  *
  * @deprecated Deprecated, use `network.peer.address`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
 
 /**
  * Deprecated, no replacement at this time.
  *
  * @deprecated Deprecated, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
 
 /**
  * Deprecated, use {@code network.peer.port}.
  *
  * @deprecated Deprecated, use `network.peer.port`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
 
 /**
  * Deprecated, use {@code network.transport}.
  *
  * @deprecated Deprecated, use `network.transport`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetTransport = "net.transport";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetTransport = "net.transport";
 
 /**
  *
  *
  * @deprecated .
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kOtelLibraryName = "otel.library.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryName = "otel.library.name";
 
 /**
  *
  *
  * @deprecated .
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kOtelLibraryVersion = "otel.library.version";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryVersion = "otel.library.version";
 
 /**
  * Deprecated, use {@code cpu.mode} instead.
  *
  * @deprecated Deprecated, use `cpu.mode` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kProcessCpuState = "process.cpu.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessCpuState = "process.cpu.state";
 
 /**
  * Deprecated, use {@code rpc.message.compressed_size} instead.
  *
  * @deprecated Deprecated, use `rpc.message.compressed_size` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageCompressedSize = "message.compressed_size";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageCompressedSize =
+    "message.compressed_size";
 
 /**
  * Deprecated, use {@code rpc.message.id} instead.
  *
  * @deprecated Deprecated, use `rpc.message.id` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageId = "message.id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageId = "message.id";
 
 /**
  * Deprecated, use {@code rpc.message.type} instead.
  *
  * @deprecated Deprecated, use `rpc.message.type` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageType = "message.type";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageType = "message.type";
 
 /**
  * Deprecated, use {@code rpc.message.uncompressed_size} instead.
  *
  * @deprecated Deprecated, use `rpc.message.uncompressed_size` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageUncompressedSize = "message.uncompressed_size";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageUncompressedSize =
+    "message.uncompressed_size";
 
 /**
  * Deprecated, use {@code cpu.mode} instead.
  *
  * @deprecated Deprecated, use `cpu.mode` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kSystemCpuState = "system.cpu.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemCpuState = "system.cpu.state";
 
 /**
  * Deprecated, use {@code system.process.status} instead.
  *
  * @deprecated Deprecated, use `system.process.status` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kSystemProcessesStatus = "system.processes.status";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemProcessesStatus =
+    "system.processes.status";
 
 /**
  * Deprecated, use {@code server.address} instead.
  *
  * @deprecated Deprecated, use `server.address` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kTlsClientServerName = "tls.client.server_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kTlsClientServerName =
+    "tls.client.server_name";
 
 /**
  * Destination address - domain name if available without reverse DNS lookup; otherwise, IP address
diff --git a/api/test/logs/logger_test.cc b/api/test/logs/logger_test.cc
index 4f62473d77..6265705308 100644
--- a/api/test/logs/logger_test.cc
+++ b/api/test/logs/logger_test.cc
@@ -160,6 +160,7 @@ TEST(Logger, LogMethodOverloads)
                 opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
 }
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 TEST(Logger, EventLogMethodOverloads)
 {
   auto lp = Provider::GetLoggerProvider();
@@ -191,6 +192,7 @@ TEST(Logger, EventLogMethodOverloads)
   event_logger->EmitEvent("event name", Severity::kDebug,
                           opentelemetry::common::MakeAttributes(vec));
 }
+#endif
 
 // Define a basic Logger class
 class TestLogger : public Logger
diff --git a/api/test/logs/provider_test.cc b/api/test/logs/provider_test.cc
index f3b45264e5..4a2dd23255 100644
--- a/api/test/logs/provider_test.cc
+++ b/api/test/logs/provider_test.cc
@@ -13,8 +13,10 @@
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 using opentelemetry::logs::EventLogger;
 using opentelemetry::logs::EventLoggerProvider;
+#endif
 using opentelemetry::logs::Logger;
 using opentelemetry::logs::LoggerProvider;
 using opentelemetry::logs::Provider;
@@ -71,6 +73,7 @@ TEST(Provider, GetLogger)
   EXPECT_EQ(nullptr, logger2);
 }
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 class TestEventLoggerProvider : public EventLoggerProvider
 {
 public:
@@ -112,3 +115,4 @@ TEST(Provider, CreateEventLogger)
 
   EXPECT_EQ(nullptr, logger);
 }
+#endif
diff --git a/exporters/elasticsearch/src/es_log_record_exporter.cc b/exporters/elasticsearch/src/es_log_record_exporter.cc
index cb7386f3da..d20453b9d2 100644
--- a/exporters/elasticsearch/src/es_log_record_exporter.cc
+++ b/exporters/elasticsearch/src/es_log_record_exporter.cc
@@ -420,8 +420,8 @@ sdk::common::ExportResult ElasticsearchLogRecordExporter::Export(
 #endif
 }
 
-bool ElasticsearchLogRecordExporter::ForceFlush(
-    std::chrono::microseconds timeout OPENTELEMETRY_MAYBE_UNUSED) noexcept
+bool ElasticsearchLogRecordExporter::ForceFlush(std::chrono::microseconds timeout
+                                                OPENTELEMETRY_MAYBE_UNUSED) noexcept
 {
 #ifdef ENABLE_ASYNC_EXPORT
   std::lock_guard<std::recursive_mutex> lock_guard{synchronization_data_->force_flush_m};
diff --git a/sdk/include/opentelemetry/sdk/logs/event_logger.h b/sdk/include/opentelemetry/sdk/logs/event_logger.h
index d9e83b9998..dcb93cb2d4 100644
--- a/sdk/include/opentelemetry/sdk/logs/event_logger.h
+++ b/sdk/include/opentelemetry/sdk/logs/event_logger.h
@@ -18,7 +18,8 @@ namespace sdk
 {
 namespace logs
 {
-class EventLogger final : public opentelemetry::logs::EventLogger
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
+class OPENTELEMETRY_DEPRECATED EventLogger final : public opentelemetry::logs::EventLogger
 {
 public:
   /**
@@ -45,7 +46,7 @@ class EventLogger final : public opentelemetry::logs::EventLogger
   nostd::shared_ptr<opentelemetry::logs::Logger> delegate_logger_;
   std::string event_domain_;
 };
-
+#endif
 }  // namespace logs
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h b/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h
index 9e7ff4d866..351985c331 100644
--- a/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h
+++ b/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h
@@ -19,7 +19,8 @@ namespace sdk
 {
 namespace logs
 {
-class OPENTELEMETRY_EXPORT EventLoggerProvider final
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
+class OPENTELEMETRY_EXPORT OPENTELEMETRY_DEPRECATED EventLoggerProvider final
     : public opentelemetry::logs::EventLoggerProvider
 {
 public:
@@ -31,6 +32,7 @@ class OPENTELEMETRY_EXPORT EventLoggerProvider final
       nostd::shared_ptr<opentelemetry::logs::Logger> delegate_logger,
       nostd::string_view event_domain) noexcept override;
 };
+#endif
 }  // namespace logs
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/sdk/include/opentelemetry/sdk/logs/event_logger_provider_factory.h b/sdk/include/opentelemetry/sdk/logs/event_logger_provider_factory.h
index 5559605171..a57112d769 100644
--- a/sdk/include/opentelemetry/sdk/logs/event_logger_provider_factory.h
+++ b/sdk/include/opentelemetry/sdk/logs/event_logger_provider_factory.h
@@ -14,18 +14,21 @@ namespace sdk
 namespace logs
 {
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 /**
  * Factory class for EventLoggerProvider.
  */
-class EventLoggerProviderFactory
+class OPENTELEMETRY_DEPRECATED EventLoggerProviderFactory
 {
 public:
   /**
    * Create a EventLoggerProvider.
    */
 
-  static std::unique_ptr<opentelemetry::sdk::logs::EventLoggerProvider> Create();
+  OPENTELEMETRY_DEPRECATED static std::unique_ptr<opentelemetry::sdk::logs::EventLoggerProvider>
+  Create();
 };
+#endif
 
 }  // namespace logs
 }  // namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h b/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h
index 0e4d288d6e..6e5b799e3f 100644
--- a/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h
+++ b/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h
@@ -83,7 +83,7 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
 
   void RecordLong(int64_t value,
                   const opentelemetry::context::Context &context
-                      OPENTELEMETRY_MAYBE_UNUSED) noexcept override
+                  OPENTELEMETRY_MAYBE_UNUSED) noexcept override
   {
     if (instrument_descriptor_.value_type_ != InstrumentValueType::kLong)
     {
@@ -103,7 +103,7 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
   void RecordLong(int64_t value,
                   const opentelemetry::common::KeyValueIterable &attributes,
                   const opentelemetry::context::Context &context
-                      OPENTELEMETRY_MAYBE_UNUSED) noexcept override
+                  OPENTELEMETRY_MAYBE_UNUSED) noexcept override
   {
     if (instrument_descriptor_.value_type_ != InstrumentValueType::kLong)
     {
@@ -136,7 +136,7 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
 
   void RecordDouble(double value,
                     const opentelemetry::context::Context &context
-                        OPENTELEMETRY_MAYBE_UNUSED) noexcept override
+                    OPENTELEMETRY_MAYBE_UNUSED) noexcept override
   {
     if (instrument_descriptor_.value_type_ != InstrumentValueType::kDouble)
     {
@@ -156,7 +156,7 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
   void RecordDouble(double value,
                     const opentelemetry::common::KeyValueIterable &attributes,
                     const opentelemetry::context::Context &context
-                        OPENTELEMETRY_MAYBE_UNUSED) noexcept override
+                    OPENTELEMETRY_MAYBE_UNUSED) noexcept override
   {
     if (instrument_descriptor_.value_type_ != InstrumentValueType::kDouble)
     {
diff --git a/sdk/include/opentelemetry/sdk/resource/semantic_conventions.h b/sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
index 1c11ba68f9..096c9ae21d 100644
--- a/sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
+++ b/sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
@@ -1006,40 +1006,37 @@ static constexpr const char *kAndroidState = "android.state";
  *
  * @deprecated Deprecated, use `cpu.mode` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kContainerCpuState = "container.cpu.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerCpuState = "container.cpu.state";
 
 /**
  * Deprecated, use {@code db.collection.name} instead.
  *
  * @deprecated Deprecated, use `db.collection.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCassandraTable = "db.cassandra.table";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraTable = "db.cassandra.table";
 
 /**
  * Deprecated, use {@code server.address}, {@code server.port} attributes instead.
  *
  * @deprecated Deprecated, use `server.address`, `server.port` attributes instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbConnectionString = "db.connection_string";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbConnectionString = "db.connection_string";
 
 /**
  * Deprecated, use {@code db.collection.name} instead.
  *
  * @deprecated Deprecated, use `db.collection.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbCosmosdbContainer = "db.cosmosdb.container";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbContainer =
+    "db.cosmosdb.container";
 
 /**
  * Deprecated, use {@code db.namespace} instead.
  *
  * @deprecated Deprecated, use `db.namespace` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbElasticsearchClusterName = "db.elasticsearch.cluster.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchClusterName =
+    "db.elasticsearch.cluster.name";
 
 /**
  * Deprecated, no general replacement at this time. For Elasticsearch, use {@code
@@ -1048,24 +1045,23 @@ static constexpr const char *kDbElasticsearchClusterName = "db.elasticsearch.clu
  * @deprecated Deprecated, no general replacement at this time. For Elasticsearch, use
  * `db.elasticsearch.node.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbInstanceId = "db.instance.id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbInstanceId = "db.instance.id";
 
 /**
  * Removed, no replacement at this time.
  *
  * @deprecated Removed, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbJdbcDriverClassname = "db.jdbc.driver_classname";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbJdbcDriverClassname =
+    "db.jdbc.driver_classname";
 
 /**
  * Deprecated, use {@code db.collection.name} instead.
  *
  * @deprecated Deprecated, use `db.collection.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbMongodbCollection = "db.mongodb.collection";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMongodbCollection =
+    "db.mongodb.collection";
 
 /**
  * Deprecated, SQL Server instance is now populated as a part of {@code db.namespace} attribute.
@@ -1073,152 +1069,140 @@ static constexpr const char *kDbMongodbCollection = "db.mongodb.collection";
  * @deprecated Deprecated, SQL Server instance is now populated as a part of `db.namespace`
  * attribute.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbMssqlInstanceName = "db.mssql.instance_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMssqlInstanceName =
+    "db.mssql.instance_name";
 
 /**
  * Deprecated, use {@code db.namespace} instead.
  *
  * @deprecated Deprecated, use `db.namespace` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbName = "db.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbName = "db.name";
 
 /**
  * Deprecated, use {@code db.operation.name} instead.
  *
  * @deprecated Deprecated, use `db.operation.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbOperation = "db.operation";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbOperation = "db.operation";
 
 /**
  * Deprecated, use {@code db.namespace} instead.
  *
  * @deprecated Deprecated, use `db.namespace` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbRedisDatabaseIndex = "db.redis.database_index";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbRedisDatabaseIndex =
+    "db.redis.database_index";
 
 /**
  * Deprecated, use {@code db.collection.name} instead.
  *
  * @deprecated Deprecated, use `db.collection.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbSqlTable = "db.sql.table";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbSqlTable = "db.sql.table";
 
 /**
  * The database statement being executed.
  *
  * @deprecated The database statement being executed.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbStatement = "db.statement";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbStatement = "db.statement";
 
 /**
  * Deprecated, no replacement at this time.
  *
  * @deprecated Deprecated, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbUser = "db.user";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbUser = "db.user";
 
 /**
  * Deprecated, use {@code db.client.connection.pool.name} instead.
  *
  * @deprecated Deprecated, use `db.client.connection.pool.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbClientConnectionsPoolName = "db.client.connections.pool.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsPoolName =
+    "db.client.connections.pool.name";
 
 /**
  * Deprecated, use {@code db.client.connection.state} instead.
  *
  * @deprecated Deprecated, use `db.client.connection.state` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDbClientConnectionsState = "db.client.connections.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsState =
+    "db.client.connections.state";
 
 /**
  * Deprecated, use {@code db.client.connection.pool.name} instead.
  *
  * @deprecated Deprecated, use `db.client.connection.pool.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kPoolName = "pool.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kPoolName = "pool.name";
 
 /**
  * Deprecated, use {@code db.client.connection.state} instead.
  *
  * @deprecated Deprecated, use `db.client.connection.state` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kState = "state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kState = "state";
 
 /**
  * 'Deprecated, use {@code deployment.environment.name} instead.'
  *
  * @deprecated 'Deprecated, use `deployment.environment.name` instead.'.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kDeploymentEnvironment = "deployment.environment";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kDeploymentEnvironment =
+    "deployment.environment";
 
 /**
  * Deprecated, use {@code user.id} instead.
  *
  * @deprecated Deprecated, use `user.id` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kEnduserId = "enduser.id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserId = "enduser.id";
 
 /**
  * Deprecated, use {@code user.roles} instead.
  *
  * @deprecated Deprecated, use `user.roles` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kEnduserRole = "enduser.role";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserRole = "enduser.role";
 
 /**
  * Deprecated, no replacement at this time.
  *
  * @deprecated Deprecated, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kEnduserScope = "enduser.scope";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserScope = "enduser.scope";
 
 /**
  * Deprecated, use {@code gen_ai.usage.output_tokens} instead.
  *
  * @deprecated Deprecated, use `gen_ai.usage.output_tokens` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kGenAiUsageCompletionTokens = "gen_ai.usage.completion_tokens";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsageCompletionTokens =
+    "gen_ai.usage.completion_tokens";
 
 /**
  * Deprecated, use {@code gen_ai.usage.input_tokens} instead.
  *
  * @deprecated Deprecated, use `gen_ai.usage.input_tokens` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kGenAiUsagePromptTokens = "gen_ai.usage.prompt_tokens";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsagePromptTokens =
+    "gen_ai.usage.prompt_tokens";
 
 /**
  * Deprecated, use {@code client.address} instead.
  *
  * @deprecated Deprecated, use `client.address` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpClientIp = "http.client_ip";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpClientIp = "http.client_ip";
 
 /**
  * Deprecated, use {@code network.protocol.name} instead.
  *
  * @deprecated Deprecated, use `network.protocol.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpFlavor = "http.flavor";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpFlavor = "http.flavor";
 
 /**
  * Deprecated, use one of {@code server.address}, {@code client.address} or {@code
@@ -1227,32 +1211,29 @@ static constexpr const char *kHttpFlavor = "http.flavor";
  * @deprecated Deprecated, use one of `server.address`, `client.address` or
  * `http.request.header.host` instead, depending on the usage.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpHost = "http.host";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpHost = "http.host";
 
 /**
  * Deprecated, use {@code http.request.method} instead.
  *
  * @deprecated Deprecated, use `http.request.method` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpMethod = "http.method";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpMethod = "http.method";
 
 /**
  * Deprecated, use {@code http.request.header.content-length} instead.
  *
  * @deprecated Deprecated, use `http.request.header.content-length` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpRequestContentLength = "http.request_content_length";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLength =
+    "http.request_content_length";
 
 /**
  * Deprecated, use {@code http.request.body.size} instead.
  *
  * @deprecated Deprecated, use `http.request.body.size` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpRequestContentLengthUncompressed =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLengthUncompressed =
     "http.request_content_length_uncompressed";
 
 /**
@@ -1260,16 +1241,15 @@ static constexpr const char *kHttpRequestContentLengthUncompressed =
  *
  * @deprecated Deprecated, use `http.response.header.content-length` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpResponseContentLength = "http.response_content_length";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLength =
+    "http.response_content_length";
 
 /**
  * Deprecated, use {@code http.response.body.size} instead.
  *
  * @deprecated Deprecated, use `http.response.body.size` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpResponseContentLengthUncompressed =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLengthUncompressed =
     "http.response_content_length_uncompressed";
 
 /**
@@ -1277,48 +1257,42 @@ static constexpr const char *kHttpResponseContentLengthUncompressed =
  *
  * @deprecated Deprecated, use `url.scheme` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpScheme = "http.scheme";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpScheme = "http.scheme";
 
 /**
  * Deprecated, use {@code server.address} instead.
  *
  * @deprecated Deprecated, use `server.address` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpServerName = "http.server_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpServerName = "http.server_name";
 
 /**
  * Deprecated, use {@code http.response.status_code} instead.
  *
  * @deprecated Deprecated, use `http.response.status_code` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpStatusCode = "http.status_code";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpStatusCode = "http.status_code";
 
 /**
  * Deprecated, use {@code url.path} and {@code url.query} instead.
  *
  * @deprecated Deprecated, use `url.path` and `url.query` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpTarget = "http.target";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpTarget = "http.target";
 
 /**
  * Deprecated, use {@code url.full} instead.
  *
  * @deprecated Deprecated, use `url.full` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpUrl = "http.url";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUrl = "http.url";
 
 /**
  * Deprecated, use {@code user_agent.original} instead.
  *
  * @deprecated Deprecated, use `user_agent.original` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kHttpUserAgent = "http.user_agent";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUserAgent = "http.user_agent";
 
 /**
  * Deprecated use the {@code device.app.lifecycle} event definition including {@code ios.state} as a
@@ -1332,16 +1306,14 @@ static constexpr const char *kHttpUserAgent = "http.user_agent";
  * @deprecated Deprecated use the `device.app.lifecycle` event definition including `ios.state` as a
  payload field instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kIosState = "ios.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kIosState = "ios.state";
 
 /**
  * Deprecated, no replacement at this time.
  *
  * @deprecated Deprecated, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingDestinationPublishAnonymous =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishAnonymous =
     "messaging.destination_publish.anonymous";
 
 /**
@@ -1349,8 +1321,7 @@ static constexpr const char *kMessagingDestinationPublishAnonymous =
  *
  * @deprecated Deprecated, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingDestinationPublishName =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishName =
     "messaging.destination_publish.name";
 
 /**
@@ -1358,8 +1329,7 @@ static constexpr const char *kMessagingDestinationPublishName =
  *
  * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingEventhubsConsumerGroup =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingEventhubsConsumerGroup =
     "messaging.eventhubs.consumer.group";
 
 /**
@@ -1367,16 +1337,15 @@ static constexpr const char *kMessagingEventhubsConsumerGroup =
  *
  * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingKafkaConsumerGroup = "messaging.kafka.consumer.group";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaConsumerGroup =
+    "messaging.kafka.consumer.group";
 
 /**
  * Deprecated, use {@code messaging.destination.partition.id} instead.
  *
  * @deprecated Deprecated, use `messaging.destination.partition.id` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingKafkaDestinationPartition =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaDestinationPartition =
     "messaging.kafka.destination.partition";
 
 /**
@@ -1384,65 +1353,60 @@ static constexpr const char *kMessagingKafkaDestinationPartition =
  *
  * @deprecated Deprecated, use `messaging.kafka.offset` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingKafkaMessageOffset = "messaging.kafka.message.offset";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaMessageOffset =
+    "messaging.kafka.message.offset";
 
 /**
  * Deprecated, use {@code messaging.operation.type} instead.
  *
  * @deprecated Deprecated, use `messaging.operation.type` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingOperation = "messaging.operation";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingOperation = "messaging.operation";
 
 /**
  * Deprecated, use {@code messaging.consumer.group.name} instead.
  *
  * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingRocketmqClientGroup = "messaging.rocketmq.client_group";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingRocketmqClientGroup =
+    "messaging.rocketmq.client_group";
 
 /**
  * Deprecated, use {@code messaging.servicebus.destination.subscription_name} instead.
  *
  * @deprecated Deprecated, use `messaging.servicebus.destination.subscription_name` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessagingServicebusDestinationSubscriptionName =
-    "messaging.servicebus.destination.subscription_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *kMessagingServicebusDestinationSubscriptionName =
+        "messaging.servicebus.destination.subscription_name";
 
 /**
  * Deprecated, use {@code network.local.address}.
  *
  * @deprecated Deprecated, use `network.local.address`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetHostIp = "net.host.ip";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostIp = "net.host.ip";
 
 /**
  * Deprecated, use {@code server.address}.
  *
  * @deprecated Deprecated, use `server.address`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetHostName = "net.host.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostName = "net.host.name";
 
 /**
  * Deprecated, use {@code server.port}.
  *
  * @deprecated Deprecated, use `server.port`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetHostPort = "net.host.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostPort = "net.host.port";
 
 /**
  * Deprecated, use {@code network.peer.address}.
  *
  * @deprecated Deprecated, use `network.peer.address`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetPeerIp = "net.peer.ip";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerIp = "net.peer.ip";
 
 /**
  * Deprecated, use {@code server.address} on client spans and {@code client.address} on server
@@ -1451,168 +1415,151 @@ static constexpr const char *kNetPeerIp = "net.peer.ip";
  * @deprecated Deprecated, use `server.address` on client spans and `client.address` on server
  * spans.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetPeerName = "net.peer.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerName = "net.peer.name";
 
 /**
  * Deprecated, use {@code server.port} on client spans and {@code client.port} on server spans.
  *
  * @deprecated Deprecated, use `server.port` on client spans and `client.port` on server spans.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetPeerPort = "net.peer.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerPort = "net.peer.port";
 
 /**
  * Deprecated, use {@code network.protocol.name}.
  *
  * @deprecated Deprecated, use `network.protocol.name`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetProtocolName = "net.protocol.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolName = "net.protocol.name";
 
 /**
  * Deprecated, use {@code network.protocol.version}.
  *
  * @deprecated Deprecated, use `network.protocol.version`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetProtocolVersion = "net.protocol.version";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolVersion = "net.protocol.version";
 
 /**
  * Deprecated, use {@code network.transport} and {@code network.type}.
  *
  * @deprecated Deprecated, use `network.transport` and `network.type`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockFamily = "net.sock.family";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockFamily = "net.sock.family";
 
 /**
  * Deprecated, use {@code network.local.address}.
  *
  * @deprecated Deprecated, use `network.local.address`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
 
 /**
  * Deprecated, use {@code network.local.port}.
  *
  * @deprecated Deprecated, use `network.local.port`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockHostPort = "net.sock.host.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostPort = "net.sock.host.port";
 
 /**
  * Deprecated, use {@code network.peer.address}.
  *
  * @deprecated Deprecated, use `network.peer.address`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
 
 /**
  * Deprecated, no replacement at this time.
  *
  * @deprecated Deprecated, no replacement at this time.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
 
 /**
  * Deprecated, use {@code network.peer.port}.
  *
  * @deprecated Deprecated, use `network.peer.port`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
 
 /**
  * Deprecated, use {@code network.transport}.
  *
  * @deprecated Deprecated, use `network.transport`.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kNetTransport = "net.transport";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kNetTransport = "net.transport";
 
 /**
  *
  *
  * @deprecated .
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kOtelLibraryName = "otel.library.name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryName = "otel.library.name";
 
 /**
  *
  *
  * @deprecated .
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kOtelLibraryVersion = "otel.library.version";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryVersion = "otel.library.version";
 
 /**
  * Deprecated, use {@code cpu.mode} instead.
  *
  * @deprecated Deprecated, use `cpu.mode` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kProcessCpuState = "process.cpu.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessCpuState = "process.cpu.state";
 
 /**
  * Deprecated, use {@code rpc.message.compressed_size} instead.
  *
  * @deprecated Deprecated, use `rpc.message.compressed_size` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageCompressedSize = "message.compressed_size";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageCompressedSize =
+    "message.compressed_size";
 
 /**
  * Deprecated, use {@code rpc.message.id} instead.
  *
  * @deprecated Deprecated, use `rpc.message.id` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageId = "message.id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageId = "message.id";
 
 /**
  * Deprecated, use {@code rpc.message.type} instead.
  *
  * @deprecated Deprecated, use `rpc.message.type` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageType = "message.type";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageType = "message.type";
 
 /**
  * Deprecated, use {@code rpc.message.uncompressed_size} instead.
  *
  * @deprecated Deprecated, use `rpc.message.uncompressed_size` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kMessageUncompressedSize = "message.uncompressed_size";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageUncompressedSize =
+    "message.uncompressed_size";
 
 /**
  * Deprecated, use {@code cpu.mode} instead.
  *
  * @deprecated Deprecated, use `cpu.mode` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kSystemCpuState = "system.cpu.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemCpuState = "system.cpu.state";
 
 /**
  * Deprecated, use {@code system.process.status} instead.
  *
  * @deprecated Deprecated, use `system.process.status` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kSystemProcessesStatus = "system.processes.status";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemProcessesStatus =
+    "system.processes.status";
 
 /**
  * Deprecated, use {@code server.address} instead.
  *
  * @deprecated Deprecated, use `server.address` instead.
  */
-OPENTELEMETRY_DEPRECATED
-static constexpr const char *kTlsClientServerName = "tls.client.server_name";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kTlsClientServerName =
+    "tls.client.server_name";
 
 /**
  * Destination address - domain name if available without reverse DNS lookup; otherwise, IP address
diff --git a/sdk/src/logs/event_logger.cc b/sdk/src/logs/event_logger.cc
index df9ba44c31..4a8c7d1c0f 100644
--- a/sdk/src/logs/event_logger.cc
+++ b/sdk/src/logs/event_logger.cc
@@ -17,7 +17,7 @@ namespace sdk
 {
 namespace logs
 {
-
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 EventLogger::EventLogger(
     opentelemetry::nostd::shared_ptr<opentelemetry::logs::Logger> delegate_logger,
     opentelemetry::nostd::string_view event_domain) noexcept
@@ -57,7 +57,7 @@ void EventLogger::EmitEvent(
 
   delegate_logger_->EmitLogRecord(std::move(log_record));
 }
-
+#endif
 }  // namespace logs
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/sdk/src/logs/event_logger_provider.cc b/sdk/src/logs/event_logger_provider.cc
index 570a64f82d..04e4216584 100644
--- a/sdk/src/logs/event_logger_provider.cc
+++ b/sdk/src/logs/event_logger_provider.cc
@@ -12,7 +12,7 @@ namespace sdk
 {
 namespace logs
 {
-
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 EventLoggerProvider::EventLoggerProvider() noexcept
 {
   OTEL_INTERNAL_LOG_DEBUG("[EventLoggerProvider] EventLoggerProvider created.");
@@ -28,7 +28,7 @@ EventLoggerProvider::CreateEventLogger(
   return opentelemetry::nostd::shared_ptr<opentelemetry::logs::EventLogger>{
       new EventLogger(delegate_logger, event_domain)};
 }
-
+#endif
 }  // namespace logs
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/sdk/src/logs/event_logger_provider_factory.cc b/sdk/src/logs/event_logger_provider_factory.cc
index daff8a8590..e1c7284e3e 100644
--- a/sdk/src/logs/event_logger_provider_factory.cc
+++ b/sdk/src/logs/event_logger_provider_factory.cc
@@ -10,12 +10,12 @@ namespace sdk
 {
 namespace logs
 {
-
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 std::unique_ptr<opentelemetry::sdk::logs::EventLoggerProvider> EventLoggerProviderFactory::Create()
 {
   return std::unique_ptr<opentelemetry::sdk::logs::EventLoggerProvider>(new EventLoggerProvider());
 }
-
+#endif
 }  // namespace logs
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/sdk/test/logs/logger_provider_sdk_test.cc b/sdk/test/logs/logger_provider_sdk_test.cc
index bace13361f..9a20fb13d1 100644
--- a/sdk/test/logs/logger_provider_sdk_test.cc
+++ b/sdk/test/logs/logger_provider_sdk_test.cc
@@ -118,6 +118,7 @@ TEST(LoggerProviderSDK, LoggerProviderLoggerArguments)
   }
 }
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 TEST(LoggerProviderSDK, EventLoggerProviderFactory)
 {
   auto elp = opentelemetry::sdk::logs::EventLoggerProviderFactory::Create();
@@ -128,6 +129,7 @@ TEST(LoggerProviderSDK, EventLoggerProviderFactory)
 
   auto event_logger = elp->CreateEventLogger(logger1, "otel-cpp.test");
 }
+#endif
 
 TEST(LoggerProviderSDK, LoggerEqualityCheck)
 {
diff --git a/sdk/test/logs/logger_provider_set_test.cc b/sdk/test/logs/logger_provider_set_test.cc
index 40e4790e93..01ac0ee0e5 100644
--- a/sdk/test/logs/logger_provider_set_test.cc
+++ b/sdk/test/logs/logger_provider_set_test.cc
@@ -20,8 +20,10 @@ using opentelemetry::sdk::common::setenv;
 using opentelemetry::sdk::common::unsetenv;
 #endif
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 using opentelemetry::logs::EventLogger;
 using opentelemetry::logs::EventLoggerProvider;
+#endif
 using opentelemetry::logs::Logger;
 using opentelemetry::logs::LoggerProvider;
 using opentelemetry::logs::Provider;
diff --git a/sdk/test/logs/logger_sdk_test.cc b/sdk/test/logs/logger_sdk_test.cc
index 6ec5e616dd..53f9cf4638 100644
--- a/sdk/test/logs/logger_sdk_test.cc
+++ b/sdk/test/logs/logger_sdk_test.cc
@@ -275,6 +275,7 @@ TEST(LoggerSDK, LogToAProcessor)
       now);
 }
 
+#if OPENTELEMETRY_ABI_VERSION_NO < 2
 TEST(LoggerSDK, EventLog)
 {
   // Create an API LoggerProvider and logger
@@ -303,3 +304,4 @@ TEST(LoggerSDK, EventLog)
   ASSERT_EQ(shared_recordable->GetEventName(), "otel-cpp.event_name");
   ASSERT_EQ(shared_recordable->GetEventDomain(), "otel-cpp.event_domain");
 }
+#endif