Skip to content

Commit 4c1fd3a

Browse files
committed
Merge remote-tracking branch 'origin/main' into otelbot/semconv-integration-v1.40.0-dev
2 parents 3ea3fea + 5e4cbac commit 4c1fd3a

File tree

70 files changed

+3124
-2129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3124
-2129
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
[submodule "content-modules/opentelemetry-java-examples"]
3030
path = content-modules/opentelemetry-java-examples
3131
url = https://github.com/open-telemetry/opentelemetry-java-examples.git
32-
javaexamples-pin = 5023e70
32+
javaexamples-pin = 5c183df
3333
[submodule "content-modules/opentelemetry-go-contrib"]
3434
path = content-modules/opentelemetry-go-contrib
3535
url = https://github.com/open-telemetry/opentelemetry-go-contrib
36-
go-contrib-pin = 0a5b338
36+
go-contrib-pin = 5288efd

assets/scss/_styles_project.scss

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Docsy-delta full file override: we're not tracking changes to the Docsy file of the same name. */
2-
// cSpell:ignore docsy
2+
// cSpell:ignore docsy kapa
33

44
@import 'registry';
55
@import 'tabs';
@@ -60,3 +60,14 @@ body.td-page--draft .td-content {
6060
padding-left: 0.6rem;
6161
}
6262
}
63+
64+
// Kapa widget
65+
66+
#kapa-widget-container {
67+
--modal-inner-align: flex-end !important;
68+
}
69+
70+
// Alternative to the above:
71+
// #kapa-widget-container::part(modal-inner) {
72+
// align-items: flex-end !important;
73+
// }

content/en/docs/collector/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Vendor-agnostic way to receive, process and export telemetry data.
44
aliases: [collector/about]
55
sidebar_root_for: children
66
cascade:
7-
vers: 0.149.0
7+
vers: 0.150.0
88
weight: 270
99
---
1010

0 commit comments

Comments
 (0)