Merge branch 'reese-lee-patch-1' of github.com:open-telemetry/opentel…

…emetry.io into reese-lee-patch-1
open-telemetry · Apr 12, 2024 · ed246ec · ed246ec
2 parents cc32746 + 4252477
commit ed246ec
Show file tree

Hide file tree

Showing 4 changed files with 27 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.31.0
+	spec-pin = v1.32.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.31.0
+  spec: 1.32.0
   otlp: 1.2.0
   semconv: 1.25.0
 );

diff --git a/static/refcache.json b/static/refcache.json
@@ -3879,6 +3879,14 @@
     "StatusCode": 200,
     "LastSeen": "2024-01-30T05:19:02.768932-05:00"
   },
+  "https://github.com/open-telemetry/opentelemetry-specification/issues/3966": {
+    "StatusCode": 200,
+    "LastSeen": "2024-04-11T14:54:53.493845265Z"
+  },
+  "https://github.com/open-telemetry/opentelemetry-specification/issues/3967": {
+    "StatusCode": 200,
+    "LastSeen": "2024-04-11T14:54:50.847233614Z"
+  },
   "https://github.com/open-telemetry/opentelemetry-specification/issues/437": {
     "StatusCode": 200,
     "LastSeen": "2024-01-18T19:36:56.207791-05:00"
@@ -6863,6 +6871,22 @@
     "StatusCode": 206,
     "LastSeen": "2024-01-18T19:55:30.198683-05:00"
   },
+  "https://prometheus.io/docs/instrumenting/clientlibs/": {
+    "StatusCode": 206,
+    "LastSeen": "2024-04-11T14:54:50.705990785Z"
+  },
+  "https://prometheus.io/docs/instrumenting/exposition_formats/#basic-info": {
+    "StatusCode": 206,
+    "LastSeen": "2024-04-11T14:54:57.142101041Z"
+  },
+  "https://prometheus.io/docs/instrumenting/exposition_formats/#comments-help-text-and-type-information": {
+    "StatusCode": 206,
+    "LastSeen": "2024-04-11T14:54:55.03691741Z"
+  },
+  "https://prometheus.io/docs/instrumenting/writing_clientlibs/#overall-structure": {
+    "StatusCode": 206,
+    "LastSeen": "2024-04-11T14:54:52.880727432Z"
+  },
   "https://prometheus.io/docs/practices/naming/#metric-names": {
     "StatusCode": 206,
     "LastSeen": "2024-01-18T19:06:10.627254-05:00"
+13 −0		.github/ISSUE_TEMPLATE/profiling.md
+0 −51		.github/ISSUE_TEMPLATE/project.md
+0 −12		.github/workflows/auto-assign-issue.yml
+71 −0		CHANGELOG.md
+34 −40		spec-compliance-matrix.md
+3 −2		specification/common/README.md
+2 −2		specification/common/mapping-to-non-otlp.md
+87 −50		specification/compatibility/prometheus_and_openmetrics.md
+20 −6		specification/configuration/file-configuration.md
+76 −28		specification/configuration/sdk-environment-variables.md
+4 −4		specification/glossary.md
+5 −1		specification/logs/bridge-api.md
+2 −8		specification/logs/data-model.md
+80 −14		specification/logs/sdk.md
+1 −1		specification/logs/sdk_exporters/stdout.md
+7 −38		specification/metrics/metric-requirement-level.md
+77 −11		specification/metrics/sdk.md
+1 −1		specification/metrics/sdk_exporters/in-memory.md
+1 −1		specification/metrics/sdk_exporters/otlp.md
+35 −18		specification/metrics/sdk_exporters/prometheus.md
+1 −1		specification/metrics/sdk_exporters/stdout.md
+2 −2		specification/protocol/file-exporter.md
+68 −5		specification/trace/sdk.md
+0 −166		specification/trace/sdk_exporters/jaeger.md
+1 −1		specification/trace/sdk_exporters/stdout.md
+2 −2		specification/trace/tracestate-probability-sampling.md