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

Refactor java instrumentation #5276

Merged
merged 13 commits into from
Oct 17, 2024
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
[submodule "content-modules/opentelemetry-java-examples"]
path = content-modules/opentelemetry-java-examples
url = https://github.com/open-telemetry/opentelemetry-java-examples.git
javaexamples-pin = 8fe9a11
javaexamples-pin = 0f736ec
2 changes: 1 addition & 1 deletion content-modules/opentelemetry-java-examples
svrnm marked this conversation as resolved.
Show resolved Hide resolved
Submodule opentelemetry-java-examples updated 45 files
+6 −6 autoconfigure/README.md
+1 −1 build.gradle.kts
+12 −0 doc-snippets/api/build.gradle.kts
+50 −0 doc-snippets/api/src/main/java/otel/AsyncCounterUsage.java
+49 −0 doc-snippets/api/src/main/java/otel/AsyncGaugeUsage.java
+49 −0 doc-snippets/api/src/main/java/otel/AsyncUpDownCounterUsage.java
+79 −0 doc-snippets/api/src/main/java/otel/AttributesUsage.java
+74 −0 doc-snippets/api/src/main/java/otel/BaggageUsage.java
+91 −0 doc-snippets/api/src/main/java/otel/ContextUsage.java
+42 −0 doc-snippets/api/src/main/java/otel/CounterUsage.java
+82 −0 doc-snippets/api/src/main/java/otel/ExtractContextUsage.java
+43 −0 doc-snippets/api/src/main/java/otel/GaugeUsage.java
+16 −0 doc-snippets/api/src/main/java/otel/GlobalOpenTelemetryUsage.java
+43 −0 doc-snippets/api/src/main/java/otel/HistogramUsage.java
+46 −0 doc-snippets/api/src/main/java/otel/InjectContextUsage.java
+63 −0 doc-snippets/api/src/main/java/otel/LogRecordUsage.java
+73 −0 doc-snippets/api/src/main/java/otel/NoopUsage.java
+20 −0 doc-snippets/api/src/main/java/otel/OpenTelemetryUsage.java
+51 −0 doc-snippets/api/src/main/java/otel/ProvidersAndScopes.java
+29 −0 doc-snippets/api/src/main/java/otel/SemanticAttributesUsage.java
+53 −0 doc-snippets/api/src/main/java/otel/SpanAndContextUsage.java
+86 −0 doc-snippets/api/src/main/java/otel/SpanUsage.java
+42 −0 doc-snippets/api/src/main/java/otel/UpDownCounterUsage.java
+35 −0 doc-snippets/api/src/main/java/otel/Util.java
+2 −2 doc-snippets/exporters/build.gradle.kts
+2 −2 doc-snippets/getting-started/build.gradle.kts
+2 −2 doc-snippets/spring-starter/build.gradle.kts
+ gradle/wrapper/gradle-wrapper.jar
+2 −2 gradle/wrapper/gradle-wrapper.properties
+4 −4 grpc/build.gradle.kts
+1 −1 javaagent/README.md
+1 −1 javaagent/build.gradle.kts
+5 −4 javaagent/collector-config.yaml
+1 −1 javaagent/docker-compose.yml
+2 −2 kotlin-extension/build.gradle.kts
+5 −5 log-appender/build.gradle.kts
+1 −1 log-appender/docker-compose.yml
+3 −2 log-appender/otel-config.yaml
+5 −5 otlp/docker/otel-collector-config-demo.yaml
+10 −9 settings.gradle.kts
+1 −1 spring-native/README.md
+3 −3 spring-native/build.gradle.kts
+5 −4 spring-native/collector-spring-native-config.yaml
+1 −1 spring-native/docker-compose.yml
+3 −3 telemetry-testing/build.gradle.kts
2 changes: 1 addition & 1 deletion content/en/docs/collector/deployment/agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Cons:
[instrumentation]: /docs/languages/
[otlp]: /docs/specs/otel/protocol/
[collector]: /docs/collector/
[instrument-java-metrics]: /docs/languages/java/instrumentation/#metrics
[instrument-java-metrics]: /docs/languages/java/api-components/#meterprovider
[otlp-exporter]: /docs/specs/otel/protocol/exporter/
[java-otlp-example]:
https://github.com/open-telemetry/opentelemetry-java-docs/tree/main/otlp
Expand Down
6 changes: 2 additions & 4 deletions content/en/docs/concepts/instrumentation/libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ After you create a span, pass new trace context to the application code
(callback or handler), by making the span active; if possible, do this
explicitly. The following Java example shows how to add trace context and
activate a span. See the
[Context extraction in Java](/docs/languages/java/instrumentation/#context-propagation),
[Context extraction in Java](/docs/languages/java/api-components/#contextpropagators),
for more examples.

```java
Expand All @@ -289,9 +289,7 @@ try (Scope unused = span.makeCurrent()) {
```

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

Expand Down
Loading
Loading