Skip to content

Commit fe3100a

Browse files
committed
Refactor java instrumentation
1 parent 34a1a76 commit fe3100a

File tree

10 files changed

+2073
-1215
lines changed

10 files changed

+2073
-1215
lines changed

content/en/docs/collector/deployment/agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Cons:
129129
[instrumentation]: /docs/languages/
130130
[otlp]: /docs/specs/otel/protocol/
131131
[collector]: /docs/collector/
132-
[instrument-java-metrics]: /docs/languages/java/instrumentation/#metrics
132+
[instrument-java-metrics]: /docs/languages/java/api-components/#meterprovider
133133
[otlp-exporter]: /docs/specs/otel/protocol/exporter/
134134
[java-otlp-example]:
135135
https://github.com/open-telemetry/opentelemetry-java-docs/tree/main/otlp

content/en/docs/concepts/instrumentation/libraries.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ After you create a span, pass new trace context to the application code
265265
(callback or handler), by making the span active; if possible, do this
266266
explicitly. The following Java example shows how to add trace context and
267267
activate a span. See the
268-
[Context extraction in Java](/docs/languages/java/instrumentation/#context-propagation),
268+
[Context extraction in Java](/docs/languages/java/api-components/#contextpropagators),
269269
for more examples.
270270

271271
```java
@@ -289,9 +289,7 @@ try (Scope unused = span.makeCurrent()) {
289289
```
290290

291291
In the case of a messaging system, you might receive more than one message at
292-
once. Received messages become
293-
[links](/docs/languages/java/instrumentation/#create-spans-with-links) on the
294-
span you create. Refer to
292+
once. Received messages become links on the span you create. Refer to
295293
[messaging conventions](/docs/specs/semconv/messaging/messaging-spans/) for
296294
details.
297295

content/en/docs/languages/java/api-components.md

Lines changed: 1691 additions & 0 deletions
Large diffs are not rendered by default.

content/en/docs/languages/java/api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: API reference
3-
linkTitle: API
2+
title: Javadoc API reference
3+
linkTitle: Javadoc
44
redirect: https://javadoc.io/doc/io.opentelemetry
55
manualLinkTarget: _blank
66
_build: { render: link }

content/en/docs/languages/java/configuration.md

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Configure the SDK
33
linkTitle: Configure the SDK
4-
weight: 12
4+
weight: 13
55
aliases: [config]
66
# prettier-ignore
77
cSpell:ignore: authservice autoconfigured blrp Customizer Dotel ignore LOWMEMORY myservice ottrace PKCS retryable tracepropagators
@@ -11,7 +11,7 @@ cSpell:ignore: authservice autoconfigured blrp Customizer Dotel ignore LOWMEMORY
1111
<?code-excerpt path-base="examples/java/configuration"?>
1212

1313
The [SDK](../sdk/) is the built-in reference implementation of the
14-
[API](../instrumentation/), processing and exporting telemetry produced by
14+
[API](../api-components/), processing and exporting telemetry produced by
1515
instrumentation API calls. Configuring the SDK to process and export
1616
appropriately is an essential step to integrating OpenTelemetry into an
1717
application.
@@ -361,36 +361,36 @@ import java.util.Collections;
361361
public class CustomizedAutoConfiguredSdk {
362362
public static OpenTelemetrySdk autoconfiguredSdk() {
363363
return AutoConfiguredOpenTelemetrySdk.builder()
364-
// Optionally customize TextMapPropagator.
365-
.addPropagatorCustomizer((textMapPropagator, configProperties) -> textMapPropagator)
366-
// Optionally customize Resource.
367-
.addResourceCustomizer((resource, configProperties) -> resource)
368-
// Optionally customize Sampler.
369-
.addSamplerCustomizer((sampler, configProperties) -> sampler)
370-
// Optionally customize SpanExporter.
371-
.addSpanExporterCustomizer((spanExporter, configProperties) -> spanExporter)
372-
// Optionally customize SpanProcessor.
373-
.addSpanProcessorCustomizer((spanProcessor, configProperties) -> spanProcessor)
374-
// Optionally supply additional properties.
375-
.addPropertiesSupplier(Collections::emptyMap)
376-
// Optionally customize ConfigProperties.
377-
.addPropertiesCustomizer(configProperties -> Collections.emptyMap())
378-
// Optionally customize SdkTracerProviderBuilder.
379-
.addTracerProviderCustomizer((builder, configProperties) -> builder)
380-
// Optionally customize SdkMeterProviderBuilder.
381-
.addMeterProviderCustomizer((builder, configProperties) -> builder)
382-
// Optionally customize MetricExporter.
383-
.addMetricExporterCustomizer((metricExporter, configProperties) -> metricExporter)
384-
// Optionally customize MetricReader.
385-
.addMetricReaderCustomizer((metricReader, configProperties) -> metricReader)
386-
// Optionally customize SdkLoggerProviderBuilder.
387-
.addLoggerProviderCustomizer((builder, configProperties) -> builder)
388-
// Optionally customize LogRecordExporter.
389-
.addLogRecordExporterCustomizer((logRecordExporter, configProperties) -> logRecordExporter)
390-
// Optionally customize LogRecordProcessor.
391-
.addLogRecordProcessorCustomizer((processor, configProperties) -> processor)
392-
.build()
393-
.getOpenTelemetrySdk();
364+
// Optionally customize TextMapPropagator.
365+
.addPropagatorCustomizer((textMapPropagator, configProperties) -> textMapPropagator)
366+
// Optionally customize Resource.
367+
.addResourceCustomizer((resource, configProperties) -> resource)
368+
// Optionally customize Sampler.
369+
.addSamplerCustomizer((sampler, configProperties) -> sampler)
370+
// Optionally customize SpanExporter.
371+
.addSpanExporterCustomizer((spanExporter, configProperties) -> spanExporter)
372+
// Optionally customize SpanProcessor.
373+
.addSpanProcessorCustomizer((spanProcessor, configProperties) -> spanProcessor)
374+
// Optionally supply additional properties.
375+
.addPropertiesSupplier(Collections::emptyMap)
376+
// Optionally customize ConfigProperties.
377+
.addPropertiesCustomizer(configProperties -> Collections.emptyMap())
378+
// Optionally customize SdkTracerProviderBuilder.
379+
.addTracerProviderCustomizer((builder, configProperties) -> builder)
380+
// Optionally customize SdkMeterProviderBuilder.
381+
.addMeterProviderCustomizer((builder, configProperties) -> builder)
382+
// Optionally customize MetricExporter.
383+
.addMetricExporterCustomizer((metricExporter, configProperties) -> metricExporter)
384+
// Optionally customize MetricReader.
385+
.addMetricReaderCustomizer((metricReader, configProperties) -> metricReader)
386+
// Optionally customize SdkLoggerProviderBuilder.
387+
.addLoggerProviderCustomizer((builder, configProperties) -> builder)
388+
// Optionally customize LogRecordExporter.
389+
.addLogRecordExporterCustomizer((logRecordExporter, configProperties) -> logRecordExporter)
390+
// Optionally customize LogRecordProcessor.
391+
.addLogRecordProcessorCustomizer((processor, configProperties) -> processor)
392+
.build()
393+
.getOpenTelemetrySdk();
394394
}
395395
}
396396
```

0 commit comments

Comments
 (0)