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 #128

Merged
merged 8 commits into from
Apr 25, 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
3 changes: 3 additions & 0 deletions .github/workflows/pr-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ jobs:
echo $COMMENT

- uses: actions/checkout@v4
with:
token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

- name: Write start comment
run: |
Expand All @@ -66,6 +68,7 @@ jobs:
node-version-file: .nvmrc
cache: npm
cache-dependency-path: tmp/package-ci.json
token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

- run: |
case $PR_ACTION in
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
[submodule "content-modules/opentelemetry-proto"]
path = content-modules/opentelemetry-proto
url = https://github.com/open-telemetry/opentelemetry-proto
otlp-pin = v1.2.0
otlp-pin = v1.3.0
[submodule "content-modules/semantic-conventions"]
path = content-modules/semantic-conventions
url = https://github.com/open-telemetry/semantic-conventions
semconv-pin = v1.25.0
[submodule "content-modules/opamp-spec"]
path = content-modules/opamp-spec
url = https://github.com/open-telemetry/opamp-spec
opamp-pin = v0.8.0-5-g0360da8
opamp-pin = v0.9.0-2-g950df29
[submodule "content-modules/opentelemetry-go"]
path = content-modules/opentelemetry-go
url = https://github.com/open-telemetry/opentelemetry-go
Expand Down
2 changes: 1 addition & 1 deletion content-modules/opamp-spec
2 changes: 1 addition & 1 deletion content/en/docs/collector/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Collector
description: Vendor-agnostic way to receive, process and export telemetry data.
aliases: [collector/about]
cascade:
vers: 0.98.0
vers: 0.99.0
weight: 10
---

Expand Down
23 changes: 21 additions & 2 deletions content/en/docs/languages/go/exporters.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Exporters
aliases: [exporting_data]
weight: 50
# prettier-ignore
cSpell:ignore: otlpmetric otlpmetricgrpc otlpmetrichttp otlptrace otlptracegrpc otlptracehttp promhttp stdouttrace
cSpell:ignore: otlpmetric otlpmetricgrpc otlpmetrichttp otlptrace otlptracegrpc otlptracehttp promhttp stdoutlog stdouttrace
---

{{% docs/languages/exporters/intro go %}}
Expand Down Expand Up @@ -31,7 +31,7 @@ func newExporter() (trace.SpanExporter, error) {
}
```

### Console metrics (Experimental)
### Console metrics

[`go.opentelemetry.io/otel/exporters/stdout/stdoutmetric`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/stdout/stdoutmetric)
contains an implementation of the console metrics exporter.
Expand All @@ -49,6 +49,25 @@ func newExporter() (metric.Exporter, error) {
}
```

### Console logs (Experimental) {#console-logs}

The
[`go.opentelemetry.io/otel/exporters/stdout/stdoutlog`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/stdout/stdoutlog)
package contains an implementation of the console log exporter.

Here's how you can create an exporter with default configuration:

```go
import (
"go.opentelemetry.io/otel/exporters/stdout/stdoutlog"
"go.opentelemetry.io/otel/sdk/log"
)

func newExporter() (log.Exporter, error) {
return stdoutlog.New()
}
```

## OTLP

To send trace data to an OTLP endpoint (like the [collector](/docs/collector) or
Expand Down
15 changes: 7 additions & 8 deletions content/en/docs/languages/java/libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ weight: 40
cSpell:ignore: getenv httpclient println
---

When you develop an app, you use third-party libraries and frameworks to
accelerate your work and avoid duplicated efforts. If you instrument your app
with OpenTelemetry, you don't want to spend additional time on manually adding
traces, logs, and metrics to those libraries and frameworks.

Use libraries that come with OpenTelemetry support natively or an
[Instrumentation Library](/docs/concepts/instrumentation/libraries/) to generate
telemetry data for a library or framework.
{{% docs/languages/libraries-intro "Java" %}}

## Use Instrumentation Libraries

If a library does not come with OpenTelemetry out of the box, you can use
[instrumentation libraries](/docs/specs/otel/glossary/#instrumentation-library)
in order to generate telemetry data for a library or framework.

The Java agent for automatic instrumentation includes instrumentation libraries
for many common Java frameworks. Most are turned on by default. If you need to
Expand Down
1 change: 1 addition & 0 deletions data/ecosystem/integrations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
url: https://www.elastic.co/guide/en/elasticsearch/client/java-api-client/current/index.html
docsUrl: https://www.elastic.co/guide/en/elasticsearch/client/java-api-client/current/opentelemetry.html
components: [Java]
native: true # Elasticsearch Java API Client provides a native integration of the OpenTelemetry API
oss: true
- name: Kubernetes
url: https://kubernetes.io/
Expand Down
8 changes: 1 addition & 7 deletions 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.32.0
otlp: 1.2.0
otlp: 1.3.0
semconv: 1.25.0
);
my $otelSpecVers = $versions{'spec:'};
Expand Down Expand Up @@ -51,12 +51,6 @@ ()
# TODO: add to front matter of OTel spec file and drop next line:
$linkTitle = 'Design Goals' if $title eq 'Design Goals for OpenTelemetry Wire Protocol';

# TODO: remove once all submodules have been updated in the context of https://github.com/open-telemetry/opentelemetry.io/issues/3922
$frontMatterFromFile =~ s|: content/en/docs/specs/opamp/|: tmp/opamp/|g;
$frontMatterFromFile =~ s|: content/en/docs/specs/semconv/|: tmp/semconv/docs/|g;
$frontMatterFromFile =~ s|path_base_for_github_subdir:\n from: content/en/docs/specs/otlp/_index.md\n to: specification.md\n||;
$frontMatterFromFile =~ s|github_subdir: docs\n path_base_for_github_subdir: content/en/docs/specs/otlp/|path_base_for_github_subdir: tmp/otlp/|g;

# printf STDOUT "> $title -> $linkTitle\n";
print "linkTitle: $linkTitle\n" if $linkTitle and $frontMatterFromFile !~ /linkTitle: /;
print "$frontMatterFromFile" if $frontMatterFromFile;
Expand Down
4 changes: 4 additions & 0 deletions static/refcache.json
Original file line number Diff line number Diff line change
Expand Up @@ -6875,6 +6875,10 @@
"StatusCode": 200,
"LastSeen": "2024-01-18T19:07:44.890589-05:00"
},
"https://pkg.go.dev/go.opentelemetry.io/otel/exporters/stdout/stdoutlog": {
"StatusCode": 200,
"LastSeen": "2024-04-24T13:46:14.851022-07:00"
},
"https://pkg.go.dev/go.opentelemetry.io/otel/exporters/stdout/stdoutmetric": {
"StatusCode": 200,
"LastSeen": "2024-01-30T15:25:21.196671-05:00"
Expand Down