Skip to content

Commit

Permalink
Update to spec 1.26.0 and semconv 1.22.0 at the SAME time (#3388)
Browse files Browse the repository at this point in the history
  • Loading branch information
chalin authored Oct 16, 2023
1 parent eff2070 commit da582e5
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .htmltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
- ^/community/end-user/feedback-survey/$
- ^(/docs/migration/)?opencensus/$

# TODO(@chalin) remove once the website pages have caught up with latest semconv changes:
- ^/docs/specs/otel/\w+/semantic_conventions
- \#instrument-advice

- ^https://deploy-preview-\d+--opentelemetry.netlify.app/
- ^https://www\.googletagmanager\.com

Expand Down
1 change: 1 addition & 0 deletions .warnings-skip-list.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docs/specs/otel/common/attribute-requirement-level.md
2 changes: 1 addition & 1 deletion content-modules/opentelemetry-specification
Submodule opentelemetry-specification updated 78 files
+5 −6 .github/CODEOWNERS
+50 −0 CHANGELOG.md
+28 −28 spec-compliance-matrix.md
+3 −11 specification/common/attribute-naming.md
+4 −2 specification/common/attribute-requirement-level.md
+1 −1 specification/compatibility/opencensus.md
+2 −2 specification/compatibility/opentracing.md
+25 −19 specification/compatibility/prometheus_and_openmetrics.md
+3 −3 specification/configuration/sdk-environment-variables.md
+1 −1 specification/glossary.md
+0 −1 specification/logs/README.md
+3 −3 specification/logs/data-model-appendix.md
+3 −4 specification/logs/data-model.md
+2 −2 specification/logs/event-api.md
+0 −21 specification/logs/semantic_conventions/README.md
+0 −50 specification/logs/semantic_conventions/events.md
+0 −55 specification/logs/semantic_conventions/exceptions.md
+0 −58 specification/logs/semantic_conventions/feature-flags.md
+0 −32 specification/logs/semantic_conventions/general.md
+0 −50 specification/logs/semantic_conventions/media.md
+0 −1 specification/metrics/README.md
+27 −12 specification/metrics/api.md
+1 −1 specification/metrics/data-model.md
+2 −2 specification/metrics/sdk.md
+0 −230 specification/metrics/semantic_conventions/README.md
+0 −66 specification/metrics/semantic_conventions/database-metrics.md
+0 −88 specification/metrics/semantic_conventions/faas-metrics.md
+0 −394 specification/metrics/semantic_conventions/hardware-metrics.md
+0 −355 specification/metrics/semantic_conventions/http-metrics.md
+0 −6 specification/metrics/semantic_conventions/instrumentation/README.md
+0 −89 specification/metrics/semantic_conventions/instrumentation/kafka.md
+0 −54 specification/metrics/semantic_conventions/process-metrics.md
+0 −227 specification/metrics/semantic_conventions/rpc-metrics.md
+0 −404 specification/metrics/semantic_conventions/runtime-environment-metrics.md
+0 −194 specification/metrics/semantic_conventions/system-metrics.md
+1 −1 specification/performance-benchmark.md
+1 −1 specification/protocol/exporter.md
+2 −2 specification/resource/sdk.md
+0 −231 specification/resource/semantic_conventions/README.md
+0 −35 specification/resource/semantic_conventions/browser.md
+0 −90 specification/resource/semantic_conventions/cloud.md
+0 −27 specification/resource/semantic_conventions/cloud_provider/aws/README.md
+0 −30 specification/resource/semantic_conventions/cloud_provider/aws/ecs.md
+0 −18 specification/resource/semantic_conventions/cloud_provider/aws/eks.md
+0 −27 specification/resource/semantic_conventions/cloud_provider/aws/logs.md
+0 −15 specification/resource/semantic_conventions/cloud_provider/gcp/README.md
+0 −19 specification/resource/semantic_conventions/cloud_provider/gcp/cloud_run.md
+0 −35 specification/resource/semantic_conventions/cloud_provider/heroku.md
+0 −22 specification/resource/semantic_conventions/container.md
+0 −18 specification/resource/semantic_conventions/deployment_environment.md
+0 −29 specification/resource/semantic_conventions/device.md
+0 −86 specification/resource/semantic_conventions/faas.md
+0 −63 specification/resource/semantic_conventions/host.md
+0 −216 specification/resource/semantic_conventions/k8s.md
+0 −39 specification/resource/semantic_conventions/os.md
+0 −226 specification/resource/semantic_conventions/process.md
+0 −29 specification/resource/semantic_conventions/webengine.md
+2 −2 specification/trace/api.md
+1 −1 specification/trace/exceptions.md
+1 −1 specification/trace/sdk.md
+1 −1 specification/trace/sdk_exporters/jaeger.md
+6 −6 specification/trace/sdk_exporters/zipkin.md
+0 −50 specification/trace/semantic_conventions/README.md
+0 −209 specification/trace/semantic_conventions/cloudevents.md
+0 −41 specification/trace/semantic_conventions/compatibility.md
+0 −369 specification/trace/semantic_conventions/database.md
+0 −112 specification/trace/semantic_conventions/exceptions.md
+0 −262 specification/trace/semantic_conventions/faas.md
+0 −62 specification/trace/semantic_conventions/feature-flags.md
+0 −461 specification/trace/semantic_conventions/http.md
+0 −254 specification/trace/semantic_conventions/instrumentation/aws-lambda.md
+0 −257 specification/trace/semantic_conventions/instrumentation/aws-sdk.md
+0 −34 specification/trace/semantic_conventions/instrumentation/graphql.md
+0 −581 specification/trace/semantic_conventions/messaging.md
+0 −355 specification/trace/semantic_conventions/rpc.md
+0 −385 specification/trace/semantic_conventions/span-general.md
+164 −0 specification/upgrading.md
+1 −1 supplementary-guidelines/compatibility/aws.md
2 changes: 1 addition & 1 deletion content-modules/semantic-conventions
5 changes: 3 additions & 2 deletions scripts/content-modules/adjust-pages.pl
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
my $specBasePath = '/docs/specs';
my $path_base_for_github_subdir = "content/en$specBasePath";
my %versions = qw(
spec: 1.25.0
spec: 1.26.0
otlp: 1.0.0
semconv: 1.21.0
semconv: 1.22.0
);
my $otelSpecVers = $versions{'spec:'};
my $otlpSpecVers = $versions{'otlp:'};
Expand Down Expand Up @@ -134,6 +134,7 @@ ()
# Images
s|(\.\./)?internal(/img/[-\w]+\.png)|$2|g;
s|(\]\()(img/.*?\))|$1../$2|g if $ARGV !~ /(logs|schemas)._index/ && $ARGV !~ /otlp\/docs/;
s|(\]\()([^)]+\.png\))|$1../$2|g if $ARGV =~ /\/tmp\/semconv\/docs\/general\/attributes/;

# Fix links that are to the title of the .md page
# TODO: fix these in the spec
Expand Down
44 changes: 44 additions & 0 deletions static/refcache.json
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,10 @@
"StatusCode": 200,
"LastSeen": "2023-06-30T09:18:28.374093-04:00"
},
"https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels": {
"StatusCode": 200,
"LastSeen": "2023-10-16T14:13:38.873062-04:00"
},
"https://developer.android.com/reference/android/os/Build#MANUFACTURER": {
"StatusCode": 200,
"LastSeen": "2023-06-29T16:08:18.483355-04:00"
Expand Down Expand Up @@ -859,10 +863,18 @@
"StatusCode": 206,
"LastSeen": "2023-07-06T17:58:46.994822-04:00"
},
"https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect": {
"StatusCode": 206,
"LastSeen": "2023-10-16T14:13:22.14114-04:00"
},
"https://docs.docker.com/engine/reference/run/#container-identification": {
"StatusCode": 206,
"LastSeen": "2023-06-29T16:07:35.082785-04:00"
},
"https://docs.docker.com/registry/spec/manifest-v2-2/#example-image-manifest": {
"StatusCode": 206,
"LastSeen": "2023-10-16T14:13:33.061931-04:00"
},
"https://docs.fluentbit.io/manual/pipeline/inputs/opentelemetry/": {
"StatusCode": 206,
"LastSeen": "2023-07-21T16:51:51.751459+02:00"
Expand Down Expand Up @@ -1163,6 +1175,10 @@
"StatusCode": 200,
"LastSeen": "2023-06-29T15:47:45.601398-04:00"
},
"https://docs.oracle.com/en/java/javase/17/docs/api/java.management/java/lang/management/OperatingSystemMXBean.html#getSystemLoadAverage%28%29": {
"StatusCode": 200,
"LastSeen": "2023-10-16T14:12:45.788489-04:00"
},
"https://docs.oracle.com/en/java/javase/17/docs/api/jdk.management/com/sun/management/OperatingSystemMXBean.html#getCpuLoad%28%29": {
"StatusCode": 200,
"LastSeen": "2023-06-30T11:41:27.635612-04:00"
Expand Down Expand Up @@ -1191,6 +1207,10 @@
"StatusCode": 200,
"LastSeen": "2023-06-29T15:51:44.10099-04:00"
},
"https://docs.oracle.com/javase/8/docs/api/java/lang/Runtime.html#availableProcessors--": {
"StatusCode": 200,
"LastSeen": "2023-10-16T14:12:40.31885-04:00"
},
"https://docs.oracle.com/javase/8/docs/api/java/lang/management/BufferPoolMXBean.html#getCount--": {
"StatusCode": 200,
"LastSeen": "2023-06-30T11:41:48.215405-04:00"
Expand Down Expand Up @@ -3963,6 +3983,10 @@
"StatusCode": 200,
"LastSeen": "2023-08-14T07:27:51.174082501Z"
},
"https://learn.microsoft.com/en-us/archive/blogs/askcore/windows-performance-monitor-disk-counters-explained#windows-performance-monitor-disk-counters-explained": {
"StatusCode": 200,
"LastSeen": "2023-10-16T14:12:52.488179-04:00"
},
"https://learn.microsoft.com/en-us/dotnet/api/system.reflection.assembly.getentryassembly": {
"StatusCode": 200,
"LastSeen": "2023-09-06T15:04:13.518691+02:00"
Expand Down Expand Up @@ -4063,6 +4087,10 @@
"StatusCode": 206,
"LastSeen": "2023-06-29T16:06:20.249047-04:00"
},
"https://man7.org/linux/man-pages/man5/proc.5.html": {
"StatusCode": 206,
"LastSeen": "2023-10-16T14:13:03.195663-04:00"
},
"https://man7.org/linux/man-pages/man7/ip.7.html": {
"StatusCode": 206,
"LastSeen": "2023-06-29T16:06:09.52953-04:00"
Expand Down Expand Up @@ -4295,6 +4323,10 @@
"StatusCode": 206,
"LastSeen": "2023-06-29T18:37:38.705465-04:00"
},
"https://opencontainers.org/": {
"StatusCode": 206,
"LastSeen": "2023-10-16T14:13:27.523763-04:00"
},
"https://openfeature.dev/": {
"StatusCode": 206,
"LastSeen": "2023-10-05T19:47:00.973306+02:00"
Expand Down Expand Up @@ -5035,6 +5067,10 @@
"StatusCode": 200,
"LastSeen": "2023-06-29T18:53:19.161811-04:00"
},
"https://superuser.com/a/980821": {
"StatusCode": 200,
"LastSeen": "2023-10-16T14:12:57.75446-04:00"
},
"https://sysdig.com/blog/kubernetes-1-25-whats-new/": {
"StatusCode": 206,
"LastSeen": "2023-06-01T15:55:25.047205-04:00"
Expand Down Expand Up @@ -5235,6 +5271,10 @@
"StatusCode": 200,
"LastSeen": "2023-09-27T06:45:36.696402804Z"
},
"https://wiki.osdev.org/CPUID": {
"StatusCode": 200,
"LastSeen": "2023-10-16T14:13:16.464459-04:00"
},
"https://wiki.python.org/moin/PythonImplementations": {
"StatusCode": 200,
"LastSeen": "2023-06-30T08:37:31.222649-04:00"
Expand Down Expand Up @@ -5927,6 +5967,10 @@
"StatusCode": 200,
"LastSeen": "2023-06-27T17:17:33.646508-04:00"
},
"https://www.rfc-editor.org/rfc/rfc5952.html": {
"StatusCode": 206,
"LastSeen": "2023-10-16T14:13:10.625503-04:00"
},
"https://www.rfc-editor.org/rfc/rfc9110.html": {
"StatusCode": 200,
"LastSeen": "2023-06-29T18:38:37.624739-04:00"
Expand Down

0 comments on commit da582e5

Please sign in to comment.