diff --git a/.gitmodules b/.gitmodules index f6d58ec4fe43..f41bc0568c72 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,7 +19,7 @@ [submodule "content-modules/semantic-conventions"] path = content-modules/semantic-conventions url = https://github.com/open-telemetry/semantic-conventions - semconv-pin = v1.25.0 + semconv-pin = v1.26.0 [submodule "content-modules/opamp-spec"] path = content-modules/opamp-spec url = https://github.com/open-telemetry/opamp-spec diff --git a/.htmltest.yml b/.htmltest.yml index 09c40257b946..e45612215caf 100644 --- a/.htmltest.yml +++ b/.htmltest.yml @@ -34,6 +34,7 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored - ^https://www.chathamhouse.org - ^https://www.zocdoc.com - ^https://x.com + - ^https://platform.openai.com # OTel Google calendar - curl returns 200, but the link checker gets a 401: - ^https://calendar.google.com/calendar/embed\?src=google.com_b79e3e90j7bbsa2n2p5an5lf60%40group.calendar.google.com # YouTube playlists sometimes give a 404, although they give a 200 when accessed via browser: diff --git a/content-modules/semantic-conventions b/content-modules/semantic-conventions index f1be1511d917..9adff435c76e 160000 --- a/content-modules/semantic-conventions +++ b/content-modules/semantic-conventions @@ -1 +1 @@ -Subproject commit f1be1511d91743a457974ed9a21b9193b2fe0e51 +Subproject commit 9adff435c76ea3b8cba89babefc832d3dd3c1ab9 diff --git a/content/en/blog/2022/debug-otel-with-otel/index.md b/content/en/blog/2022/debug-otel-with-otel/index.md index 98391bc609f2..2dcf2168d574 100644 --- a/content/en/blog/2022/debug-otel-with-otel/index.md +++ b/content/en/blog/2022/debug-otel-with-otel/index.md @@ -253,8 +253,7 @@ COPY opentelemetry_module.conf /etc/nginx/conf.d [put nginx between two services]: /blog/2022/instrument-nginx/#put-nginx-between-two-services [localhost:16686]: http://localhost:16686/ -[http request & response headers]: - /docs/specs/semconv/http/http-spans/#common-attributes +[http request & response headers]: /docs/specs/semconv/http/http-spans/ [rfc7230]: https://httpwg.org/specs/rfc7230.html#field.order [added some checks to the module for nginx]: https://github.com/open-telemetry/opentelemetry-cpp-contrib/pull/204 diff --git a/content/en/docs/languages/java/automatic/configuration.md b/content/en/docs/languages/java/automatic/configuration.md index 4badcceeb420..008f81200ba4 100644 --- a/content/en/docs/languages/java/automatic/configuration.md +++ b/content/en/docs/languages/java/automatic/configuration.md @@ -196,8 +196,8 @@ following property to disable it: You can configure the agent to capture predefined HTTP headers as span attributes, according to the -[semantic convention](/docs/specs/semconv/http/http-spans/#common-attributes). -Use the following properties to define which HTTP headers you want to capture: +[semantic convention](/docs/specs/semconv/http/http-spans/). Use the following +properties to define which HTTP headers you want to capture: {{% config_option name="otel.instrumentation.http.client.capture-request-headers" %}} A comma-separated list of HTTP header names. HTTP client instrumentations will diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index 195655180354..b0f9dd7bc94d 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -20,7 +20,7 @@ my %versions = qw( spec: 1.33.0 otlp: 1.3.1 - semconv: 1.25.0 + semconv: 1.26.0 ); my $otelSpecVers = $versions{'spec:'}; my $otlpSpecVers = $versions{'otlp:'}; @@ -102,6 +102,9 @@ () s|(\]\(process.md)#process(\))|$1$2|g; } + # TODO: drop after fix of https://github.com/open-telemetry/semantic-conventions/pull/1065 + s|opentelemetry-specification/tree/v1\.33\.0/specification/metrics|semantic-conventions/blob/v1\.26\.0/docs/general|g if $ARGV =~ /\/tmp\/semconv\/docs\/system\/container-metrics/; + # SPECIFICATION custom processing s|\(https://github.com/open-telemetry/opentelemetry-specification\)|($specBasePath/otel/)|; diff --git a/static/refcache.json b/static/refcache.json index 2f6fb9783497..b3c3e4ccb0d6 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -1543,6 +1543,10 @@ "StatusCode": 200, "LastSeen": "2024-01-30T16:14:47.417732-05:00" }, + "https://docs.oracle.com/javase/8/docs/api/java/sql/Connection.html#getCatalog--": { + "StatusCode": 200, + "LastSeen": "2024-05-22T16:32:49.714908+02:00" + }, "https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html": { "StatusCode": 200, "LastSeen": "2024-01-18T08:53:30.141424-05:00" @@ -4747,6 +4751,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T06:06:08.100055-05:00" }, + "https://hbase.apache.org/book.html#namespace_creation": { + "StatusCode": 206, + "LastSeen": "2024-05-22T16:32:51.099512+02:00" + }, "https://helm.sh": { "StatusCode": 206, "LastSeen": "2024-01-18T08:52:48.961965-05:00" @@ -5171,6 +5179,10 @@ "StatusCode": 200, "LastSeen": "2024-04-04T20:00:36.37594-04:00" }, + "https://learn.microsoft.com/azure/service-bus-messaging/service-bus-messages-payloads#message-routing-and-correlation": { + "StatusCode": 200, + "LastSeen": "2024-05-22T16:32:55.573409+02:00" + }, "https://learn.microsoft.com/azure/service-bus-messaging/service-bus-messaging-overview": { "StatusCode": 200, "LastSeen": "2024-04-04T20:00:36.708409-04:00" @@ -5179,6 +5191,10 @@ "StatusCode": 200, "LastSeen": "2024-01-30T16:14:24.003181-05:00" }, + "https://learn.microsoft.com/dotnet/api/system.data.sqlclient.sqlconnection.database": { + "StatusCode": 200, + "LastSeen": "2024-05-22T16:32:51.167939+02:00" + }, "https://learn.microsoft.com/dotnet/api/system.net.endpoint": { "StatusCode": 200, "LastSeen": "2024-01-30T16:14:23.701401-05:00" @@ -5223,6 +5239,10 @@ "StatusCode": 200, "LastSeen": "2024-01-30T16:14:24.361664-05:00" }, + "https://learn.microsoft.com/sql/connect/jdbc/building-the-connection-url#named-and-multiple-sql-server-instances": { + "StatusCode": 200, + "LastSeen": "2024-05-22T16:32:51.974599+02:00" + }, "https://learn.microsoft.com/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfo": { "StatusCode": 200, "LastSeen": "2024-04-04T20:00:38.324091-04:00" @@ -5275,6 +5295,10 @@ "StatusCode": 206, "LastSeen": "2024-01-18T20:05:30.465821-05:00" }, + "https://man7.org/linux/man-pages/man1/free.1.html": { + "StatusCode": 206, + "LastSeen": "2024-05-22T16:32:50.196928+02:00" + }, "https://man7.org/linux/man-pages/man1/ps.1.html#PROCESS_STATE_CODES": { "StatusCode": 206, "LastSeen": "2024-01-18T08:53:14.645117-05:00" @@ -8611,6 +8635,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T06:05:58.268011-05:00" }, + "https://www.mongodb.com/docs/manual/reference/command/": { + "StatusCode": 206, + "LastSeen": "2024-05-22T16:32:48.330708+02:00" + }, "https://www.mysql.com/": { "StatusCode": 206, "LastSeen": "2024-01-30T16:07:22.780855-05:00" @@ -9027,6 +9055,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T06:05:58.327146-05:00" }, + "https://www.rabbitmq.com/tutorials/tutorial-six-java#correlation-id": { + "StatusCode": 200, + "LastSeen": "2024-05-22T16:32:54.993722+02:00" + }, "https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/org/reactivestreams/Publisher.html": { "StatusCode": 206, "LastSeen": "2024-01-18T19:10:25.020977-05:00" @@ -9055,6 +9087,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T06:01:07.991648-05:00" }, + "https://www.rfc-editor.org/rfc/rfc3986#section-4.2": { + "StatusCode": 206, + "LastSeen": "2024-05-22T16:32:51.752771+02:00" + }, "https://www.rfc-editor.org/rfc/rfc5789.html": { "StatusCode": 206, "LastSeen": "2024-01-18T08:05:44.436708-05:00"