Skip to content

Commit 38188b9

Browse files
zeitlingerzeitlinger
authored
use otel autoconfigure (#1147)
* use otel autoconfig Signed-off-by: Gregor Zeitlinger <[email protected]> * add oats test Signed-off-by: Gregor Zeitlinger <[email protected]> * add oats test Signed-off-by: Gregor Zeitlinger <[email protected]> * add oats test Signed-off-by: Gregor Zeitlinger <[email protected]> * add oats test Signed-off-by: Gregor Zeitlinger <[email protected]> * add oats test Signed-off-by: Gregor Zeitlinger <[email protected]> * add oats test Signed-off-by: Gregor Zeitlinger <[email protected]> * extra project for otel resource attributes Signed-off-by: Gregor Zeitlinger <[email protected]> * extra project for otel resource attributes Signed-off-by: Gregor Zeitlinger <[email protected]> * extra project for otel resource attributes Signed-off-by: Gregor Zeitlinger <[email protected]> * add otel tests Signed-off-by: Gregor Zeitlinger <[email protected]> * release automation Signed-off-by: Gregor Zeitlinger <[email protected]> --------- Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent 6f4793c commit 38188b9

File tree

28 files changed

+932
-509
lines changed

28 files changed

+932
-509
lines changed

‎.github/workflows/acceptance-tests.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: OpenTelemetry Acceptance Tests
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
9+
jobs:
10+
acceptance-tests:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: Check out oats
15+
uses: actions/checkout@v4
16+
with:
17+
repository: grafana/oats
18+
ref: 7cd5ca42fff009fd67ea986d42c79134ac99ae48
19+
path: oats
20+
- name: Set up JDK
21+
uses: actions/setup-java@v4
22+
with:
23+
java-version: 17
24+
distribution: temurin
25+
cache: 'maven'
26+
- name: Set up Go
27+
uses: actions/setup-go@v5
28+
with:
29+
go-version: '1.23'
30+
cache-dependency-path: oats/go.sum
31+
- name: Run the Maven verify phase
32+
run: |
33+
./mvnw clean install -DskipTests
34+
- name: Run acceptance tests
35+
run: ./scripts/run-acceptance-tests.sh
36+
- name: upload log file
37+
uses: actions/upload-artifact@v4
38+
if: failure()
39+
with:
40+
name: docker-compose.log
41+
path: oats/yaml/build/**/*.log

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ This repository uses [Google Java Format](https://github.com/google/google-java-
1717

1818
Run `./mvnw spotless:apply` to format the code (only changed files) before committing.
1919

20+
Use `-Dspotless.check.skip=true` to skip the formatting check during development.
21+
2022
## Running Tests
2123

2224
If you're getting errors when running tests:

‎benchmarks/pom.xml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,18 @@
2222
<codahale.version>3.0.2</codahale.version>
2323
</properties>
2424

25+
<dependencyManagement>
26+
<dependencies>
27+
<dependency>
28+
<groupId>io.opentelemetry.instrumentation</groupId>
29+
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
30+
<version>${otel.instrumentation.version}</version>
31+
<type>pom</type>
32+
<scope>import</scope>
33+
</dependency>
34+
</dependencies>
35+
</dependencyManagement>
36+
2537
<dependencies>
2638
<dependency>
2739
<groupId>org.openjdk.jmh</groupId>
@@ -58,17 +70,14 @@
5870
<dependency>
5971
<groupId>io.opentelemetry</groupId>
6072
<artifactId>opentelemetry-api</artifactId>
61-
<version>${otel.version}</version>
6273
</dependency>
6374
<dependency>
6475
<groupId>io.opentelemetry</groupId>
6576
<artifactId>opentelemetry-sdk</artifactId>
66-
<version>${otel.version}</version>
6777
</dependency>
6878
<dependency>
6979
<groupId>io.opentelemetry</groupId>
7080
<artifactId>opentelemetry-sdk-testing</artifactId>
71-
<version>${otel.version}</version>
7281
</dependency>
7382
</dependencies>
7483
<build>

‎examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM eclipse-temurin:21-jre
2+
3+
COPY target/example-exporter-opentelemetry.jar ./app.jar
4+
# check that the resource attributs from the agent are used, epsecially the service.instance.id should be the same
5+
ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
6+
ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
7+
8+
#ENTRYPOINT [ "java", "-Dotel.javaagent.debug=true","-jar", "./app.jar" ] # for debugging
9+
ENTRYPOINT [ "java", "-jar", "./app.jar" ]

‎examples/example-exporter-opentelemetry/oats-tests/agent/docker-compose.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats/tree/main/yaml
2+
version: '3.4'
3+
4+
services:
5+
java:
6+
build:
7+
context: ../..
8+
dockerfile: oats-tests/agent/Dockerfile
9+
environment:
10+
OTEL_SERVICE_NAME: "rolldice"
11+
OTEL_EXPORTER_OTLP_ENDPOINT: http://lgtm:4317
12+
OTEL_EXPORTER_OTLP_PROTOCOL: grpc
13+
OTEL_METRIC_EXPORT_INTERVAL: "5000" # so we don't have to wait 60s for metrics

‎examples/example-exporter-opentelemetry/oats-tests/agent/oats.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats/tree/main/yaml
2+
docker-compose:
3+
generator: docker-lgtm
4+
files:
5+
- ./docker-compose.yml
6+
expected:
7+
custom-checks:
8+
- script: ./service-instance-id-check.py
9+
metrics:
10+
- promql: 'uptime_seconds_total{}'
11+
value: '>= 0'
12+

‎examples/example-exporter-opentelemetry/oats-tests/agent/service-instance-id-check.py‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#!/usr/bin/env python3
2+
3+
# This script is used to check if the service instance id is present in the exported data
4+
# The script will return 0 if the service instance id is present in the exported data
5+
6+
from urllib.request import urlopen
7+
import urllib.parse
8+
import json
9+
10+
url = ' http://localhost:9090/api/v1/label/instance/values'
11+
res = json.loads(urlopen(url).read().decode('utf-8'))
12+
13+
values = list(res['data'])
14+
print(values)
15+
16+
if "localhost:8888" in values:
17+
values.remove("localhost:8888")
18+
19+
# both the agent and the exporter should report the same instance id
20+
assert len(values) == 1
21+
22+
path = 'target_info{instance="%s"}' % values[0]
23+
path = urllib.parse.quote_plus(path)
24+
url = 'http://localhost:9090/api/v1/query?query=%s' % path
25+
res = json.loads(urlopen(url).read().decode('utf-8'))
26+
27+
infos = res['data']['result']
28+
print(infos)
29+
30+
# they should not have the same target info
31+
# e.g. only the agent has telemetry_distro_name
32+
assert len(infos) == 2
33+

‎examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM eclipse-temurin:21-jre
2+
3+
COPY target/example-exporter-opentelemetry.jar ./app.jar
4+
5+
ENTRYPOINT [ "java", "-jar", "./app.jar" ]

‎examples/example-exporter-opentelemetry/oats-tests/http/docker-compose.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats/tree/main/yaml
2+
version: '3.4'
3+
4+
services:
5+
java:
6+
build:
7+
context: ../..
8+
dockerfile: oats-tests/http/Dockerfile
9+
environment:
10+
OTEL_SERVICE_NAME: "rolldice"
11+
OTEL_EXPORTER_OTLP_ENDPOINT: http://lgtm:4318
12+
OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf
13+
OTEL_METRIC_EXPORT_INTERVAL: "5000" # so we don't have to wait 60s for metrics

‎examples/example-exporter-opentelemetry/oats-tests/http/oats.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats/tree/main/yaml
2+
docker-compose:
3+
generator: docker-lgtm
4+
files:
5+
- ./docker-compose.yml
6+
expected:
7+
metrics:
8+
- promql: 'uptime_seconds_total{}'
9+
value: '>= 0'
10+

0 commit comments

Comments
 (0)