Skip to content

Commit 697c8b7

Browse files
committed
Merge remote-tracking branch 'origin/main' into otelbot/semconv-integration-v1.39.0-dev
2 parents 83ddfee + 181d240 commit 697c8b7

File tree

9 files changed

+844
-844
lines changed

9 files changed

+844
-844
lines changed

config/_default/hugo.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ languages:
5757
params:
5858
description: OpenTelemetry 项目网站
5959

60+
enableEmoji: true
61+
6062
imaging:
6163
resampleFilter: CatmullRom # cspell:disable-line
6264
quality: 75

content/en/community/end-user/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ CNCF Slack! Not there yet?
101101

102102
{{% alert title="For OpenTelemetry contributors" %}}
103103

104-
Is your SIG in need of insights from end users?:female-detective: Are you
104+
Is your SIG in need of insights from end users? :female_detective: Are you
105105
wanting to find out whether end users are using or even aware of a feature your
106106
SIG has developed? Or perhaps you're looking for some general feedback about the
107107
thing you've spent hours working on? Reach out to the End User SIG on Slack

content/en/docs/languages/python/instrumentation.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,20 +406,18 @@ log records that OpenTelemetry can process.
406406
import logging
407407
from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
408408
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, ConsoleLogExporter
409-
from opentelemetry._logs import set_logger_provider, get_logger
409+
from opentelemetry._logs import set_logger_provider
410410

411411
provider = LoggerProvider()
412412
processor = BatchLogRecordProcessor(ConsoleLogExporter())
413413
provider.add_log_record_processor(processor)
414414
# Sets the global default logger provider
415415
set_logger_provider(provider)
416416

417-
logger = get_logger(__name__)
418-
419417
handler = LoggingHandler(level=logging.INFO, logger_provider=provider)
420418
logging.basicConfig(handlers=[handler], level=logging.INFO)
421419

422-
logging.info("This is an OpenTelemetry log record!")
420+
logging.getLogger(__name__).info("This is an OpenTelemetry log record!")
423421
```
424422

425423
### Further Reading

content/en/docs/zero-code/obi/cilium-compatibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ weight: 23
77

88
Cilium is an open source security, networking, and observability platform that
99
uses eBPF to provide networking and security for Kubernetes clusters. In some
10-
cases, the eBPF programs both Cilium and OBI use can conflict with the ePBF
10+
cases, the eBPF programs both Cilium and OBI use can conflict with the eBPF
1111
programs OBI uses and lead to issues.
1212

1313
OBI and Cilium use eBPF traffic control classifier programs,

data/ecosystem/vendors.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@
9898
commercial: true
9999
- name: ControlTheory
100100
nativeOTLP: true
101-
url: https://www.controltheory.com/use-case/otel-collector-management/
101+
url: https://docs.controltheory.com/controltheory-documentation/gonzo-docs/advanced-features/working-with-otel
102102
103-
oss: false
103+
oss: true
104104
commercial: true
105105
- name: Coralogix
106106
nativeOTLP: true

data/registry/instrumentation-js-fastify-otel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ createdAt: 2025-01-27
1616
package:
1717
registry: npm
1818
name: '@fastify/otel'
19-
version: 0.14.0
19+
version: 0.15.0
2020
isFirstParty: true

data/registry/instrumentation-ruby-all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ createdAt: 2020-11-09
1414
package:
1515
registry: gems
1616
name: opentelemetry-instrumentation-all
17-
version: 0.87.0
17+
version: 0.88.0
1818
isFirstParty: false

data/registry/instrumentation-ruby-ethon.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ createdAt: 2020-11-09
1515
package:
1616
registry: gems
1717
name: opentelemetry-instrumentation-ethon
18-
version: 0.25.1
18+
version: 0.26.0
1919
isFirstParty: false

0 commit comments

Comments
 (0)