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

Jump to bottom

Demosntrate declarative config 0.3 with otel java agent #492

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Demosntrate declarative config 0.3 with otel java agent #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0b6ade
Demosntrate declarative config 0.3 with otel java agent
jack-berg Sep 20, 2024
f4bfd74
Add additional properties, documentation
jack-berg Sep 23, 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
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ subprojects {
version = "0.1.0-SNAPSHOT"

repositories {
mavenLocal()
mavenCentral()
}

Expand Down
2 changes: 1 addition & 1 deletion javaagent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ By default, this example uses the [environment variable configuration schema](ht
To use file configuration instead of the environment variable scheme, add the following before starting the application and collector:

```shell
export OTEL_CONFIG_FILE=/sdk-config.yaml
export OTEL_EXPERIMENTAL_CONFIG_FILE=/sdk-config.yaml
```

Note that toggling file configuration causes the environment variable configuration scheme to be ignored completely. However, there is support for environment variable substitution within configuration files.
2 changes: 1 addition & 1 deletion javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
//spring modules
implementation("org.springframework.boot:spring-boot-starter-web")

agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.8.0")
agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.9.0-SNAPSHOT")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't merge until next release of opentelemetry-java-instrumentation and the -SNAPSHOT is reverted.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it that important tho for examples? As long as renovate knows to bump it.....I dunno.

}

val copyAgent = tasks.register<Copy>("copyAgent") {
Expand Down
4 changes: 2 additions & 2 deletions javaagent/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ services:
# Logs are disabled by default
OTEL_LOGS_EXPORTER: "otlp"
# Optional specify file configuration instead of using environment variable scheme
# To use, call "export OTEL_CONFIG_FILE=/sdk-config.yaml" before calling docker compose up
OTEL_CONFIG_FILE:
# To use, call "export OTEL_EXPERIMENTAL_CONFIG_FILE=/sdk-config.yaml" before calling docker compose up
OTEL_EXPERIMENTAL_CONFIG_FILE: /sdk-config.yaml
ports:
- "8080:8080"
volumes:
Expand Down
Loading
Loading