From a278335a09c3adc9a851a513f2aa9e59e3699341 Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Mon, 9 Aug 2021 21:54:01 +0200 Subject: [PATCH] Remove support for target 4.5.2 --- .../{net452 => net461}/PublicAPI.Shipped.txt | 0 .../{net452 => net461}/PublicAPI.Unshipped.txt | 14 +++++++++++++- .../netstandard2.0/PublicAPI.Unshipped.txt | 14 +++++++++++++- .../OpenTelemetry.SemanticConventions.csproj | 4 ++-- .../scripts/semantic-convetion/generate.sh | 2 +- 5 files changed, 29 insertions(+), 5 deletions(-) rename src/OpenTelemetry.SemanticConventions/.publicApi/{net452 => net461}/PublicAPI.Shipped.txt (100%) rename src/OpenTelemetry.SemanticConventions/.publicApi/{net452 => net461}/PublicAPI.Unshipped.txt (96%) diff --git a/src/OpenTelemetry.SemanticConventions/.publicApi/net452/PublicAPI.Shipped.txt b/src/OpenTelemetry.SemanticConventions/.publicApi/net461/PublicAPI.Shipped.txt similarity index 100% rename from src/OpenTelemetry.SemanticConventions/.publicApi/net452/PublicAPI.Shipped.txt rename to src/OpenTelemetry.SemanticConventions/.publicApi/net461/PublicAPI.Shipped.txt diff --git a/src/OpenTelemetry.SemanticConventions/.publicApi/net452/PublicAPI.Unshipped.txt b/src/OpenTelemetry.SemanticConventions/.publicApi/net461/PublicAPI.Unshipped.txt similarity index 96% rename from src/OpenTelemetry.SemanticConventions/.publicApi/net452/PublicAPI.Unshipped.txt rename to src/OpenTelemetry.SemanticConventions/.publicApi/net461/PublicAPI.Unshipped.txt index afe6134e47b..85c6b8bc744 100644 --- a/src/OpenTelemetry.SemanticConventions/.publicApi/net452/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.SemanticConventions/.publicApi/net461/PublicAPI.Unshipped.txt @@ -1,4 +1,4 @@ -const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeAwsEcsClusterArn = "aws.ecs.cluster.arn" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeAwsEcsClusterArn = "aws.ecs.cluster.arn" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeAwsEcsContainerArn = "aws.ecs.container.arn" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeAwsEcsLaunchtype = "aws.ecs.launchtype" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeAwsEcsTaskArn = "aws.ecs.task.arn" -> string @@ -20,6 +20,9 @@ const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeContainerImag const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeContainerName = "container.name" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeContainerRuntime = "container.runtime" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeDeploymentEnvironment = "deployment.environment" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeDeviceId = "device.id" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeDeviceModelIdentifier = "device.model.identifier" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeDeviceModelName = "device.model.name" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeFaasId = "faas.id" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeFaasInstance = "faas.instance" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeFaasMaxMemory = "faas.max_memory" -> string @@ -52,7 +55,9 @@ const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeK8sReplicaset const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeK8sStatefulsetName = "k8s.statefulset.name" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeK8sStatefulsetUid = "k8s.statefulset.uid" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeOsDescription = "os.description" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeOsName = "os.name" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeOsType = "os.type" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeOsVersion = "os.version" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeProcessCommand = "process.command" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeProcessCommandArgs = "process.command_args" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeProcessCommandLine = "process.command_line" -> string @@ -144,6 +149,7 @@ const OpenTelemetry.Trace.TraceSemanticConventions.AttributeAwsDynamodbSelect = const OpenTelemetry.Trace.TraceSemanticConventions.AttributeAwsDynamodbTableCount = "aws.dynamodb.table_count" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeAwsDynamodbTableNames = "aws.dynamodb.table_names" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeAwsDynamodbTotalSegments = "aws.dynamodb.total_segments" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.AttributeAwsLambdaInvokedArn = "aws.lambda.invoked_arn" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeCodeFilepath = "code.filepath" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeCodeFunction = "code.function" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeCodeLineno = "code.lineno" -> string @@ -231,6 +237,10 @@ const OpenTelemetry.Trace.TraceSemanticConventions.AttributeNetPeerPort = "net.p const OpenTelemetry.Trace.TraceSemanticConventions.AttributeNetTransport = "net.transport" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributePeerService = "peer.service" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcGrpcStatusCode = "rpc.grpc.status_code" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcJsonrpcErrorCode = "rpc.jsonrpc.error_code" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcJsonrpcErrorMessage = "rpc.jsonrpc.error_message" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcJsonrpcRequestId = "rpc.jsonrpc.request_id" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcJsonrpcVersion = "rpc.jsonrpc.version" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcMethod = "rpc.method" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcService = "rpc.service" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcSystem = "rpc.system" -> string @@ -251,6 +261,7 @@ const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Adabas = "adab const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Cache = "cache" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Cassandra = "cassandra" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Cloudscape = "cloudscape" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Cockroachdb = "cockroachdb" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Coldfusion = "coldfusion" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Cosmosdb = "cosmosdb" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Couchbase = "couchbase" -> string @@ -275,6 +286,7 @@ const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Instantdb = "i const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Interbase = "interbase" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Mariadb = "mariadb" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Maxdb = "maxdb" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Memcached = "memcached" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Mongodb = "mongodb" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Mssql = "mssql" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Mysql = "mysql" -> string diff --git a/src/OpenTelemetry.SemanticConventions/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.SemanticConventions/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt index afe6134e47b..85c6b8bc744 100644 --- a/src/OpenTelemetry.SemanticConventions/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.SemanticConventions/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt @@ -1,4 +1,4 @@ -const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeAwsEcsClusterArn = "aws.ecs.cluster.arn" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeAwsEcsClusterArn = "aws.ecs.cluster.arn" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeAwsEcsContainerArn = "aws.ecs.container.arn" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeAwsEcsLaunchtype = "aws.ecs.launchtype" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeAwsEcsTaskArn = "aws.ecs.task.arn" -> string @@ -20,6 +20,9 @@ const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeContainerImag const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeContainerName = "container.name" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeContainerRuntime = "container.runtime" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeDeploymentEnvironment = "deployment.environment" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeDeviceId = "device.id" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeDeviceModelIdentifier = "device.model.identifier" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeDeviceModelName = "device.model.name" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeFaasId = "faas.id" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeFaasInstance = "faas.instance" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeFaasMaxMemory = "faas.max_memory" -> string @@ -52,7 +55,9 @@ const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeK8sReplicaset const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeK8sStatefulsetName = "k8s.statefulset.name" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeK8sStatefulsetUid = "k8s.statefulset.uid" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeOsDescription = "os.description" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeOsName = "os.name" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeOsType = "os.type" -> string +const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeOsVersion = "os.version" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeProcessCommand = "process.command" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeProcessCommandArgs = "process.command_args" -> string const OpenTelemetry.Resources.ResourceSemanticConventions.AttributeProcessCommandLine = "process.command_line" -> string @@ -144,6 +149,7 @@ const OpenTelemetry.Trace.TraceSemanticConventions.AttributeAwsDynamodbSelect = const OpenTelemetry.Trace.TraceSemanticConventions.AttributeAwsDynamodbTableCount = "aws.dynamodb.table_count" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeAwsDynamodbTableNames = "aws.dynamodb.table_names" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeAwsDynamodbTotalSegments = "aws.dynamodb.total_segments" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.AttributeAwsLambdaInvokedArn = "aws.lambda.invoked_arn" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeCodeFilepath = "code.filepath" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeCodeFunction = "code.function" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeCodeLineno = "code.lineno" -> string @@ -231,6 +237,10 @@ const OpenTelemetry.Trace.TraceSemanticConventions.AttributeNetPeerPort = "net.p const OpenTelemetry.Trace.TraceSemanticConventions.AttributeNetTransport = "net.transport" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributePeerService = "peer.service" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcGrpcStatusCode = "rpc.grpc.status_code" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcJsonrpcErrorCode = "rpc.jsonrpc.error_code" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcJsonrpcErrorMessage = "rpc.jsonrpc.error_message" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcJsonrpcRequestId = "rpc.jsonrpc.request_id" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcJsonrpcVersion = "rpc.jsonrpc.version" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcMethod = "rpc.method" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcService = "rpc.service" -> string const OpenTelemetry.Trace.TraceSemanticConventions.AttributeRpcSystem = "rpc.system" -> string @@ -251,6 +261,7 @@ const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Adabas = "adab const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Cache = "cache" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Cassandra = "cassandra" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Cloudscape = "cloudscape" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Cockroachdb = "cockroachdb" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Coldfusion = "coldfusion" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Cosmosdb = "cosmosdb" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Couchbase = "couchbase" -> string @@ -275,6 +286,7 @@ const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Instantdb = "i const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Interbase = "interbase" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Mariadb = "mariadb" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Maxdb = "maxdb" -> string +const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Memcached = "memcached" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Mongodb = "mongodb" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Mssql = "mssql" -> string const OpenTelemetry.Trace.TraceSemanticConventions.DbSystemValues.Mysql = "mysql" -> string diff --git a/src/OpenTelemetry.SemanticConventions/OpenTelemetry.SemanticConventions.csproj b/src/OpenTelemetry.SemanticConventions/OpenTelemetry.SemanticConventions.csproj index c89b5bf73e8..246ffe98d87 100644 --- a/src/OpenTelemetry.SemanticConventions/OpenTelemetry.SemanticConventions.csproj +++ b/src/OpenTelemetry.SemanticConventions/OpenTelemetry.SemanticConventions.csproj @@ -1,9 +1,9 @@ - netstandard2.0;net452 + netstandard2.0;net461 OpenTelemetry Semantic Conventions $(PackageTags);semantic-conventions - + diff --git a/src/OpenTelemetry.SemanticConventions/scripts/semantic-convetion/generate.sh b/src/OpenTelemetry.SemanticConventions/scripts/semantic-convetion/generate.sh index 8bed6dc2e7d..9d4c9293e71 100755 --- a/src/OpenTelemetry.SemanticConventions/scripts/semantic-convetion/generate.sh +++ b/src/OpenTelemetry.SemanticConventions/scripts/semantic-convetion/generate.sh @@ -6,7 +6,7 @@ ROOT_DIR="${SCRIPT_DIR}/../../" # freeze the spec & generator tools versions to make SemanticAttributes generation reproducible SPEC_VERSION=v1.5.0 SCHEMA_URL=https://opentelemetry.io/schemas/$SPEC_VERSION -GENERATOR_VERSION=0.4.0 +GENERATOR_VERSION=0.4.1 cd ${SCRIPT_DIR}