Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from open-telemetry:main #196

Merged
merged 3 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[submodule "content-modules/opentelemetry-proto"]
path = content-modules/opentelemetry-proto
url = https://github.com/open-telemetry/opentelemetry-proto
otlp-pin = v1.3.2
otlp-pin = v1.4.0
[submodule "content-modules/semantic-conventions"]
path = content-modules/semantic-conventions
url = https://github.com/open-telemetry/semantic-conventions
Expand Down
4 changes: 2 additions & 2 deletions content/en/blog/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ title: Blog
menu: { main: { weight: 50 } }
redirects:
# Every January, update the year number in the paths below
- { from: '', to: '2024/ 301!' }
- { from: '', to: '2024/ 302!' }
# Workaround to https://github.com/open-telemetry/opentelemetry.io/issues/4440:
- { from: 'index.xml', to: '2024/index.xml 301!' }
- { from: 'index.xml', to: '2024/index.xml 302!' }
outputs: [HTML, RSS]
htmltest:
# 2024-11-07 DO NOT COPY the following IgnoreDirs to non-en pages because handles all locales.
Expand Down
24 changes: 17 additions & 7 deletions content/en/docs/specs/status.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,12 @@ support for specific features can be found in the
Note that, for each of the following sections, the **Collector** status is the
same as the **Protocol** status.

### [Tracing][]
### Tracing

- [Specification][tracing]
- {{% spec_status "API" "otel/trace/api" "Status" %}}
- {{% spec_status "SDK" "otel/trace/sdk" "Status" %}}
- {{% spec_status "Protocol" "otlp" "Status" %}}
- {{% spec_status "Protocol" "otlp" "/document-status/.*for.*trace" %}}
- Notes:
- The tracing specification is now completely stable, and covered by long term
support.
Expand All @@ -67,20 +68,22 @@ same as the **Protocol** status.
- OpenTelemetry clients are versioned to v1.0 once their tracing
implementation is complete.

### [Metrics][]
### Metrics

- [Specification][metrics]
- {{% spec_status "API" "otel/metrics/api" "Status" %}}
- {{% spec_status "SDK" "otel/metrics/sdk" "Status" %}}
- {{% spec_status "Protocol" "otlp" "Status" %}}
- {{% spec_status "Protocol" "otlp" "/document-status/.*for.*metric" %}}
- Notes:
- OpenTelemetry Metrics is currently under active development.
- The data model is stable and released as part of the OTLP protocol.
- Experimental support for metric pipelines is available in the Collector.
- Collector support for Prometheus is under development, in collaboration with
the Prometheus community.

### [Baggage][]
### Baggage

- [Specification][baggage]
- {{% spec_status "API" "otel/baggage/api" "Status" %}}
- **SDK:** stable
- **Protocol:** N/A
Expand All @@ -90,12 +93,13 @@ same as the **Protocol** status.
keys and values to a transaction, so that downstream services may access
them. As such, there is no OTLP or Collector component to baggage.

### [Logging][]
### Logging

- [Specification][logging]
- {{% spec_status "Bridge API" "otel/logs/api" "Status" %}}
- {{% spec_status "SDK" "otel/logs/sdk" "Status" %}}
- {{% spec_status "Event API" "otel/logs/event-api" "Status" %}}
- {{% spec_status "Protocol" "otlp" "Status" %}}
- {{% spec_status "Protocol" "otlp" "/document-status/.*for.*log" %}}
- Notes:
- The [logs data model][] is released as part of the OpenTelemetry Protocol.
- Log processing for many data formats has been added to the Collector, thanks
Expand All @@ -112,9 +116,15 @@ same as the **Protocol** status.
the Event API is intended to be called by end users. The Event API is under
active development.

### Profiles

- [Specification][profiles]
- {{% spec_status "Protocol" "otlp" "/document-status/.*for.*profiles" %}}

[baggage]: /docs/specs/otel/baggage/
[event semantic conventions]: /docs/specs/semconv/general/events/
[logging]: /docs/specs/otel/logs/
[logs data model]: /docs/specs/otel/logs/data-model/
[metrics]: /docs/specs/otel/metrics/
[profiles]: /docs/specs/otel/profiles/
[tracing]: /docs/specs/otel/trace/
32 changes: 32 additions & 0 deletions content/en/docs/zero-code/python/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,35 @@ export GRPC_VERBOSITY=debug
export GRPC_TRACE=http,call_error,connectivity_state
opentelemetry-instrument python YOUR_APP.py
```

### Bootstrap using uv

When using the [uv](https://docs.astral.sh/uv/) package manager, you might face
some difficulty when running `opentelemetry-bootstrap -a install`.

Instead, you can generate the requirements dynamically and install them using
`uv`.

First, install the appropriate packages (or add them to your project file and
run `uv sync`):

```sh
uv pip install opentelemetry-distro opentelemetry-exporter-otlp
```

Now, you can install the auto instrumentation:

```sh
uv run opentelemetry-bootstrap -a requirements | uv pip install --requirement -
```

Finally, use `uv run` to start your application (see
[Configuring the agent](#configuring-the-agent)):

```sh
uv run opentelemetry-instrument python myapp.py
```

Please note that you have to reinstall the auto instrumentation every time you
run `uv sync` or update existing packages. It is therefore recommended to make
the installation part of your build pipeline.
2 changes: 1 addition & 1 deletion scripts/content-modules/adjust-pages.pl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
my $specBasePath = '/docs/specs';
my %versions = qw(
spec: 1.39.0
otlp: 1.3.2
otlp: 1.4.0
semconv: 1.28.0
);
my $otelSpecVers = $versions{'spec:'};
Expand Down
4 changes: 4 additions & 0 deletions static/refcache.json
Original file line number Diff line number Diff line change
Expand Up @@ -2339,6 +2339,10 @@
"StatusCode": 200,
"LastSeen": "2024-08-30T17:38:37.903633988Z"
},
"https://docs.astral.sh/uv/": {
"StatusCode": 200,
"LastSeen": "2024-11-21T10:24:48.633652602+01:00"
},
"https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-message-metadata.html#sqs-message-system-attributes": {
"StatusCode": 206,
"LastSeen": "2024-01-18T08:53:50.0122-05:00"
Expand Down
Loading