Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .env.override
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# PLACE YOUR .env ENVIRONMENT VARIABLES OVERRIDES IN THIS FILE

# Demo Elastic App version
IMAGE_VERSION=2.1.4
IMAGE_VERSION=2.1.5
IMAGE_NAME=ghcr.io/elastic/opentelemetry-demo

# *********************
Expand All @@ -16,7 +16,7 @@ KAFKA_SERVICE_DOCKERFILE=./src/kafka/Dockerfile.elastic
# Elastic Collector
# *********************
ELASTIC_AGENT_OTEL=true
COLLECTOR_CONTRIB_IMAGE="docker.elastic.co/elastic-agent/elastic-agent:9.1.3"
COLLECTOR_CONTRIB_IMAGE="docker.elastic.co/elastic-agent/elastic-agent:9.2.0"
OTEL_COLLECTOR_CONFIG="./src/otel-collector/otelcol-elastic-config.yaml"
ELASTICSEARCH_ENDPOINT="YOUR_ENDPOINT"
ELASTICSEARCH_API_KEY="YOUR_API_KEY"
Expand Down
2 changes: 1 addition & 1 deletion demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -eu

# Constants
ELASTIC_STACK_VERSION="9.1.3"
ELASTIC_STACK_VERSION="9.2.0"
ENV_OVERRIDE_FILE=".env.override"
NAMESPACE="opentelemetry-operator-system"
HELM_REPO_NAME="open-telemetry"
Expand Down
2 changes: 1 addition & 1 deletion src/cart/src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<ItemGroup>
<PackageReference Include="Elastic.OpenTelemetry" Version="1.0.1" />
<PackageReference Include="Elastic.OpenTelemetry" Version="1.1.0" />
</ItemGroup>
</Project>
20 changes: 10 additions & 10 deletions src/cart/src/cart.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
<!-- Keeping Grpc.AspNetCore* to 2.67 due to https://github.com/grpc/grpc/issues/38538 -->
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
<PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.67.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.11.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="1.11.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.11.0-beta.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
<PackageReference Include="OpenTelemetry.Resources.Container" Version="1.11.0-beta.2" />
<PackageReference Include="OpenTelemetry.Resources.Host" Version="1.11.0-beta.2" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.12.0-beta.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="1.12.0-beta.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.12.0-beta.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Resources.Container" Version="1.12.0-beta.1" />
<PackageReference Include="OpenTelemetry.Resources.Host" Version="1.12.0-beta.1" />
<PackageReference Include="StackExchange.Redis" Version="2.8.31" />
<PackageReference Include="OpenFeature.Contrib.Providers.Flagd" Version="0.3.2" />
<PackageReference Include="OpenFeature" Version="2.7.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/load-generator/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ charset-normalizer==3.4.1
click==8.1.8
configargparse==1.7
deprecated==1.2.18
elastic-opentelemetry==1.8.0
elastic-opentelemetry==1.9.0
Flask==3.1.2
flask-basicauth==0.2.0
flask-cors==5.0.1
Expand Down
6 changes: 5 additions & 1 deletion src/payment/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,8 @@ COPY ./src/payment/logger.js logger.js

EXPOSE ${PAYMENT_PORT}

CMD ["index.js"]
## The two steps below reproduce what "npm run start" would do, but using
## distroless we cannot use "npm" directly.
ENV OTEL_EXPORTER_OTLP_PROTOCOL=grpc

CMD [ "--import", "@elastic/opentelemetry-node", "index.js" ]
2 changes: 1 addition & 1 deletion src/payment/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"author": "Jonathan Lui",
"license": "ISC",
"dependencies": {
"@elastic/opentelemetry-node": "^1.0.0",
"@elastic/opentelemetry-node": "1.5.0",
"@grpc/grpc-js": "1.12.6",
"@grpc/proto-loader": "0.8.0",
"@openfeature/flagd-provider": "0.13.3",
Expand Down
2 changes: 1 addition & 1 deletion src/recommendation/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
grpcio-health-checking==1.71.0
grpcio==1.71.0

elastic-opentelemetry==1.8.0
elastic-opentelemetry==1.9.0

python-dotenv==1.1.1
python-json-logger==3.3.0
Expand Down
Loading