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.

Sign up for GitHub

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

add note about default protocol of spring boot starter #4258

Merged
merged 10 commits into from
Apr 15, 2024
Merged

add note about default protocol of spring boot starter #4258

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5b902f2
add note about default protocol of spring boot starter
zeitlinger Apr 5, 2024
c447d01
Results from /fix:all
opentelemetrybot Apr 6, 2024
6aab9d3
Update content/en/docs/languages/java/automatic/spring-boot.md
zeitlinger Apr 11, 2024
3e374ec
Update content/en/docs/languages/java/automatic/spring-boot.md
zeitlinger Apr 11, 2024
ae56b2d
Update content/en/docs/languages/java/automatic/spring-boot.md
zeitlinger Apr 11, 2024
0fa437c
javaagent uses http/protobuf as default protocol, too
zeitlinger Apr 11, 2024
29f0193
Update content/en/docs/languages/java/automatic/configuration.md
zeitlinger Apr 12, 2024
4bf1075
Merge branch 'main' into spring-boot-default-protocol
zeitlinger Apr 12, 2024
bcf27f0
Results from /fix:format
opentelemetrybot Apr 12, 2024
5d671f8
Merge branch 'main' into spring-boot-default-protocol
svrnm Apr 15, 2024
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
7 changes: 7 additions & 0 deletions content/en/docs/languages/java/automatic/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ specific portions of the SDK & agent:
- [Span limits](https://github.com/open-telemetry/opentelemetry-java/tree/main/sdk-extensions/autoconfigure/README.md#span-limits)
- [Using SPI to further configure the SDK](https://github.com/open-telemetry/opentelemetry-java/tree/main/sdk-extensions/autoconfigure/README.md#customizing-the-opentelemetry-sdk)

{{% alert title="Important" color="warning" %}}

Unlike the SDK autoconfiguration, the Java agent and OpenTelemetry Spring Boot
zeitlinger marked this conversation as resolved.
Show resolved Hide resolved
starter use `http/protobuf` as the default protocol, not `grpc`.

{{% /alert %}}

### Enable Resource Providers that are disabled by default

In addition to the resource configuration from the SDK autoconfiguration, you
Expand Down
6 changes: 4 additions & 2 deletions content/en/docs/languages/java/automatic/spring-boot.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,10 @@ IDE.

The OpenTelemetry Starter supports all the
[SDK Autoconfiguration](/docs/languages/java/automatic/configuration/#sdk-autoconfiguration)
(since 2.2.0). You can set properties in the `application.properties` or the
`application.yaml` file, or use environment variables.
(since 2.2.0).

You can update the configuration with properties in the `application.properties`
or the `application.yaml` file, or with environment variables.

`application.properties` example:

Expand Down