From fc0c48b7fb92a42b7e2744a2f05f22a9a99d50a7 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Mon, 20 Feb 2023 15:17:41 -0500 Subject: [PATCH] Mount iconography 32x32 icons to static/img/logos (#2369) --- .htmltest.yml | 2 + content/en/docs/collector/configuration.md | 12 ++-- content/en/docs/concepts/data-collection.md | 6 +- content/en/docs/instrumentation/cpp/_index.md | 6 +- .../en/docs/instrumentation/erlang/_index.md | 2 +- .../en/docs/instrumentation/java/_index.md | 3 +- content/en/docs/instrumentation/js/_index.md | 2 +- content/en/docs/instrumentation/net/_index.md | 2 +- content/en/docs/instrumentation/php/_index.md | 2 +- .../en/docs/instrumentation/python/_index.md | 3 +- .../en/docs/instrumentation/ruby/_index.md | 2 +- .../en/docs/instrumentation/rust/_index.md | 2 +- .../en/docs/instrumentation/swift/_index.md | 2 +- hugo.yaml | 2 + .../32x32/{C#_SDK.svg => Csharp_SDK.svg} | 0 .../512x512/{C#_SDK.png => Csharp_SDK.png} | Bin static/refcache.json | 64 ------------------ 17 files changed, 25 insertions(+), 87 deletions(-) rename iconography/32x32/{C#_SDK.svg => Csharp_SDK.svg} (100%) rename iconography/512x512/{C#_SDK.png => Csharp_SDK.png} (100%) diff --git a/.htmltest.yml b/.htmltest.yml index a25d0e627..c9b5c0b6b 100644 --- a/.htmltest.yml +++ b/.htmltest.yml @@ -40,3 +40,5 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored - ^https://www\.jaegertracing\.io/docs/latest/opentelemetry # TODO: drop after fix to https://github.com/open-telemetry/opentelemetry-specification/pull/3230 - ^https://wikipedia\.org/wiki/Double-precision_floating-point_format + # TODO: drop after fix to + - ^https://raw.github.com/open-telemetry/opentelemetry.io/main/iconography/32x32/Golang_SDK.svg diff --git a/content/en/docs/collector/configuration.md b/content/en/docs/collector/configuration.md index ff7a16f1a..8310569ea 100644 --- a/content/en/docs/collector/configuration.md +++ b/content/en/docs/collector/configuration.md @@ -13,11 +13,11 @@ Familiarity with the following pages is assumed: The Collector consists of three components that access telemetry data: -- +- [Receivers](#receivers) -- +- [Processors](#processors) -- +- [Exporters](#exporters) These components once configured must be enabled via pipelines within the @@ -168,7 +168,7 @@ service: ## Receivers - + A receiver, which can be push or pull based, is how data gets into the Collector. Receivers may support one or more @@ -245,7 +245,7 @@ receivers: ## Processors - + Processors are run on data between being received and being exported. Processors are optional though @@ -326,7 +326,7 @@ processors: ## Exporters - + An exporter, which can be push or pull based, is how you send data to one or more backends/destinations. Exporters may support one or more diff --git a/content/en/docs/concepts/data-collection.md b/content/en/docs/concepts/data-collection.md index 64fcf3175..28001ec8c 100644 --- a/content/en/docs/concepts/data-collection.md +++ b/content/en/docs/concepts/data-collection.md @@ -33,12 +33,12 @@ For information on how to use the Collector see the The Collector is made up of the following components: -- +- `receivers`: How to get data into the Collector; these can be push or pull based -- +- `processors`: What to do with received data -- +- `exporters`: Where to send received data; these can be push or pull based These components are enabled through `pipelines`. Multiple instances of diff --git a/content/en/docs/instrumentation/cpp/_index.md b/content/en/docs/instrumentation/cpp/_index.md index 1fe4015b3..114ae02f7 100644 --- a/content/en/docs/instrumentation/cpp/_index.md +++ b/content/en/docs/instrumentation/cpp/_index.md @@ -2,8 +2,7 @@ title: C++ weight: 11 description: > - C++ A language-specific implementation of OpenTelemetry in C++. --- @@ -12,4 +11,5 @@ description: > ## Repositories - Main: [opentelemetry-cpp](https://github.com/open-telemetry/opentelemetry-cpp) -- Contrib: [opentelemetry-cpp-contrib](https://github.com/open-telemetry/opentelemetry-cpp-contrib) +- Contrib: + [opentelemetry-cpp-contrib](https://github.com/open-telemetry/opentelemetry-cpp-contrib) diff --git a/content/en/docs/instrumentation/erlang/_index.md b/content/en/docs/instrumentation/erlang/_index.md index 593c11027..b2cf5d9e1 100644 --- a/content/en/docs/instrumentation/erlang/_index.md +++ b/content/en/docs/instrumentation/erlang/_index.md @@ -3,7 +3,7 @@ title: Erlang/Elixir weight: 14 description: > Erlang/Elixir A language-specific implementation of OpenTelemetry in Erlang/Elixir. --- diff --git a/content/en/docs/instrumentation/java/_index.md b/content/en/docs/instrumentation/java/_index.md index 3cec43ce1..abf421e59 100644 --- a/content/en/docs/instrumentation/java/_index.md +++ b/content/en/docs/instrumentation/java/_index.md @@ -1,8 +1,7 @@ --- title: Java description: >- - Java A language-specific implementation of OpenTelemetry in Java. aliases: [/java, /java/metrics, /java/tracing] weight: 18 diff --git a/content/en/docs/instrumentation/js/_index.md b/content/en/docs/instrumentation/js/_index.md index e3eb3f025..195281019 100644 --- a/content/en/docs/instrumentation/js/_index.md +++ b/content/en/docs/instrumentation/js/_index.md @@ -2,7 +2,7 @@ title: JavaScript description: >- JavaScript A language-specific implementation of OpenTelemetry in JavaScript (for Node.js & the browser). aliases: [/js, /js/metrics, /js/tracing] diff --git a/content/en/docs/instrumentation/net/_index.md b/content/en/docs/instrumentation/net/_index.md index 15dbddb41..55e1b9795 100644 --- a/content/en/docs/instrumentation/net/_index.md +++ b/content/en/docs/instrumentation/net/_index.md @@ -2,7 +2,7 @@ title: .NET description: > .NET A language-specific implementation of OpenTelemetry in .NET. aliases: [/csharp, /csharp/metrics, /csharp/tracing] diff --git a/content/en/docs/instrumentation/php/_index.md b/content/en/docs/instrumentation/php/_index.md index 5e5b27acb..59afd110b 100644 --- a/content/en/docs/instrumentation/php/_index.md +++ b/content/en/docs/instrumentation/php/_index.md @@ -2,7 +2,7 @@ title: PHP description: >- PHP A language-specific implementation of OpenTelemetry in PHP. weight: 21 diff --git a/content/en/docs/instrumentation/python/_index.md b/content/en/docs/instrumentation/python/_index.md index c7076250b..222c84221 100644 --- a/content/en/docs/instrumentation/python/_index.md +++ b/content/en/docs/instrumentation/python/_index.md @@ -1,8 +1,7 @@ --- title: Python description: >- - Python A language-specific implementation of OpenTelemetry in Python. aliases: [/python, /python/metrics, /python/tracing] diff --git a/content/en/docs/instrumentation/ruby/_index.md b/content/en/docs/instrumentation/ruby/_index.md index 10430b717..f202e1dc2 100644 --- a/content/en/docs/instrumentation/ruby/_index.md +++ b/content/en/docs/instrumentation/ruby/_index.md @@ -1,7 +1,7 @@ --- title: Ruby description: > - Ruby + Ruby A language-specific implementation of OpenTelemetry in Ruby. aliases: [/ruby, /ruby/metrics, /ruby/tracing] weight: 24 diff --git a/content/en/docs/instrumentation/rust/_index.md b/content/en/docs/instrumentation/rust/_index.md index 981b00d5d..3a054b391 100644 --- a/content/en/docs/instrumentation/rust/_index.md +++ b/content/en/docs/instrumentation/rust/_index.md @@ -2,7 +2,7 @@ title: Rust description: >- Rust A language-specific implementation of OpenTelemetry in Rust. weight: 26 diff --git a/content/en/docs/instrumentation/swift/_index.md b/content/en/docs/instrumentation/swift/_index.md index 4de622873..9063177db 100644 --- a/content/en/docs/instrumentation/swift/_index.md +++ b/content/en/docs/instrumentation/swift/_index.md @@ -3,7 +3,7 @@ title: Swift weight: 28 description: >- Swift A language-specific implementation of OpenTelemetry in Swift. --- diff --git a/hugo.yaml b/hugo.yaml index 3949ef7f6..ef428b99b 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -191,3 +191,5 @@ module: target: static/img - source: content-modules/opentelemetry-specification/internal/img target: static/img + - source: iconography/32x32 + target: static/img/logos/32x32 diff --git a/iconography/32x32/C#_SDK.svg b/iconography/32x32/Csharp_SDK.svg similarity index 100% rename from iconography/32x32/C#_SDK.svg rename to iconography/32x32/Csharp_SDK.svg diff --git a/iconography/512x512/C#_SDK.png b/iconography/512x512/Csharp_SDK.png similarity index 100% rename from iconography/512x512/C#_SDK.png rename to iconography/512x512/Csharp_SDK.png diff --git a/static/refcache.json b/static/refcache.json index 6ffc5fba5..057dd9ba9 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -3063,70 +3063,6 @@ "StatusCode": 206, "LastSeen": "2023-02-18T12:39:41.430603-05:00" }, - "https://raw.github.com/open-telemetry/opentelemetry.io/main/iconography/32x32/Golang_SDK.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:41:24.794771-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/.NET.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:41:02.942753-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/C++_SDK.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:41:08.548777-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/Erlang_SDK.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:41:13.981269-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/Exporters.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:40:51.762354-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/JS_SDK.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:41:35.607173-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/Java_SDK.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:41:30.170056-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/PHP.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:41:41.02911-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/Processors.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:40:46.321973-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/Python_SDK.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:41:46.457416-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/Receivers.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:40:40.894851-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/Ruby_SDK.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:41:51.932931-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/Rust.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:41:57.349314-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/32x32/Swift.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:42:02.794238-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/Instrumenting_Library_nested_spans.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:42:15.590442-05:00" - }, - "https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/iconography/Otel_Collector.svg": { - "StatusCode": 206, - "LastSeen": "2023-02-18T12:40:57.23526-05:00" - }, "https://reactivex.io/RxJava/2.x/javadoc/index.html": { "StatusCode": 206, "LastSeen": "2023-02-18T12:42:09.238995-05:00"