Skip to content

Commit f82b4f2

Browse files
authored
[chore] Update EDOT SDKs and Elastic Stack version (#173)
* Bump stack version * Bump edot python version to 1.9.0 * Bump edot nodejs sdk to 1.5.0 * Bump edot dotnet sdk version to 1.1.0 * Bump image version to 2.1.5 for next release * Update demo.sh * Fix payment Dockerfile
1 parent 7906fb2 commit f82b4f2

File tree

8 files changed

+22
-18
lines changed

8 files changed

+22
-18
lines changed

.env.override

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# PLACE YOUR .env ENVIRONMENT VARIABLES OVERRIDES IN THIS FILE
33

44
# Demo Elastic App version
5-
IMAGE_VERSION=2.1.4
5+
IMAGE_VERSION=2.1.5
66
IMAGE_NAME=ghcr.io/elastic/opentelemetry-demo
77

88
# *********************
@@ -16,7 +16,7 @@ KAFKA_SERVICE_DOCKERFILE=./src/kafka/Dockerfile.elastic
1616
# Elastic Collector
1717
# *********************
1818
ELASTIC_AGENT_OTEL=true
19-
COLLECTOR_CONTRIB_IMAGE="docker.elastic.co/elastic-agent/elastic-agent:9.1.3"
19+
COLLECTOR_CONTRIB_IMAGE="docker.elastic.co/elastic-agent/elastic-agent:9.2.0"
2020
OTEL_COLLECTOR_CONFIG="./src/otel-collector/otelcol-elastic-config.yaml"
2121
ELASTICSEARCH_ENDPOINT="YOUR_ENDPOINT"
2222
ELASTICSEARCH_API_KEY="YOUR_API_KEY"

demo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -eu
44

55
# Constants
6-
ELASTIC_STACK_VERSION="9.1.3"
6+
ELASTIC_STACK_VERSION="9.2.0"
77
ENV_OVERRIDE_FILE=".env.override"
88
NAMESPACE="opentelemetry-operator-system"
99
HELM_REPO_NAME="open-telemetry"

src/cart/src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Include="Elastic.OpenTelemetry" Version="1.0.1" />
3+
<PackageReference Include="Elastic.OpenTelemetry" Version="1.1.0" />
44
</ItemGroup>
55
</Project>

src/cart/src/cart.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
<!-- Keeping Grpc.AspNetCore* to 2.67 due to https://github.com/grpc/grpc/issues/38538 -->
1919
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
2020
<PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.67.0" />
21-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
22-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
23-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
24-
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.11.0-beta.2" />
25-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
26-
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="1.11.0-beta.2" />
27-
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.11.0-beta.2" />
28-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
29-
<PackageReference Include="OpenTelemetry.Resources.Container" Version="1.11.0-beta.2" />
30-
<PackageReference Include="OpenTelemetry.Resources.Host" Version="1.11.0-beta.2" />
21+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
22+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
23+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
24+
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.12.0-beta.1" />
25+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
26+
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="1.12.0-beta.1" />
27+
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.12.0-beta.1" />
28+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
29+
<PackageReference Include="OpenTelemetry.Resources.Container" Version="1.12.0-beta.1" />
30+
<PackageReference Include="OpenTelemetry.Resources.Host" Version="1.12.0-beta.1" />
3131
<PackageReference Include="StackExchange.Redis" Version="2.8.31" />
3232
<PackageReference Include="OpenFeature.Contrib.Providers.Flagd" Version="0.3.2" />
3333
<PackageReference Include="OpenFeature" Version="2.7.0" />

src/load-generator/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ charset-normalizer==3.4.1
55
click==8.1.8
66
configargparse==1.7
77
deprecated==1.2.18
8-
elastic-opentelemetry==1.8.0
8+
elastic-opentelemetry==1.9.0
99
Flask==3.1.2
1010
flask-basicauth==0.2.0
1111
flask-cors==5.0.1

src/payment/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,8 @@ COPY ./src/payment/logger.js logger.js
2727

2828
EXPOSE ${PAYMENT_PORT}
2929

30-
CMD ["index.js"]
30+
## The two steps below reproduce what "npm run start" would do, but using
31+
## distroless we cannot use "npm" directly.
32+
ENV OTEL_EXPORTER_OTLP_PROTOCOL=grpc
33+
34+
CMD [ "--import", "@elastic/opentelemetry-node", "index.js" ]

src/payment/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"author": "Jonathan Lui",
1212
"license": "ISC",
1313
"dependencies": {
14-
"@elastic/opentelemetry-node": "^1.0.0",
14+
"@elastic/opentelemetry-node": "1.5.0",
1515
"@grpc/grpc-js": "1.12.6",
1616
"@grpc/proto-loader": "0.8.0",
1717
"@openfeature/flagd-provider": "0.13.3",

src/recommendation/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
grpcio-health-checking==1.71.0
22
grpcio==1.71.0
33

4-
elastic-opentelemetry==1.8.0
4+
elastic-opentelemetry==1.9.0
55

66
python-dotenv==1.1.1
77
python-json-logger==3.3.0

0 commit comments

Comments
 (0)