Skip to content

Commit

Permalink
Merge branch 'main' into grafanarenovatebot/opentelemetry-python-cont…
Browse files Browse the repository at this point in the history
…rib-1.x
  • Loading branch information
zeitlinger authored Dec 20, 2024
2 parents 1d3f97a + e78dce9 commit de18953
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion examples/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<name>Hello World REST Service</name>

<properties>
<spring.version>3.3.4</spring.version>
<spring.version>3.4.1</spring.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions examples/python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ COPY requirements.txt .
# 2. Run `pip freeze > requirements.txt` in the same directory as your app.py file
RUN pip install --no-cache-dir -r requirements.txt

# renovate: datasource=github-releases depName=opentelemetry-python-contrib packageName=open-telemetry/opentelemetry-python-contrib
ENV OPENTELEMETRY_DISTRO_VERSION=v1.16.0
# renovate: datasource=pip_requirements depName=opentelemetry-distro packageName=opentelemetry-distro
ENV OPENTELEMETRY_DISTRO_VERSION=0.46b0
RUN pip install --no-cache-dir "opentelemetry-distro[otlp]==$OPENTELEMETRY_DISTRO_VERSION"
RUN opentelemetry-bootstrap -a install

Expand Down
4 changes: 2 additions & 2 deletions examples/python/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ source ./venv/bin/activate
pip install -r requirements.txt

# Step 1: Install the OpenTelemetry SDK
# renovate: datasource=github-releases depName=opentelemetry-python-contrib packageName=open-telemetry/opentelemetry-python-contrib
opentelemetry_distro_version=v1.16.0
# renovate: datasource=pip_requirements depName=opentelemetry-distro packageName=opentelemetry-distro
opentelemetry_distro_version=0.46b0
pip install "opentelemetry-distro[otlp]==${opentelemetry_distro_version}"
opentelemetry-bootstrap -a install

Expand Down

0 comments on commit de18953

Please sign in to comment.