Skip to content

Commit

Permalink
Merge branch 'main' into internal-obs-2
Browse files Browse the repository at this point in the history
  • Loading branch information
tiffany76 authored Apr 25, 2024
2 parents fa3573c + ee858df commit 0f8f4b3
Show file tree
Hide file tree
Showing 21 changed files with 55 additions and 34 deletions.
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
2 changes: 1 addition & 1 deletion data/ecosystem/vendors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@
commercial: true
- name: Embrace
nativeOTLP: true
url: 'https://github.com/embrace-io/embrace-apple-sdk/blob/main/GETTING_STARTED.md#exporting-logs-and-traces-to-opentelemetry-vendors'
url: 'https://embrace.io/opentelemetry-for-mobile/'
contact: '[email protected]'
oss: true
commercial: true
2 changes: 1 addition & 1 deletion data/registry/exporter-dotnet-geneva.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Exporter.Geneva
version: 1.7.0
version: 1.8.0-beta.1
2 changes: 1 addition & 1 deletion data/registry/exporter-js-instana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ createdAt: 2022-04-18
package:
registry: npm
name: '@instana/opentelemetry-exporter'
version: 3.4.0
version: 3.5.0
2 changes: 1 addition & 1 deletion data/registry/exporter-js-jaeger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ createdAt: 2020-02-06
package:
registry: npm
name: '@opentelemetry/exporter-jaeger'
version: 1.23.0
version: 1.24.0
2 changes: 1 addition & 1 deletion data/registry/exporter-js-prometheus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ createdAt: 2020-02-06
package:
registry: npm
name: '@opentelemetry/exporter-prometheus'
version: 0.50.0
version: 0.51.0
2 changes: 1 addition & 1 deletion data/registry/exporter-js-zipkin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ authors:
package:
name: '@opentelemetry/exporter-zipkin'
registry: npm
version: 1.23.0
version: 1.24.0
urls:
repo: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-zipkin
docs: /docs/languages/js/exporters/#zipkin
Expand Down
2 changes: 1 addition & 1 deletion data/registry/instrumentation-js-cerbos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ createdAt: 2023-09-13
package:
name: '@cerbos/opentelemetry'
registry: npm
version: 0.4.5
version: 0.4.6
isFirstParty: true
2 changes: 1 addition & 1 deletion data/registry/instrumentation-js-fetch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ createdAt: 2020-11-09
package:
registry: npm
name: '@opentelemetry/instrumentation-fetch'
version: 0.50.0
version: 0.51.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-js-grpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ createdAt: 2020-11-09
package:
registry: npm
name: '@opentelemetry/instrumentation-grpc'
version: 0.50.0
version: 0.51.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-js-http.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ createdAt: 2020-11-09
package:
registry: npm
name: '@opentelemetry/instrumentation-http'
version: 0.50.0
version: 0.51.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-js-prisma.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ createdAt: 2022-08-25
package:
registry: npm
name: '@prisma/instrumentation'
version: 5.12.1
version: 5.13.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-js-xml-http-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ createdAt: 2020-11-09
package:
registry: npm
name: '@opentelemetry/instrumentation-xml-http-request'
version: 0.50.0
version: 0.51.0
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
8 changes: 8 additions & 0 deletions static/refcache.json
Original file line number Diff line number Diff line change
Expand Up @@ -1735,6 +1735,10 @@
"StatusCode": 200,
"LastSeen": "2024-01-30T16:14:47.246698-05:00"
},
"https://embrace.io/opentelemetry-for-mobile/": {
"StatusCode": 206,
"LastSeen": "2024-04-25T10:29:55.539338+02:00"
},
"https://en.cppreference.com/w/cpp/container/set": {
"StatusCode": 200,
"LastSeen": "2024-01-18T19:02:25.398061-05:00"
Expand Down Expand Up @@ -6875,6 +6879,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

0 comments on commit 0f8f4b3

Please sign in to comment.