Skip to content

Commit 4826dcd

Browse files
trisch-memjwolf
andauthored
update semconv to 1.38 version (#2563)
* update semconv to 1.38 version * Rename types module Rename the _types module to ecs_types. Modules with leading underscore are reserved for internal use, and in newer version of python there is an internal _types module which conflicts with the ecs _types. The ECS module is renamed to ecs_types, to remove the conflict with the internal type. --------- Co-authored-by: Michael Wolf <[email protected]>
1 parent 5db6546 commit 4826dcd

18 files changed

+24
-20
lines changed

docs/reference/ecs-otel-alignment-details.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mapped_pages:
66

77
# Field & Attributes Alignment [ecs-otel-alignment-details]
88

9-
The following table gives an overview of mappings between individual ECS fields (in ECS version `9.3.0-dev`) and corresponding OTel semantic convention attributes (in SemConv version `1.37.0`).
9+
The following table gives an overview of mappings between individual ECS fields (in ECS version `9.3.0-dev`) and corresponding OTel semantic convention attributes (in SemConv version `1.38.0`).
1010

1111
| ECS Field | Relation | OTel Semantic Conventions Attribute | Stability $$$otel-mapping-namespace-base$$$ |
1212
| --- | --- | --- | --- |

docs/reference/ecs-otel-alignment-overview.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ mapped_pages:
66

77
# OTel Alignment Overview [ecs-otel-alignment-overview]
88

9-
The following table summarizes the alignment status by namespaces between ECS in version `9.3.0-dev` and OpenTelemetry semantic conventions in version `1.37.0`.
9+
The following table summarizes the alignment status by namespaces between ECS in version `9.3.0-dev` and OpenTelemetry semantic conventions in version `1.38.0`.
1010

1111
| | |
1212
| --- | --- |
1313
| | Number of Fields / Attributes |
1414
| Namespace | ECS | OTel | ![relation](https://img.shields.io/badge/match-93c93e?style=flat "match") | ![relation](https://img.shields.io/badge/equivalent-1ba9f5?style=flat "equivalent") | ![relation](https://img.shields.io/badge/related-efc20d?style=flat "related") | ![relation](https://img.shields.io/badge/conflict-910000?style=flat "conflict") | ![relation](https://img.shields.io/badge/metric-cb00cb?style=flat "metric") | ![relation](https://img.shields.io/badge/OTLP-ffdcb2?style=flat "OTLP") | ![relation](https://img.shields.io/badge/n%2Fa-f2f4fb?style=flat "na") |
1515
| Agent | [6](/reference/ecs-agent.md) | · | · | · | · | · | · | · | · |
1616
| Android | · | [2](https://opentelemetry.io/docs/specs/semconv/attributes-registry/android) | · | · | · | · | · | · | |
17-
| Application | · | [9](https://opentelemetry.io/docs/specs/semconv/attributes-registry/app) | · | · | · | · | · | · | |
17+
| Application | · | [11](https://opentelemetry.io/docs/specs/semconv/attributes-registry/app) | · | · | · | · | · | · | |
1818
| Artifact | · | [7](https://opentelemetry.io/docs/specs/semconv/attributes-registry/artifact) | · | · | · | · | · | · | |
1919
| Autonomous System | [2](/reference/ecs-as.md) | · | · | · | · | · | · | · | · |
2020
| ASP.NET Core | · | [23](https://opentelemetry.io/docs/specs/semconv/attributes-registry/aspnetcore) | · | · | · | · | · | · | |
@@ -54,8 +54,8 @@ The following table summarizes the alignment status by namespaces between ECS in
5454
| FaaS | [7](/reference/ecs-faas.md) | [16](https://opentelemetry.io/docs/specs/semconv/attributes-registry/faas) | 3 | 2 | · | · | · | · | · |
5555
| Feature Flag | · | [8](https://opentelemetry.io/docs/specs/semconv/attributes-registry/feature-flag) | · | · | · | · | · | · | |
5656
| File | [24](/reference/ecs-file.md) | [18](https://opentelemetry.io/docs/specs/semconv/attributes-registry/file) | 11 | 7 | · | · | · | · | · |
57-
| GCP Client | · | [14](https://opentelemetry.io/docs/specs/semconv/attributes-registry/gcp) | · | · | · | · | · | · | |
58-
| Gen AI | [26](/reference/ecs-gen_ai.md) | [32](https://opentelemetry.io/docs/specs/semconv/attributes-registry/gen-ai) | 25 | 1 | · | · | · | · | · |
57+
| GCP Client | · | [23](https://opentelemetry.io/docs/specs/semconv/attributes-registry/gcp) | · | · | · | · | · | · | |
58+
| Gen AI | [26](/reference/ecs-gen_ai.md) | [40](https://opentelemetry.io/docs/specs/semconv/attributes-registry/gen-ai) | 25 | 1 | · | · | · | · | · |
5959
| Geo | [11](/reference/ecs-geo.md) | [7](https://opentelemetry.io/docs/specs/semconv/attributes-registry/geo) | 1 | 4 | 2 | · | · | · | · |
6060
| Go | · | [1](https://opentelemetry.io/docs/specs/semconv/attributes-registry/go) | · | · | · | · | · | · | |
6161
| GraphQL | · | [3](https://opentelemetry.io/docs/specs/semconv/attributes-registry/graphql) | · | · | · | · | · | · | |
@@ -68,17 +68,20 @@ The following table summarizes the alignment status by namespaces between ECS in
6868
| Interface | [3](/reference/ecs-interface.md) | · | · | · | · | · | · | · | · |
6969
| iOS | · | [1](https://opentelemetry.io/docs/specs/semconv/attributes-registry/ios) | · | · | · | · | · | · | |
7070
| Java Virtual Machine (JVM) | · | [8](https://opentelemetry.io/docs/specs/semconv/attributes-registry/jvm) | · | · | · | · | · | · | |
71-
| Kubernetes | · | [60](https://opentelemetry.io/docs/specs/semconv/attributes-registry/k8s) | · | · | · | · | · | · | |
71+
| Kubernetes | · | [62](https://opentelemetry.io/docs/specs/semconv/attributes-registry/k8s) | · | · | · | · | · | · | |
7272
| Linux Memory | · | [1](https://opentelemetry.io/docs/specs/semconv/attributes-registry/linux) | · | · | · | · | · | · | |
7373
| Log | [18](/reference/ecs-log.md) | [7](https://opentelemetry.io/docs/specs/semconv/attributes-registry/log) | 1 | · | · | · | · | 1 | · |
7474
| Mach-O Header | [16](/reference/ecs-macho.md) | · | · | · | · | · | · | · | · |
7575
| Mainframe LPAR attributes | · | [1](https://opentelemetry.io/docs/specs/semconv/attributes-registry/mainframe) | · | · | · | · | · | · | |
7676
| General Messaging | · | [37](https://opentelemetry.io/docs/specs/semconv/attributes-registry/messaging) | · | · | · | · | · | · | |
7777
| Network | [12](/reference/ecs-network.md) | [17](https://opentelemetry.io/docs/specs/semconv/attributes-registry/network) | 2 | 1 | · | · | · | · | · |
78+
| NFS | · | [2](https://opentelemetry.io/docs/specs/semconv/attributes-registry/nfs) | · | · | · | · | · | · | |
7879
| Node.js | · | [1](https://opentelemetry.io/docs/specs/semconv/attributes-registry/nodejs) | · | · | · | · | · | · | |
7980
| Observer | [13](/reference/ecs-observer.md) | · | · | · | · | · | · | · | · |
8081
| Open Container Initiative (OCI) | · | [1](https://opentelemetry.io/docs/specs/semconv/attributes-registry/oci) | · | · | · | · | · | · | |
82+
| ONC RPC (Sun RPC) attributes | · | [4](https://opentelemetry.io/docs/specs/semconv/attributes-registry/onc-rpc) | · | · | · | · | · | · | |
8183
| OpenAI | · | [3](https://opentelemetry.io/docs/specs/semconv/attributes-registry/openai) | · | · | · | · | · | · | |
84+
| Openshift | · | [2](https://opentelemetry.io/docs/specs/semconv/attributes-registry/openshift) | · | · | · | · | · | · | |
8285
| OpenTracing | · | [1](https://opentelemetry.io/docs/specs/semconv/attributes-registry/opentracing) | · | · | · | · | · | · | |
8386
| Orchestrator | [15](/reference/ecs-orchestrator.md) | · | · | · | · | · | · | · | · |
8487
| Organization | [2](/reference/ecs-organization.md) | · | · | · | · | · | · | · | · |
@@ -87,6 +90,7 @@ The following table summarizes the alignment status by namespaces between ECS in
8790
| Package | [13](/reference/ecs-package.md) | · | · | · | · | · | · | · | · |
8891
| PE Header | [23](/reference/ecs-pe.md) | · | · | · | · | · | · | · | · |
8992
| Peer | · | [1](https://opentelemetry.io/docs/specs/semconv/attributes-registry/peer) | · | · | · | · | · | · | |
93+
| Pprof specific attributes for the Profiling signal | · | [6](https://opentelemetry.io/docs/specs/semconv/attributes-registry/pprof) | · | · | · | · | · | · | |
9094
| Process | [34](/reference/ecs-process.md) | [34](https://opentelemetry.io/docs/specs/semconv/attributes-registry/process) | 15 | 2 | · | · | 1 | · | · |
9195
| Profile Frame | · | [1](https://opentelemetry.io/docs/specs/semconv/attributes-registry/profile) | · | · | · | · | · | · | |
9296
| Registry | [7](/reference/ecs-registry.md) | · | · | · | · | · | · | · | · |
@@ -100,7 +104,7 @@ The following table summarizes the alignment status by namespaces between ECS in
100104
| Session | · | [2](https://opentelemetry.io/docs/specs/semconv/attributes-registry/session) | · | · | · | · | · | · | |
101105
| SignalR | · | [2](https://opentelemetry.io/docs/specs/semconv/attributes-registry/signalr) | · | · | · | · | · | · | |
102106
| Source | [12](/reference/ecs-source.md) | [2](https://opentelemetry.io/docs/specs/semconv/attributes-registry/source) | 2 | · | · | · | · | · | · |
103-
| Deprecated System | · | [11](https://opentelemetry.io/docs/specs/semconv/attributes-registry/system) | · | · | · | · | · | · | |
107+
| General System | · | [9](https://opentelemetry.io/docs/specs/semconv/attributes-registry/system) | · | · | · | · | · | · | |
104108
| Telemetry | · | [5](https://opentelemetry.io/docs/specs/semconv/attributes-registry/telemetry) | · | · | · | · | · | · | |
105109
| Test | · | [4](https://opentelemetry.io/docs/specs/semconv/attributes-registry/test) | · | · | · | · | · | · | |
106110
| Thread | · | [2](https://opentelemetry.io/docs/specs/semconv/attributes-registry/thread) | · | · | · | · | · | · | |

otel-semconv-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.37.0
1+
v1.38.0
File renamed without changes.
File renamed without changes.
File renamed without changes.

scripts/generator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from schema import finalizer
3535
from schema import subset_filter
3636
from schema import exclude_filter
37-
from _types import (
37+
from ecs_types import (
3838
FieldEntry
3939
)
4040

scripts/generators/beats.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
)
2525

2626
from generators import ecs_helpers
27-
from _types import (
27+
from ecs_types import (
2828
Field,
2929
FieldNestedEntry,
3030
)

scripts/generators/csv_generator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
from os.path import join
2727
from generator import ecs_helpers
28-
from _types import (
28+
from ecs_types import (
2929
Field,
3030
)
3131

scripts/generators/ecs_helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
from collections import OrderedDict
3535
from copy import deepcopy
36-
from _types import (
36+
from ecs_types import (
3737
Field,
3838
FieldEntry,
3939
FieldNestedEntry,

0 commit comments

Comments
 (0)