Merge branch 'main' into go-example-names

open-telemetry · Jul 12, 2024 · 9007d81 · 9007d81
2 parents 869d96a + a5ba656
commit 9007d81
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 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.34.0
+	spec-pin = v1.35.0
 [submodule "content-modules/community"]
 	path = content-modules/community
 	url = https://github.com/open-telemetry/community

diff --git a/content-modules/opentelemetry-specification b/content-modules/opentelemetry-specification
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.34.0
+  spec: 1.35.0
   otlp: 1.3.2
   semconv: 1.26.0
 );
+12 −0		CHANGELOG.md
+17 −17		spec-compliance-matrix.md
+1 −1		specification/README.md
+6 −6		specification/compatibility/logging_trace_context.md
+1 −1		specification/context/api-propagators.md
+1 −1		specification/logs/README.md
+1 −1		specification/logs/event-sdk.md
+23 −1		specification/logs/sdk.md
+4 −4		specification/metrics/supplementary-guidelines.md
+1 −1		specification/trace/api.md
+2 −2		specification/trace/tracestate-handling.md