Skip to content

Commit bbd4307

Browse files
authored
Merge pull request #729 from typelevel/update/opentelemetry-semconv-1.27.0-alpha
Update opentelemetry-semconv to 1.27.0-alpha
2 parents 1db0996 + a1e53dd commit bbd4307

31 files changed

+1117
-180
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ val MUnitScalaCheckEffectVersion = "2.0.0-M2"
5353
val OpenTelemetryVersion = "1.41.0"
5454
val OpenTelemetryInstrumentationVersion = "2.7.0"
5555
val OpenTelemetryInstrumentationAlphaVersion = "2.5.0-alpha"
56-
val OpenTelemetrySemConvVersion = "1.26.0-alpha"
56+
val OpenTelemetrySemConvVersion = "1.27.0-alpha"
5757
val OpenTelemetryProtoVersion = "1.1.0-alpha"
5858
val PekkoStreamVersion = "1.0.3"
5959
val PekkoHttpVersion = "1.0.1"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
/*
2+
* Copyright 2023 Typelevel
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.typelevel.otel4s.semconv.experimental.attributes
18+
19+
import org.typelevel.otel4s.AttributeKey
20+
import org.typelevel.otel4s.AttributeKey._
21+
22+
// DO NOT EDIT, this is an Auto-generated file from buildscripts/semantic-convention/templates/SemanticAttributes.scala.j2
23+
object ArtifactExperimentalAttributes {
24+
25+
/** The provenance filename of the built attestation which directly relates to
26+
* the build artifact filename. This filename SHOULD accompany the artifact
27+
* at publish time. See the <a
28+
* href="https://slsa.dev/spec/v1.0/distributing-provenance#relationship-between-artifacts-and-attestations">SLSA
29+
* Relationship</a> specification for more information.
30+
*/
31+
val ArtifactAttestationFilename: AttributeKey[String] = string(
32+
"artifact.attestation.filename"
33+
)
34+
35+
/** The full <a
36+
* href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash
37+
* value (see glossary)</a>, of the built attestation. Some envelopes in the
38+
* software attestation space also refer to this as the <a
39+
* href="https://github.com/in-toto/attestation/blob/main/spec/README.md#in-toto-attestation-framework-spec">digest</a>.
40+
*/
41+
val ArtifactAttestationHash: AttributeKey[String] = string(
42+
"artifact.attestation.hash"
43+
)
44+
45+
/** The id of the build <a href="https://slsa.dev/attestation-model">software
46+
* attestation</a>.
47+
*/
48+
val ArtifactAttestationId: AttributeKey[String] = string(
49+
"artifact.attestation.id"
50+
)
51+
52+
/** The human readable file name of the artifact, typically generated during
53+
* build and release processes. Often includes the package name and version
54+
* in the file name.
55+
*
56+
* @note
57+
* - This file name can also act as the <a
58+
* href="https://slsa.dev/spec/v1.0/terminology#package-model">Package
59+
* Name</a> in cases where the package ecosystem maps accordingly.
60+
* Additionally, the artifact <a
61+
* href="https://slsa.dev/spec/v1.0/terminology#software-supply-chain">can
62+
* be published</a> for others, but that is not a guarantee.
63+
*/
64+
val ArtifactFilename: AttributeKey[String] = string("artifact.filename")
65+
66+
/** The full <a
67+
* href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash
68+
* value (see glossary)</a>, often found in checksum.txt on a release of the
69+
* artifact and used to verify package integrity.
70+
*
71+
* @note
72+
* - The specific algorithm used to create the cryptographic hash value is
73+
* not defined. In situations where an artifact has multiple
74+
* cryptographic hashes, it is up to the implementer to choose which hash
75+
* value to set here; this should be the most secure hash algorithm that
76+
* is suitable for the situation and consistent with the corresponding
77+
* attestation. The implementer can then provide the other hash values
78+
* through an additional set of attribute extensions as they deem
79+
* necessary.
80+
*/
81+
val ArtifactHash: AttributeKey[String] = string("artifact.hash")
82+
83+
/** The <a href="https://github.com/package-url/purl-spec">Package URL</a> of
84+
* the <a href="https://slsa.dev/spec/v1.0/terminology#package-model">package
85+
* artifact</a> provides a standard way to identify and locate the packaged
86+
* artifact.
87+
*/
88+
val ArtifactPurl: AttributeKey[String] = string("artifact.purl")
89+
90+
/** The version of the artifact.
91+
*/
92+
val ArtifactVersion: AttributeKey[String] = string("artifact.version")
93+
94+
}

semconv/experimental/src/main/scala/org/typelevel/otel4s/semconv/experimental/AwsExperimentalAttributes.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ object AwsExperimentalAttributes {
6262
* `GlobalSecondaryIndexUpdates` request field.
6363
*/
6464
val AwsDynamodbGlobalSecondaryIndexUpdates: AttributeKey[Seq[String]] =
65-
stringSeq("aws.dynamodb.global_secondary_index_updates")
65+
stringSeq(
66+
"aws.dynamodb.global_secondary_index_updates"
67+
)
6668

6769
/** The JSON-serialized value of each item of the `GlobalSecondaryIndexes`
6870
* request field
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Copyright 2023 Typelevel
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.typelevel.otel4s.semconv.experimental.attributes
18+
19+
import org.typelevel.otel4s.AttributeKey
20+
import org.typelevel.otel4s.AttributeKey._
21+
22+
// DO NOT EDIT, this is an Auto-generated file from buildscripts/semantic-convention/templates/SemanticAttributes.scala.j2
23+
object AzExperimentalAttributes {
24+
25+
/** The unique identifier of the service request. It's generated by the Azure
26+
* service and returned with the response.
27+
*/
28+
val AzServiceRequestId: AttributeKey[String] = string("az.service_request_id")
29+
30+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
/*
2+
* Copyright 2023 Typelevel
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.typelevel.otel4s.semconv.experimental.attributes
18+
19+
import org.typelevel.otel4s.AttributeKey
20+
import org.typelevel.otel4s.AttributeKey._
21+
22+
// DO NOT EDIT, this is an Auto-generated file from buildscripts/semantic-convention/templates/SemanticAttributes.scala.j2
23+
object CicdExperimentalAttributes {
24+
25+
/** The human readable name of the pipeline within a CI/CD system.
26+
*/
27+
val CicdPipelineName: AttributeKey[String] = string("cicd.pipeline.name")
28+
29+
/** The unique identifier of a pipeline run within a CI/CD system.
30+
*/
31+
val CicdPipelineRunId: AttributeKey[String] = string("cicd.pipeline.run.id")
32+
33+
/** The human readable name of a task within a pipeline. Task here most
34+
* closely aligns with a <a
35+
* href="https://en.wikipedia.org/wiki/Pipeline_(computing)">computing
36+
* process</a> in a pipeline. Other terms for tasks include commands, steps,
37+
* and procedures.
38+
*/
39+
val CicdPipelineTaskName: AttributeKey[String] = string(
40+
"cicd.pipeline.task.name"
41+
)
42+
43+
/** The unique identifier of a task run within a pipeline.
44+
*/
45+
val CicdPipelineTaskRunId: AttributeKey[String] = string(
46+
"cicd.pipeline.task.run.id"
47+
)
48+
49+
/** The <a href="https://en.wikipedia.org/wiki/URL">URL</a> of the pipeline
50+
* run providing the complete address in order to locate and identify the
51+
* pipeline run.
52+
*/
53+
val CicdPipelineTaskRunUrlFull: AttributeKey[String] = string(
54+
"cicd.pipeline.task.run.url.full"
55+
)
56+
57+
/** The type of the task within a pipeline.
58+
*/
59+
val CicdPipelineTaskType: AttributeKey[String] = string(
60+
"cicd.pipeline.task.type"
61+
)
62+
// Enum definitions
63+
64+
/** Values for [[CicdPipelineTaskType]].
65+
*/
66+
abstract class CicdPipelineTaskTypeValue(val value: String)
67+
object CicdPipelineTaskTypeValue {
68+
69+
/** build. */
70+
case object Build extends CicdPipelineTaskTypeValue("build")
71+
72+
/** test. */
73+
case object Test extends CicdPipelineTaskTypeValue("test")
74+
75+
/** deploy. */
76+
case object Deploy extends CicdPipelineTaskTypeValue("deploy")
77+
}
78+
79+
}

semconv/experimental/src/main/scala/org/typelevel/otel4s/semconv/experimental/CloudExperimentalAttributes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ object CloudExperimentalAttributes {
8989
* any <a
9090
* href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias
9191
* suffix</a> with the resolved function version, as the same runtime
92-
* instance may be invokable with multiple different aliases.</li>
92+
* instance may be invocable with multiple different aliases.</li>
9393
* <li><strong>GCP:</strong> The <a
9494
* href="https://cloud.google.com/iam/docs/full-resource-names">URI of
9595
* the resource</a></li> <li><strong>Azure:</strong> The <a

semconv/experimental/src/main/scala/org/typelevel/otel4s/semconv/experimental/ContainerExperimentalAttributes.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ object ContainerExperimentalAttributes {
4444
"container.command_line"
4545
)
4646

47-
/** The CPU state for this data point.
47+
/** Deprecated, use `cpu.mode` instead.
4848
*/
49+
@deprecated("Use `cpu.mode` instead", "0.5.0")
4950
val ContainerCpuState: AttributeKey[String] = string("container.cpu.state")
5051

5152
/** Container ID. Usually a UUID, as for example used to <a
@@ -117,7 +118,9 @@ object ContainerExperimentalAttributes {
117118

118119
/** Values for [[ContainerCpuState]].
119120
*/
121+
@deprecated("Use `cpu.mode` instead", "0.5.0")
120122
abstract class ContainerCpuStateValue(val value: String)
123+
@annotation.nowarn("cat=deprecation")
121124
object ContainerCpuStateValue {
122125

123126
/** When tasks of the cgroup are in user mode (Linux). When all container
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright 2023 Typelevel
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.typelevel.otel4s.semconv.experimental.attributes
18+
19+
import org.typelevel.otel4s.AttributeKey
20+
import org.typelevel.otel4s.AttributeKey._
21+
22+
// DO NOT EDIT, this is an Auto-generated file from buildscripts/semantic-convention/templates/SemanticAttributes.scala.j2
23+
object CpuExperimentalAttributes {
24+
25+
/** The mode of the CPU
26+
*/
27+
val CpuMode: AttributeKey[String] = string("cpu.mode")
28+
// Enum definitions
29+
30+
/** Values for [[CpuMode]].
31+
*/
32+
abstract class CpuModeValue(val value: String)
33+
object CpuModeValue {
34+
35+
/** user. */
36+
case object User extends CpuModeValue("user")
37+
38+
/** system. */
39+
case object System extends CpuModeValue("system")
40+
41+
/** nice. */
42+
case object Nice extends CpuModeValue("nice")
43+
44+
/** idle. */
45+
case object Idle extends CpuModeValue("idle")
46+
47+
/** iowait. */
48+
case object Iowait extends CpuModeValue("iowait")
49+
50+
/** interrupt. */
51+
case object Interrupt extends CpuModeValue("interrupt")
52+
53+
/** steal. */
54+
case object Steal extends CpuModeValue("steal")
55+
56+
/** kernel. */
57+
case object Kernel extends CpuModeValue("kernel")
58+
}
59+
60+
}

0 commit comments

Comments
 (0)