Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions javascript/sentry-conventions/src/attributes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10315,6 +10315,30 @@ export const OS_VERSION = 'os.version';
*/
export type OS_VERSION_TYPE = string;

// Path: model/attributes/otel/otel__kind.json

/**
* The span kind (https://opentelemetry.io/docs/concepts/signals/traces/#span-kind). Deprecated, use `sentry.kind` instead. `otel.kind`
*
* Attribute Value Type: `string` {@link OTEL_KIND_TYPE}
*
* Apply Scrubbing: manual
*
* Attribute defined in OTEL: No
* Visibility: public
*
* Aliases: {@link SENTRY_KIND} `sentry.kind`
*
* @deprecated Use {@link SENTRY_KIND} (sentry.kind) instead - Deprecated in favor of sentry.kind
* @example "SERVER"
*/
export const OTEL_KIND = 'otel.kind';

/**
* Type for {@link OTEL_KIND} otel.kind
*/
export type OTEL_KIND_TYPE = string;

// Path: model/attributes/otel/otel__scope__name.json

/**
Expand Down Expand Up @@ -11660,6 +11684,8 @@ export type SENTRY_IS_REMOTE_TYPE = boolean;
* Attribute defined in OTEL: No
* Visibility: public
*
* Aliases: {@link OTEL_KIND} `otel.kind`
*
* @example "server"
*/
export const SENTRY_KIND = 'sentry.kind';
Expand Down Expand Up @@ -15031,6 +15057,7 @@ export const ATTRIBUTE_TYPE: Record<string, AttributeType> = {
[OS_THEME]: 'string',
[OS_TYPE]: 'string',
[OS_VERSION]: 'string',
[OTEL_KIND]: 'string',
[OTEL_SCOPE_NAME]: 'string',
[OTEL_SCOPE_VERSION]: 'string',
[OTEL_STATUS_CODE]: 'string',
Expand Down Expand Up @@ -15693,6 +15720,7 @@ export type AttributeName =
| typeof OS_THEME
| typeof OS_TYPE
| typeof OS_VERSION
| typeof OTEL_KIND
| typeof OTEL_SCOPE_NAME
| typeof OTEL_SCOPE_VERSION
| typeof OTEL_STATUS_CODE
Expand Down Expand Up @@ -22242,6 +22270,23 @@ export const ATTRIBUTE_METADATA: Record<AttributeName, AttributeMetadata> = {
example: '18.04.2',
changelog: [{ version: '0.1.0', prs: [127] }, { version: '0.0.0' }],
},
[OTEL_KIND]: {
brief:
'The span kind (https://opentelemetry.io/docs/concepts/signals/traces/#span-kind). Deprecated, use `sentry.kind` instead.',
type: 'string',
applyScrubbing: {
key: 'manual',
},
isInOtel: false,
visibility: 'public',
example: 'SERVER',
deprecation: {
replacement: 'sentry.kind',
reason: 'Deprecated in favor of sentry.kind',
},
aliases: [SENTRY_KIND],
changelog: [{ version: 'next', prs: [440], description: 'Added otel.kind attribute' }],
},
[OTEL_SCOPE_NAME]: {
brief: 'The name of the instrumentation scope - (InstrumentationScope.Name in OTLP).',
type: 'string',
Expand Down Expand Up @@ -23021,6 +23066,7 @@ export const ATTRIBUTE_METADATA: Record<AttributeName, AttributeMetadata> = {
isInOtel: false,
visibility: 'public',
example: 'server',
aliases: [OTEL_KIND],
changelog: [{ version: '0.3.1', prs: [190] }],
},
[SENTRY_MAIN_THREAD]: {
Expand Down Expand Up @@ -25084,6 +25130,7 @@ export type Attributes = {
[OS_THEME]?: OS_THEME_TYPE;
[OS_TYPE]?: OS_TYPE_TYPE;
[OS_VERSION]?: OS_VERSION_TYPE;
[OTEL_KIND]?: OTEL_KIND_TYPE;
[OTEL_SCOPE_NAME]?: OTEL_SCOPE_NAME_TYPE;
[OTEL_SCOPE_VERSION]?: OTEL_SCOPE_VERSION_TYPE;
[OTEL_STATUS_CODE]?: OTEL_STATUS_CODE_TYPE;
Expand Down
24 changes: 24 additions & 0 deletions model/attributes/otel/otel__kind.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"key": "otel.kind",
"brief": "The span kind (https://opentelemetry.io/docs/concepts/signals/traces/#span-kind). Deprecated, use `sentry.kind` instead.",
"type": "string",
"apply_scrubbing": {
"key": "manual"
},
"is_in_otel": false,
"visibility": "public",
"example": "SERVER",
"alias": ["sentry.kind"],
"deprecation": {
"replacement": "sentry.kind",
"reason": "Deprecated in favor of sentry.kind",
"_status": "backfill"
},
"changelog": [
{
"version": "next",
"prs": [440],
"description": "Added otel.kind attribute"
}
]
}
1 change: 1 addition & 0 deletions model/attributes/sentry/sentry__kind.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"apply_scrubbing": {
"key": "manual"
},
"alias": ["otel.kind"],
"is_in_otel": false,
"example": "server",
"visibility": "public",
Expand Down
36 changes: 36 additions & 0 deletions python/src/sentry_conventions/attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ class _AttributeNamesMeta(type):
"NET_SOCK_PEER_PORT",
"NET_TRANSPORT",
"OS_BUILD",
"OTEL_KIND",
"PERFORMANCE_ACTIVATIONSTART",
"PERFORMANCE_TIMEORIGIN",
"QUERY_KEY",
Expand Down Expand Up @@ -6064,6 +6065,19 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
Example: "18.04.2"
"""

# Path: model/attributes/otel/otel__kind.json
OTEL_KIND: Literal["otel.kind"] = "otel.kind"
"""The span kind (https://opentelemetry.io/docs/concepts/signals/traces/#span-kind). Deprecated, use `sentry.kind` instead.

Type: str
Apply Scrubbing: manual
Defined in OTEL: No
Visibility: public
Aliases: sentry.kind
DEPRECATED: Use sentry.kind instead - Deprecated in favor of sentry.kind
Example: "SERVER"
"""

# Path: model/attributes/otel/otel__scope__name.json
OTEL_SCOPE_NAME: Literal["otel.scope.name"] = "otel.scope.name"
"""The name of the instrumentation scope - (InstrumentationScope.Name in OTLP).
Expand Down Expand Up @@ -6810,6 +6824,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
Apply Scrubbing: manual
Defined in OTEL: No
Visibility: public
Aliases: otel.kind
Example: "server"
"""

Expand Down Expand Up @@ -15187,6 +15202,25 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
ChangelogEntry(version="0.0.0"),
],
),
"otel.kind": AttributeMetadata(
brief="The span kind (https://opentelemetry.io/docs/concepts/signals/traces/#span-kind). Deprecated, use `sentry.kind` instead.",
type=AttributeType.STRING,
apply_scrubbing=ApplyScrubbingInfo(key=ApplyScrubbing.MANUAL),
is_in_otel=False,
visibility=Visibility.PUBLIC,
example="SERVER",
deprecation=DeprecationInfo(
replacement="sentry.kind",
reason="Deprecated in favor of sentry.kind",
status=DeprecationStatus.BACKFILL,
),
aliases=["sentry.kind"],
changelog=[
ChangelogEntry(
version="next", prs=[440], description="Added otel.kind attribute"
),
],
),
"otel.scope.name": AttributeMetadata(
brief="The name of the instrumentation scope - (InstrumentationScope.Name in OTLP).",
type=AttributeType.STRING,
Expand Down Expand Up @@ -15994,6 +16028,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
is_in_otel=False,
visibility=Visibility.PUBLIC,
example="server",
aliases=["otel.kind"],
changelog=[
ChangelogEntry(version="0.3.1", prs=[190]),
],
Expand Down Expand Up @@ -18110,6 +18145,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
"os.theme": str,
"os.type": str,
"os.version": str,
"otel.kind": str,
"otel.scope.name": str,
"otel.scope.version": str,
"otel.status_code": str,
Expand Down
Loading