sync changes in shared files (#5432)

Co-authored-by: Mikel Blanchard <mblanchard@macrosssoftware.com>

src/Shared/ActivityInstrumentationHelper.cs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Diagnostics;
-#pragma warning restore IDE0005
 
 namespace OpenTelemetry.Instrumentation;
 

src/Shared/ResourceSemanticConventions.cs

@@ -45,9 +45,17 @@ internal static class ResourceSemanticConventions
     public const string AttributeProcessCommandLine = "process.command_line";
     public const string AttributeProcessUsername = "process.username";
 
-    public const string AttributeCloudProvider = "cloud.provider";
     public const string AttributeCloudAccount = "cloud.account.id";
+    public const string AttributeCloudPlatform = "cloud.platform";
+    public const string AttributeCloudProvider = "cloud.provider";
     public const string AttributeCloudRegion = "cloud.region";
+    public const string AttributeCloudResourceId = "cloud.resource_id";
     public const string AttributeCloudZone = "cloud.zone";
+
     public const string AttributeComponent = "component";
+
+    public const string AttributeOsType = "os.type";
+    public const string AttributeOsVersion = "os.version";
+
+    public const string AttributeDeploymentEnvironment = "deployment.environment";
 }

src/Shared/SemanticConventions.cs

@@ -100,22 +100,23 @@ internal static class SemanticConventions
     public const string AttributeErrorType = "error.type";
 
     // v1.21.0
-    // https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/http/http-spans.md
     // https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/database/database-spans.md
-    // https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/rpc/rpc-spans.md
+    public const string AttributeServerSocketAddress = "server.socket.address"; // replaces: "net.peer.ip" (AttributeNetPeerIp)
+
+    // v1.23.0
+    // https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-spans.md
     public const string AttributeClientAddress = "client.address";
     public const string AttributeClientPort = "client.port";
     public const string AttributeHttpRequestMethod = "http.request.method"; // replaces: "http.method" (AttributeHttpMethod)
+    public const string AttributeHttpRequestMethodOriginal = "http.request.method_original";
     public const string AttributeHttpResponseStatusCode = "http.response.status_code"; // replaces: "http.status_code" (AttributeHttpStatusCode)
     public const string AttributeNetworkProtocolVersion = "network.protocol.version"; // replaces: "http.flavor" (AttributeHttpFlavor)
     public const string AttributeNetworkProtocolName = "network.protocol.name";
     public const string AttributeServerAddress = "server.address"; // replaces: "net.host.name" (AttributeNetHostName) and "net.peer.name" (AttributeNetPeerName)
     public const string AttributeServerPort = "server.port"; // replaces: "net.host.port" (AttributeNetHostPort) and "net.peer.port" (AttributeNetPeerPort)
-    public const string AttributeServerSocketAddress = "server.socket.address"; // replaces: "net.peer.ip" (AttributeNetPeerIp)
     public const string AttributeUrlFull = "url.full"; // replaces: "http.url" (AttributeHttpUrl)
     public const string AttributeUrlPath = "url.path"; // replaces: "http.target" (AttributeHttpTarget)
-    public const string AttributeUrlScheme = "url.scheme"; // replaces: "http.scheme" (AttributeHttpScheme)
     public const string AttributeUrlQuery = "url.query";
+    public const string AttributeUrlScheme = "url.scheme"; // replaces: "http.scheme" (AttributeHttpScheme)
     public const string AttributeUserAgentOriginal = "user_agent.original"; // replaces: "http.user_agent" (AttributeHttpUserAgent)
-    public const string AttributeHttpRequestMethodOriginal = "http.request.method_original";
 }