From a9102d17605b45908d223f7a67e9779bbc5bb59e Mon Sep 17 00:00:00 2001 From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Date: Fri, 24 Jan 2025 19:15:34 +0000 Subject: [PATCH 1/5] Update semantic-conventions version to v1.30.0 --- .gitmodules | 2 +- content-modules/semantic-conventions | 2 +- scripts/content-modules/adjust-pages.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3d14d9a90a4d..07a018d12171 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ [submodule "content-modules/semantic-conventions"] path = content-modules/semantic-conventions url = https://github.com/open-telemetry/semantic-conventions - semconv-pin = v1.29.0 + semconv-pin = v1.30.0 [submodule "content-modules/opamp-spec"] path = content-modules/opamp-spec url = https://github.com/open-telemetry/opamp-spec diff --git a/content-modules/semantic-conventions b/content-modules/semantic-conventions index 0edb9e2b42e3..ac424df0d09f 160000 --- a/content-modules/semantic-conventions +++ b/content-modules/semantic-conventions @@ -1 +1 @@ -Subproject commit 0edb9e2b42e37739fe53e10623d93809269dd300 +Subproject commit ac424df0d09fae721913f2a399b90ac16ba960fd diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index 847646d8729d..7e0327a213d7 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -24,7 +24,7 @@ qw( spec: 1.41.0 otlp: 1.5.0 - semconv: 1.29.0 + semconv: 1.30.0 ); # Versions map without the colon in the keys my %versions = map { s/://r => $versionsRaw{$_} } keys %versionsRaw; From 1bba31ebf9da6f050f587cd1f2a156980f90e3d3 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Fri, 24 Jan 2025 14:35:44 -0500 Subject: [PATCH 2/5] Rename specs/semconv/general/attribute-naming/ --- content/en/blog/2024/prometheus-compatibility-survey/index.md | 2 +- content/en/docs/languages/java/api.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/en/blog/2024/prometheus-compatibility-survey/index.md b/content/en/blog/2024/prometheus-compatibility-survey/index.md index 1979af63d028..6e54ca3c00fb 100644 --- a/content/en/blog/2024/prometheus-compatibility-survey/index.md +++ b/content/en/blog/2024/prometheus-compatibility-survey/index.md @@ -88,7 +88,7 @@ of their opinions on units or delimiters. ## Dots and Underscores -OpenTelemetry [specifies](/docs/specs/semconv/general/attribute-naming/) that +OpenTelemetry [specifies](/docs/specs/semconv/general/naming/) that conventions should use dots as the namespace delimiter, and underscores as the delimiter between "multi-word-dot-delimited components" (for example, `http.response.status_code`). On the other hand, Prometheus diff --git a/content/en/docs/languages/java/api.md b/content/en/docs/languages/java/api.md index 9143155e5b31..5dd42d202044 100644 --- a/content/en/docs/languages/java/api.md +++ b/content/en/docs/languages/java/api.md @@ -468,7 +468,7 @@ is a bundle of key value pairs representing the See [semantic attributes](#semantic-attributes) for attribute constants generated from the semantic conventions. -See [attribute naming](/docs/specs/semconv/general/attribute-naming/) for +See [attribute naming](/docs/specs/semconv/general/naming/) for guidance on attribute naming. The following code snippet explores `Attributes` API usage: From 54cd2afd90a43a80a006545d99b2fedb077ed62a Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Fri, 24 Jan 2025 15:21:43 -0500 Subject: [PATCH 3/5] Adjust patches and update refcache --- scripts/content-modules/adjust-pages.pl | 37 +-- static/refcache.json | 340 ++++++++++++++++++++++++ 2 files changed, 348 insertions(+), 29 deletions(-) diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index 7e0327a213d7..ae1934e6c1b8 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -93,14 +93,6 @@ ($$$) return 0; } -sub patchAttrNaming() { - return unless $ARGV =~ /^tmp\/otel\/specification/ - && applyPatchOrPrintMsgIf('2025-01-22-attribute-naming', 'semconv', '1.29.0'); - - my $semconv_attr_naming = '(/docs/specs/semconv/general)/naming/'; - s|$semconv_attr_naming|$1/attribute-naming/|g if /$semconv_attr_naming/; -} - sub patchEventAliases() { return unless $ARGV =~ /^tmp\/otel\/specification\/logs\// && applyPatchOrPrintMsgIf('2025-01-23-event-aliases', 'spec', '1.41.0'); @@ -109,12 +101,13 @@ () s|$aliases|$1./$2|g if /$aliases/; } -sub patchSemConvAlias() { - return unless $ARGV =~ /^tmp\/semconv\/docs\/general\// - && applyPatchOrPrintMsgIf('2025-01-23-general-aliases', 'semconv', '1.29.0'); +sub patchSemConvEmitAnEvent() { + return unless $ARGV =~ /^tmp\/semconv\/docs\// + && applyPatchOrPrintMsgIf('2025-01-24-emit-an-event', 'semconv', '1.30.0'); - my $aliases = '\[docs/specs/semconv/general/(trace-general)\]'; - s|$aliases|[$1]|g if /$aliases/; + s|Emit Event API|Log API|; + my $path = '(docs/specs/otel/logs/api.md#emit-a)n-event'; + s|$path|$1-logrecord|g if /$path/; } sub getVersFromSubmodule() { @@ -158,9 +151,7 @@ () while(<>) { $lineNum++; last if /^-?-->/; - patchAttrNaming(); patchEventAliases(); - patchSemConvAlias(); $frontMatterFromFile .= $_; } next; @@ -193,28 +184,14 @@ () ## Semconv if ($ARGV =~ /^tmp\/semconv/) { - if (applyPatchOrPrintMsgIf('2025-01-22-event-(api|sdk)', 'semconv', '1.29.0')) { - # Cf. https://github.com/open-telemetry/opentelemetry-specification/pull/4359 - my $otel_spec_event_deprecation = '(opentelemetry-specification/blob/main/specification/logs)/event-(api|sdk).md'; - s|$otel_spec_event_deprecation\b|$1/|g if /$otel_spec_event_deprecation/; - } - s|(\]\()/docs/|$1$specBasePath/semconv/|g; s|(\]:\s*)/docs/|$1$specBasePath/semconv/|; s|\((/model/.*?)\)|($semconvSpecRepoUrl/tree/v$semconvVers/$1)|g; } - # SPECIFICATION custom processing - if ($ARGV =~ /^tmp\/otel\/specification/ && applyPatchOrPrintMsgIf('2025-01-22-attribute-naming.md', 'semconv', '1.29.0')) { - my $semconv_attr_naming_md = '(semantic-conventions/blob/main/docs/general)/naming.md(#\w+)?'; - s|$semconv_attr_naming_md\b|$1/attribute-naming.md|g if /$semconv_attr_naming_md/; - } - - patchAttrNaming(); # TEMPORARY patch - s|\(https://github.com/open-telemetry/opentelemetry-specification\)|($specBasePath/otel/)|; s|(\]\()/specification/|$1$specBasePath/otel/)|; s|\.\./specification/(.*?\))|../otel/$1|g if $ARGV =~ /otel\/specification/; @@ -254,5 +231,7 @@ () s|\]\((proto/opamp.proto)\)|]($opAmpSpecRepoUrl/blob/main/$1)|; + patchSemConvEmitAnEvent(); + print; } diff --git a/static/refcache.json b/static/refcache.json index 1c6f743e15ed..10346c6175dd 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -1567,6 +1567,14 @@ "StatusCode": 200, "LastSeen": "2024-01-30T15:19:46.407077+01:00" }, + "https://aws.amazon.com/pm/dynamodb/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:45.304316-05:00" + }, + "https://aws.amazon.com/redshift/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:45.664044-05:00" + }, "https://axiom.co/docs/send-data/opentelemetry": { "StatusCode": 206, "LastSeen": "2024-04-23T09:25:52.097148675Z" @@ -1727,6 +1735,10 @@ "StatusCode": 206, "LastSeen": "2024-08-07T15:43:39.186151+02:00" }, + "https://clickhouse.com/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:47.747851-05:00" + }, "https://clickhouse.com/docs/en/operations/opentelemetry": { "StatusCode": 206, "LastSeen": "2024-03-25T12:28:16.356581594Z" @@ -1931,6 +1943,10 @@ "StatusCode": 200, "LastSeen": "2024-08-09T10:45:20.77697-04:00" }, + "https://cloud.google.com/spanner": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:57.031047-05:00" + }, "https://cloud.google.com/storage/docs/access-control/signed-urls": { "StatusCode": 200, "LastSeen": "2024-12-04T08:46:55.63530878Z" @@ -2123,6 +2139,14 @@ "StatusCode": 206, "LastSeen": "2024-08-09T10:47:38.013929-04:00" }, + "https://datatracker.ietf.org/doc/html/rfc9293#section-3.3.2": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:00.533958-05:00" + }, + "https://db.apache.org/derby/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:54.746149-05:00" + }, "https://deno.com": { "StatusCode": 200, "LastSeen": "2025-01-20T15:58:06.919196531+01:00" @@ -3231,6 +3255,10 @@ "StatusCode": 206, "LastSeen": "2024-08-09T10:46:06.34917-04:00" }, + "https://documentation.softwareag.com/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:37:22.525048-05:00" + }, "https://documentation.solarwinds.com/en/success_center/observability/default.htm#cshid=third-otel-integration": { "StatusCode": 206, "LastSeen": "2024-12-18T05:52:10.355651-05:00" @@ -3315,6 +3343,10 @@ "StatusCode": 200, "LastSeen": "2025-01-06T11:23:52.039559-05:00" }, + "https://en.wikipedia.org/wiki/BEAM_%28Erlang_virtual_machine%29": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:47.766054-05:00" + }, "https://en.wikipedia.org/wiki/Bat-Signal": { "StatusCode": 200, "LastSeen": "2024-01-30T16:15:58.015235-05:00" @@ -3587,6 +3619,10 @@ "StatusCode": 206, "LastSeen": "2025-01-06T11:23:54.239345-05:00" }, + "https://geode.apache.org/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:58.275688-05:00" + }, "https://getcomposer.org/": { "StatusCode": 200, "LastSeen": "2025-01-15T13:17:33.477661-05:00" @@ -5539,6 +5575,10 @@ "StatusCode": 206, "LastSeen": "2025-01-17T17:24:29.99273-05:00" }, + "https://github.com/in-toto/attestation/tree/main/spec": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:00.495896-05:00" + }, "https://github.com/instana": { "StatusCode": 200, "LastSeen": "2024-11-14T11:47:17.991776+01:00" @@ -6711,6 +6751,14 @@ "StatusCode": 206, "LastSeen": "2025-01-16T14:34:28.863197-05:00" }, + "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.112.0/receiver/kubeletstatsreceiver/documentation.md": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:50.95459-05:00" + }, + "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.115.0/receiver/k8sclusterreceiver/documentation.md": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:54.988401-05:00" + }, "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/connector/countconnector/README.md": { "StatusCode": 206, "LastSeen": "2025-01-17T15:48:54.346415-05:00" @@ -11775,6 +11823,18 @@ "StatusCode": 206, "LastSeen": "2025-01-17T16:52:11.607071-05:00" }, + "https://github.com/open-telemetry/opentelemetry-specification/tree/v1.41.0/spec-compliance-matrix.md#logs": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:54.098391-05:00" + }, + "https://github.com/open-telemetry/opentelemetry-specification/tree/v1.41.0/specification/logs/api.md#emit-an-event": { + "StatusCode": 206, + "LastSeen": "2025-01-24T15:12:11.534736-05:00" + }, + "https://github.com/open-telemetry/opentelemetry-specification/tree/v1.41.0/specification/logs/api.md#logger": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:53.212627-05:00" + }, "https://github.com/open-telemetry/opentelemetry-swift": { "StatusCode": 206, "LastSeen": "2025-01-13T11:43:31.834306-05:00" @@ -12243,18 +12303,70 @@ "StatusCode": 206, "LastSeen": "2025-01-17T17:00:31.182634-05:00" }, + "https://github.com/open-telemetry/semantic-conventions/blob/v1.29.0/docs/attributes-registry/code.md": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:46.234005-05:00" + }, + "https://github.com/open-telemetry/semantic-conventions/blob/v1.29.0/docs/system/k8s-metrics.md": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:51.654867-05:00" + }, "https://github.com/open-telemetry/semantic-conventions/issues": { "StatusCode": 200, "LastSeen": "2024-01-30T16:04:52.840828-05:00" }, + "https://github.com/open-telemetry/semantic-conventions/issues/1139": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:55.390621-05:00" + }, + "https://github.com/open-telemetry/semantic-conventions/issues/1161": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:54.31931-05:00" + }, + "https://github.com/open-telemetry/semantic-conventions/issues/1255": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:03.357691-05:00" + }, "https://github.com/open-telemetry/semantic-conventions/issues/1309": { "StatusCode": 200, "LastSeen": "2024-10-09T10:19:24.558756+02:00" }, + "https://github.com/open-telemetry/semantic-conventions/issues/1357": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:00.599997-05:00" + }, + "https://github.com/open-telemetry/semantic-conventions/issues/1403#issuecomment-2368815634": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:56.17573-05:00" + }, "https://github.com/open-telemetry/semantic-conventions/issues/new": { "StatusCode": 206, "LastSeen": "2025-01-15T13:17:31.33164-05:00" }, + "https://github.com/open-telemetry/semantic-conventions/pull/1364#discussion_r1730743509": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:02.222945-05:00" + }, + "https://github.com/open-telemetry/semantic-conventions/pull/1364#discussion_r1852465994": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:05.32906-05:00" + }, + "https://github.com/open-telemetry/semantic-conventions/pull/1636": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:59.880322-05:00" + }, + "https://github.com/open-telemetry/semantic-conventions/pull/1649": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:03.751366-05:00" + }, + "https://github.com/open-telemetry/semantic-conventions/pull/1660": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:07.536872-05:00" + }, + "https://github.com/open-telemetry/semantic-conventions/pull/1668": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:09.499396-05:00" + }, "https://github.com/open-telemetry/semantic-conventions/pull/981": { "StatusCode": 206, "LastSeen": "2025-01-21T20:19:53.65649882Z" @@ -14447,6 +14559,10 @@ "StatusCode": 206, "LastSeen": "2025-01-06T11:23:21.173559-05:00" }, + "https://h2database.com/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:01.474336-05:00" + }, "https://hbase.apache.org/": { "StatusCode": 206, "LastSeen": "2024-01-30T06:06:08.100055-05:00" @@ -14575,6 +14691,14 @@ "StatusCode": 200, "LastSeen": "2025-01-15T13:17:28.04458-05:00" }, + "https://hive.apache.org/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:00.230373-05:00" + }, + "https://hsqldb.org/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:01.182207-05:00" + }, "https://hyper.rs/": { "StatusCode": 200, "LastSeen": "2024-01-30T15:25:23.119442-05:00" @@ -14591,10 +14715,18 @@ "StatusCode": 200, "LastSeen": "2024-12-04T08:46:53.346720267Z" }, + "https://img.shields.io/badge/-rc-mediumorchid": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:43.616123-05:00" + }, "https://img.shields.io/badge/-stable-lightgreen": { "StatusCode": 200, "LastSeen": "2024-01-30T16:14:23.500512-05:00" }, + "https://img.shields.io/badge/changed-orange": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:52.766612-05:00" + }, "https://istio.io/": { "StatusCode": 206, "LastSeen": "2024-05-28T16:37:24.849031551+02:00" @@ -14819,6 +14951,66 @@ "StatusCode": 206, "LastSeen": "2024-06-24T18:06:32.862427557Z" }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#cronjobstatus-v1-batch": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:03.17635-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:00.118397-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentspec-v1-apps": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:51.586711-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentstatus-v1-apps": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:54.982911-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:59.431635-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:59.032073-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:00.645853-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:00.428195-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#namespacestatus-v1-core": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:51.953701-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetspec-v1-apps": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:55.269117-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetstatus-v1-apps": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:55.547555-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerspec-v1-core": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:56.175665-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerstatus-v1-core": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:56.815094-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetspec-v1-apps": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:57.208189-05:00" + }, + "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:57.58161-05:00" + }, "https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/": { "StatusCode": 206, "LastSeen": "2024-04-25T00:01:10.691008-04:00" @@ -14879,6 +15071,10 @@ "StatusCode": 200, "LastSeen": "2024-10-09T10:19:29.153249+02:00" }, + "https://learn.microsoft.com/azure/cosmos-db": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:46.946812-05:00" + }, "https://learn.microsoft.com/azure/cosmos-db/consistency-levels": { "StatusCode": 200, "LastSeen": "2024-12-04T08:46:54.119502378Z" @@ -15071,6 +15267,10 @@ "StatusCode": 200, "LastSeen": "2024-05-22T16:32:51.974599+02:00" }, + "https://learn.microsoft.com/sql/relational-databases/errors-events/database-engine-error-severities": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:46.580424-05:00" + }, "https://learn.microsoft.com/sql/relational-databases/errors-events/database-engine-events-and-errors": { "StatusCode": 200, "LastSeen": "2024-10-09T10:19:29.705755+02:00" @@ -15079,6 +15279,14 @@ "StatusCode": 200, "LastSeen": "2024-04-04T20:00:38.324091-04:00" }, + "https://learn.microsoft.com/windows/win32/procthread/process-working-set": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:37:00.003505-05:00" + }, + "https://learn.microsoft.com/windows/win32/sysinfo/about-handles-and-objects": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:59.132242-05:00" + }, "https://library.humio.com/falcon-logscale/log-shippers-opentelemetry.html": { "StatusCode": 206, "LastSeen": "2024-12-18T05:52:09.018702-05:00" @@ -15147,6 +15355,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T16:04:48.740728-05:00" }, + "https://man7.org/linux/man-pages/man5/proc_meminfo.5.html": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:57.902029-05:00" + }, "https://man7.org/linux/man-pages/man7/cgroups.7.html": { "StatusCode": 206, "LastSeen": "2024-12-04T08:46:55.253298019Z" @@ -15155,6 +15367,14 @@ "StatusCode": 200, "LastSeen": "2024-10-09T10:19:22.001923+02:00" }, + "https://mariadb.com/kb/en/sqlstate/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:45.550335-05:00" + }, + "https://mariadb.org/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:37:11.036164-05:00" + }, "https://masstransit.io/documentation/configuration/observability": { "StatusCode": 200, "LastSeen": "2024-04-23T14:33:28.363350589Z" @@ -15167,6 +15387,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T16:15:00.07395-05:00" }, + "https://maxdb.sap.com/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:37:21.149596-05:00" + }, "https://medium.com/@asafmesika/optimizing-java-observability-opentelemetrys-new-memory-mode-reduces-memory-allocations-by-99-98-e0062eccdc3f": { "StatusCode": 200, "LastSeen": "2024-05-24T10:11:25.171028-05:00" @@ -15203,6 +15427,10 @@ "StatusCode": 200, "LastSeen": "2024-06-24T18:06:23.663092635Z" }, + "https://memcached.org/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:12.587459-05:00" + }, "https://metricshub.com": { "StatusCode": 200, "LastSeen": "2024-10-07T14:48:00.172830893Z" @@ -15247,6 +15475,10 @@ "StatusCode": 206, "LastSeen": "2024-10-16T06:19:11.246616643Z" }, + "https://neo4j.com/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:37:13.697153-05:00" + }, "https://netlify.com": { "StatusCode": 206, "LastSeen": "2024-06-12T11:21:36.089536+02:00" @@ -17095,6 +17327,10 @@ "StatusCode": 200, "LastSeen": "2024-08-07T15:44:45.415408+02:00" }, + "https://pkg.go.dev/k8s.io/api@v0.31.3/core/v1#NamespacePhase": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:55.87184-05:00" + }, "https://pkg.go.dev/net/http": { "StatusCode": 200, "LastSeen": "2024-01-30T15:24:51.249653-05:00" @@ -17323,10 +17559,18 @@ "StatusCode": 206, "LastSeen": "2025-01-15T13:17:39.929029-05:00" }, + "https://redis.io/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:37:17.320553-05:00" + }, "https://redis.io/commands/hmset": { "StatusCode": 206, "LastSeen": "2025-01-06T11:32:34.775836-05:00" }, + "https://redis.io/docs/latest/commands/hmset": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:52.741741-05:00" + }, "https://redis.io/docs/latest/develop/reference/protocol-spec/#simple-errors": { "StatusCode": 206, "LastSeen": "2024-10-09T10:19:24.082944+02:00" @@ -18055,6 +18299,10 @@ "StatusCode": 200, "LastSeen": "2024-01-30T16:04:05.046927-05:00" }, + "https://support.google.com/webmasters/answer/10347851": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:51.45282-05:00" + }, "https://svnbook.red-bean.com/en/1.7/svn.tour.revs.specifiers.html": { "StatusCode": 206, "LastSeen": "2024-08-02T13:15:16.763004-04:00" @@ -18163,6 +18411,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T16:07:34.195677-05:00" }, + "https://trino.io/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:24.899284-05:00" + }, "https://tyk.io": { "StatusCode": 206, "LastSeen": "2024-01-30T15:25:27.767149-05:00" @@ -18219,6 +18471,30 @@ "StatusCode": 206, "LastSeen": "2024-10-09T10:19:33.566697+02:00" }, + "https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#configmap": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:59.132164-05:00" + }, + "https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#downwardapi": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:00.035963-05:00" + }, + "https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#emptydir": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:03.068108-05:00" + }, + "https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#local": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:04.445812-05:00" + }, + "https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#persistentvolumeclaim": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:07.118095-05:00" + }, + "https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#secret": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:07.22215-05:00" + }, "https://v8.dev/docs/stack-trace-api": { "StatusCode": 206, "LastSeen": "2025-01-06T11:32:32.695647-05:00" @@ -18427,6 +18703,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T16:14:59.93877-05:00" }, + "https://www.actian.com/databases/ingres/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:45.173396-05:00" + }, "https://www.alauda.io/community/143237": { "StatusCode": 200, "LastSeen": "2024-11-28T11:47:57.828593+01:00" @@ -18535,6 +18815,14 @@ "StatusCode": 206, "LastSeen": "2024-05-28T16:37:34.613247296+02:00" }, + "https://www.cockroachlabs.com/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:50.470824-05:00" + }, + "https://www.couchbase.com/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:52.894684-05:00" + }, "https://www.cypress.io/": { "StatusCode": 200, "LastSeen": "2025-01-06T11:32:20.719453-05:00" @@ -18567,6 +18855,10 @@ "StatusCode": 206, "LastSeen": "2025-01-13T12:10:40.954551-05:00" }, + "https://www.elastic.co/elasticsearch": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:36:55.174064-05:00" + }, "https://www.elastic.co/guide/en/apm/get-started/current/open-telemetry-elastic.html": { "StatusCode": 206, "LastSeen": "2025-01-06T11:32:18.361614-05:00" @@ -18643,6 +18935,10 @@ "StatusCode": 206, "LastSeen": "2025-01-15T13:17:32.471781-05:00" }, + "https://www.firebirdsql.org/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:36:58.308808-05:00" + }, "https://www.first.org/cvss/calculator/3.1": { "StatusCode": 200, "LastSeen": "2024-01-30T16:14:50.659493-05:00" @@ -18723,6 +19019,10 @@ "StatusCode": 206, "LastSeen": "2024-12-05T10:36:11.479738+01:00" }, + "https://www.ibm.com/db2": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:03.801999-05:00" + }, "https://www.ibm.com/docs/api/v1/content/SSYKE2_8.0.0/openj9/api/jdk8/jre/management/extension/com/ibm/lang/management/OperatingSystemMXBean.html": { "StatusCode": 206, "LastSeen": "2024-08-09T10:46:28.705852-04:00" @@ -18743,6 +19043,14 @@ "StatusCode": 206, "LastSeen": "2025-01-06T11:32:36.421442-05:00" }, + "https://www.ibm.com/products/informix": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:03.04553-05:00" + }, + "https://www.ibm.com/products/netezza": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:08.324371-05:00" + }, "https://www.ietf.org/archive/id/draft-ietf-uuidrev-rfc4122bis-14.html#name-uuid-version-7": { "StatusCode": 200, "LastSeen": "2024-11-02T23:00:01.024560709Z" @@ -18751,6 +19059,10 @@ "StatusCode": 206, "LastSeen": "2024-04-04T20:00:31.717502-04:00" }, + "https://www.influxdata.com/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:07.089698-05:00" + }, "https://www.influxdata.com/time-series-platform/telegraf/": { "StatusCode": 206, "LastSeen": "2024-01-30T16:05:10.329813-05:00" @@ -18759,6 +19071,14 @@ "StatusCode": 200, "LastSeen": "2024-02-09T09:36:03.77411329Z" }, + "https://www.instantdb.com/": { + "StatusCode": 206, + "LastSeen": "2025-01-24T14:37:07.26383-05:00" + }, + "https://www.intersystems.com/products/cache/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:37:08.865983-05:00" + }, "https://www.iso.org/iso-8601-date-and-time-format.html": { "StatusCode": 200, "LastSeen": "2025-01-07T10:31:59.229706-05:00" @@ -19495,6 +19815,10 @@ "StatusCode": 200, "LastSeen": "2024-12-04T08:45:30.976351014Z" }, + "https://www.oracle.com/database/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:37:14.762097-05:00" + }, "https://www.ostif.org/otel-audit-complete/": { "StatusCode": 200, "LastSeen": "2024-07-22T14:20:47.739450411Z" @@ -19563,6 +19887,10 @@ "StatusCode": 200, "LastSeen": "2024-11-28T12:19:39.104666932Z" }, + "https://www.postgresql.org/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:37:19.009091-05:00" + }, "https://www.postgresql.org/docs/current/errcodes-appendix.html": { "StatusCode": 200, "LastSeen": "2024-10-09T10:19:27.445768+02:00" @@ -19663,6 +19991,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T15:25:04.905602-05:00" }, + "https://www.sap.com/products/technology-platform/hana/what-is-sap-hana.html": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:44:56.936873-05:00" + }, "https://www.scorecard.io/": { "StatusCode": 200, "LastSeen": "2024-12-05T10:36:16.128367+01:00" @@ -19707,6 +20039,10 @@ "StatusCode": 200, "LastSeen": "2024-11-14T11:48:05.990449+01:00" }, + "https://www.sqlite.org/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:37:23.669831-05:00" + }, "https://www.sqlite.org/rescode.html": { "StatusCode": 200, "LastSeen": "2024-10-09T10:19:40.728167+02:00" @@ -19739,6 +20075,10 @@ "StatusCode": 200, "LastSeen": "2025-01-13T12:10:48.354869-05:00" }, + "https://www.teradata.com/": { + "StatusCode": 200, + "LastSeen": "2025-01-24T14:37:27.892669-05:00" + }, "https://www.thousandeyes.com/": { "StatusCode": 200, "LastSeen": "2024-01-30T15:26:05.099551-05:00" From 290d7ee479d559f6d28c208403d2745bb35e2f87 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Fri, 24 Jan 2025 15:28:43 -0500 Subject: [PATCH 4/5] Fix format --- .../en/blog/2024/prometheus-compatibility-survey/index.md | 6 +++--- content/en/docs/languages/java/api.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/content/en/blog/2024/prometheus-compatibility-survey/index.md b/content/en/blog/2024/prometheus-compatibility-survey/index.md index 6e54ca3c00fb..78dac6d4d477 100644 --- a/content/en/blog/2024/prometheus-compatibility-survey/index.md +++ b/content/en/blog/2024/prometheus-compatibility-survey/index.md @@ -88,9 +88,9 @@ of their opinions on units or delimiters. ## Dots and Underscores -OpenTelemetry [specifies](/docs/specs/semconv/general/naming/) that -conventions should use dots as the namespace delimiter, and underscores as the -delimiter between "multi-word-dot-delimited components" (for example, +OpenTelemetry [specifies](/docs/specs/semconv/general/naming/) that conventions +should use dots as the namespace delimiter, and underscores as the delimiter +between "multi-word-dot-delimited components" (for example, `http.response.status_code`). On the other hand, Prometheus [uses underscores](https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels) as its delimiter. diff --git a/content/en/docs/languages/java/api.md b/content/en/docs/languages/java/api.md index 5dd42d202044..727a3b80c434 100644 --- a/content/en/docs/languages/java/api.md +++ b/content/en/docs/languages/java/api.md @@ -468,8 +468,8 @@ is a bundle of key value pairs representing the See [semantic attributes](#semantic-attributes) for attribute constants generated from the semantic conventions. -See [attribute naming](/docs/specs/semconv/general/naming/) for -guidance on attribute naming. +See [attribute naming](/docs/specs/semconv/general/naming/) for guidance on +attribute naming. The following code snippet explores `Attributes` API usage: From 87bdd7ce313506e64419a3e75746b68b3a50f936 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Fri, 24 Jan 2025 15:51:29 -0500 Subject: [PATCH 5/5] Add patch for page rename --- scripts/content-modules/adjust-pages.pl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index ae1934e6c1b8..3b9a05198d63 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -98,16 +98,16 @@ () && applyPatchOrPrintMsgIf('2025-01-23-event-aliases', 'spec', '1.41.0'); my $aliases = '^( - )(event-(api|sdk))$'; - s|$aliases|$1./$2|g if /$aliases/; + s|$aliases|$1./$2|; } -sub patchSemConvEmitAnEvent() { +sub patchSemConv1_30_0() { return unless $ARGV =~ /^tmp\/semconv\/docs\// && applyPatchOrPrintMsgIf('2025-01-24-emit-an-event', 'semconv', '1.30.0'); s|Emit Event API|Log API|; - my $path = '(docs/specs/otel/logs/api.md#emit-a)n-event'; - s|$path|$1-logrecord|g if /$path/; + s|(docs/specs/otel/logs/api.md#emit-a)n-event|$1-logrecord|; + s|\[semantic-convention-groups\]|[group-stability]|; } sub getVersFromSubmodule() { @@ -152,6 +152,7 @@ () $lineNum++; last if /^-?-->/; patchEventAliases(); + patchSemConv1_30_0(); $frontMatterFromFile .= $_; } next; @@ -231,7 +232,7 @@ () s|\]\((proto/opamp.proto)\)|]($opAmpSpecRepoUrl/blob/main/$1)|; - patchSemConvEmitAnEvent(); + patchSemConv1_30_0(); print; }