Merge branch 'main' into theletterf-consolidate-contributing-guides-f…

…urther
open-telemetry · Jun 12, 2024 · 570db1d · 570db1d
2 parents ee6c949 + b30a02d
commit 570db1d
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,7 +7,7 @@
 [submodule "content-modules/opentelemetry-specification"]
 	path = content-modules/opentelemetry-specification
 	url = https://github.com/open-telemetry/opentelemetry-specification.git
-	spec-pin = v1.33.0
+	spec-pin = v1.34.0
 [submodule "content-modules/community"]
 	path = content-modules/community
 	url = https://github.com/open-telemetry/community

diff --git a/.htmltest.yml b/.htmltest.yml
@@ -72,3 +72,5 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
   - ^https://wikipedia.org/wiki/(S.M.A.R.T|Hop_)
   # TODO move into content/en/blog/2023/contributing-to-otel/index.md once https://github.com/open-telemetry/opentelemetry.io/issues/3889 is implemented
   - ^https://shorturl.at/vLYZ0$
+  # TODO remove while or after fixing https://github.com/open-telemetry/opentelemetry.io/issues/4656
+  - ^/docs/specs/otel/versioning-and-stability/#experimental
diff --git a/content-modules/opentelemetry-specification b/content-modules/opentelemetry-specification
diff --git a/data/registry/instrumentation-js-cerbos.yml b/data/registry/instrumentation-js-cerbos.yml
@@ -18,5 +18,5 @@ createdAt: 2023-09-13
 package:
   name: '@cerbos/opentelemetry'
   registry: npm
-  version: 0.5.0
+  version: 0.5.1
 isFirstParty: true
diff --git a/data/registry/instrumentation-ruby-all.yml b/data/registry/instrumentation-ruby-all.yml
@@ -14,4 +14,4 @@ createdAt: 2020-11-09
 package:
   registry: gems
   name: opentelemetry-instrumentation-all
-  version: 0.60.0
+  version: 0.61.0
diff --git a/data/registry/instrumentation-ruby-ethon.yml b/data/registry/instrumentation-ruby-ethon.yml
@@ -15,4 +15,4 @@ createdAt: 2020-11-09
 package:
   registry: gems
   name: opentelemetry-instrumentation-ethon
-  version: 0.21.5
+  version: 0.21.6
diff --git a/data/registry/instrumentation-ruby-rails.yml b/data/registry/instrumentation-ruby-rails.yml
@@ -14,4 +14,4 @@ createdAt: 2020-11-09
 package:
   registry: gems
   name: opentelemetry-instrumentation-rails
-  version: 0.30.1
+  version: 0.30.2
diff --git a/layouts/shortcodes/spec_status.html b/layouts/shortcodes/spec_status.html
@@ -25,7 +25,7 @@
   - https://opentelemetry.io/docs/specs/otel/document-status/
   - https://github.com/open-telemetry/opentelemetry-proto#maturity-level
 */ -}}
-{{ $statusValueRE := "(?i:experimental|stable|deprecated|removed|mixed|feature.freeze|alpha|beta)" -}}
+{{ $statusValueRE := "(?i:development|experimental|stable|deprecated|removed|mixed|feature.freeze|alpha|beta)" -}}
 {{ $statusRE := printf "%s(,\\s*%s)*" $statusValueRE $statusValueRE -}}
 {{ with findRE $statusRE $statusLine -}}
   {{ $status = index . 0 -}}

diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl
@@ -18,7 +18,7 @@
 my $semConvRef = "$otelSpecRepoUrl/blob/main/semantic_conventions/README.md";
 my $specBasePath = '/docs/specs';
 my %versions = qw(
-  spec: 1.33.0
+  spec: 1.34.0
   otlp: 1.3.1
   semconv: 1.26.0
 );
@@ -133,6 +133,7 @@ ()
   s|(/context/api-propagators.md)#propagators-api|$1|g;
   s|(/semantic_conventions/faas.md)#function-as-a-service|$1|g;
   s|(/resource/sdk.md)#resource-sdk|$1|g;
+  s|(event-api.md#)(data-model)|$1event-$2|g;
 
   s|\.\.\/README.md\b|$otelSpecRepoUrl/|g if $ARGV =~ /specification._index/;
   s|\.\.\/README.md\b|..| if $ARGV =~ /specification.library-guidelines.md/;
+3 −3		.github/CODEOWNERS
+64 −2		CHANGELOG.md
+1 −1		README.md
+20 −0		development/README.md
+1 −1		development/metrics/config-service.md
+0 −0		development/trace/zpages.md
+0 −15		experimental/README.md
+29 −38		spec-compliance-matrix.md
+4 −5		specification/README.md
+1 −1		specification/common/attribute-type-mapping.md
+1 −1		specification/compatibility/logging_trace_context.md
+1 −1		specification/compatibility/opentracing.md
+4 −4		specification/compatibility/prometheus_and_openmetrics.md
+1 −1		specification/configuration/file-configuration.md
+3 −3		specification/configuration/sdk-environment-variables.md
+6 −2		specification/document-status.md
+1 −1		specification/logs/README.md
+27 −2		specification/logs/bridge-api.md
+49 −18		specification/logs/event-api.md
+37 −9		specification/logs/event-sdk.md
+14 −6		specification/logs/sdk.md
+30 −2		specification/metrics/api.md
+3 −3		specification/metrics/data-model.md
+40 −14		specification/metrics/sdk.md
+1 −1		specification/metrics/sdk_exporters/prometheus.md
+1 −1		specification/protocol/file-exporter.md
+1 −1		specification/schemas/file_format_v1.0.0.md
+1 −1		specification/schemas/file_format_v1.1.0.md
+2 −2		specification/semantic-conventions.md
+1 −1		specification/telemetry-stability.md
+25 −0		specification/trace/api.md
+14 −6		specification/trace/sdk.md
+1 −1		specification/trace/tracestate-handling.md
+1 −1		specification/trace/tracestate-probability-sampling.md
+51 −35		specification/versioning-and-stability.md