Skip to content

Commit b613b5d

Browse files
authored
Merge pull request #1047 from iRevive/chore/semconv
2 parents 92e18bf + be2a9aa commit b613b5d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

buildscripts/semantic-convention/templates/registry/otel4s/attributes/SemanticAttributes.scala.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ package attributes
3535
// DO NOT EDIT, this is an Auto-generated file from buildscripts/templates/registry/otel4s/attributes/SemanticAttributes.scala.j2
3636
object {{ object_name }} {
3737

38-
{% for attribute in ctx.attributes | rejectattr("name", "in", params.excluded_attributes) %}{% if params.stable_only == false or attribute is stable %}
38+
{% for attribute in ctx.attributes | rejectattr("name", "in", params.excluded_attributes) | rejectattr("type", "eq", "any") %}{% if params.stable_only == false or attribute is stable %}
3939
{{ [attribute.brief, concat_if("\n\n@note\n\n", attribute.note)] | comment(indent=2) | replace('$', "$$") }}
4040
{%- if attribute is deprecated %}
4141
@deprecated("{{ attribute.deprecated.note | replace('"', "'") | trim }}", "")

project/SemanticConventionsGenerator.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import scala.sys.process._
33

44
object SemanticConventionsGenerator {
55

6-
private val generatorVersion = "v0.15.1"
6+
private val generatorVersion = "v0.17.1"
77

88
// generates semantic conventions by using `otel/weaver` in docker
99
def generate(version: String, rootDir: File): Unit = {

semconv/experimental/src/main/scala/org/typelevel/otel4s/semconv/experimental/attributes/FeatureFlagExperimentalAttributes.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ object FeatureFlagExperimentalAttributes {
2626
val FeatureFlagContextId: AttributeKey[String] =
2727
AttributeKey("feature_flag.context.id")
2828

29-
/** A message explaining the nature of an error occurring during flag evaluation.
29+
/** Deprecated, use `error.message` instead.
3030
*/
31+
@deprecated("Replaced by `error.message`.", "")
3132
val FeatureFlagEvaluationErrorMessage: AttributeKey[String] =
3233
AttributeKey("feature_flag.evaluation.error.message")
3334

@@ -45,7 +46,7 @@ object FeatureFlagExperimentalAttributes {
4546
/** Identifies the feature flag provider.
4647
*/
4748
val FeatureFlagProviderName: AttributeKey[String] =
48-
AttributeKey("feature_flag.provider_name")
49+
AttributeKey("feature_flag.provider.name")
4950

5051
/** The reason code which shows how a feature flag value was determined.
5152
*/

0 commit comments

Comments
 (0)