Skip to content

store order to postgresql from accounting service #2175

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.

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

Merged
merged 16 commits into from
Jun 25, 2025
Merged
Show file tree
Hide file tree
Changes from 6 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
2 changes: 2 additions & 0 deletions .licenserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
],
"ignore": [
"node_modules/",
"src/accounting/bin/",
"src/accounting/obj/",
"/src/accounting/src/protos/",
"src/cart/src/obj/",
"src/cart/tests/obj/",
Expand Down
13 changes: 13 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ services:
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
- OTEL_RESOURCE_ATTRIBUTES
- OTEL_SERVICE_NAME=accounting
- DB_CONNECTION_STRING=Host=postgresql;Username=otelu;Password=otelp;Database=otel
depends_on:
otel-collector:
condition: service_started
Expand Down Expand Up @@ -678,6 +679,18 @@ services:
retries: 10
logging: *logging

# Postgresql used by Accounting service
postgresql:
image: ${POSTGRES_IMAGE}
ports:
- "5432"
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: otel
POSTGRES_DB: otel
volumes:
- ${PWD}/src/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql

# Valkey used by Cart service
valkey-cart:
image: ${VALKEY_IMAGE}
Expand Down
1 change: 1 addition & 0 deletions src/accounting/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
proto
3 changes: 3 additions & 0 deletions src/accounting/Accounting.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@

<ItemGroup>
<PackageReference Include="Confluent.Kafka" Version="2.8.0" />
<PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
<PackageReference Include="Google.Protobuf" Version="3.30.0" />
<PackageReference Include="Grpc.Tools" Version="2.68.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
<PackageReference Include="OpenTelemetry.AutoInstrumentation" Version="1.11.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.12.0-beta.1" />
</ItemGroup>

<ItemGroup>
Expand Down
63 changes: 62 additions & 1 deletion src/accounting/Consumer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,36 @@
using Confluent.Kafka;
using Microsoft.Extensions.Logging;
using Oteldemo;
using Microsoft.EntityFrameworkCore;
using System.Diagnostics;

namespace Accounting;

internal class DBContext : DbContext
{
public DbSet<OrderEntity> Orders { get; set; }
public DbSet<OrderItemEntity> CartItems { get; set; }
public DbSet<ShippingEntity> Shipping { get; set; }

protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
var connectionString = Environment.GetEnvironmentVariable("DB_CONNECTION_STRING");

optionsBuilder.UseNpgsql(connectionString).UseSnakeCaseNamingConvention();
}
}


internal class Consumer : IDisposable
{
private const string TopicName = "orders";

private ILogger _logger;
private IConsumer<string, byte[]> _consumer;
private bool _isListening;
private DBContext? _dbContext;

private static readonly ActivitySource MyActivitySource = new("Accounting.Consumer");
public Consumer(ILogger<Consumer> logger)
{
_logger = logger;
Expand All @@ -26,6 +45,7 @@ public Consumer(ILogger<Consumer> logger)
_consumer.Subscribe(TopicName);

_logger.LogInformation($"Connecting to Kafka: {servers}");
_dbContext = Environment.GetEnvironmentVariable("DB_CONNECTION_STRING") == null ? null : new DBContext();
}

public void StartListening()
Expand All @@ -38,6 +58,7 @@ public void StartListening()
{
try
{
using var activity = MyActivitySource.StartActivity("order-consumed");
var consumeResult = _consumer.Consume();

ProcessMessage(consumeResult.Message);
Expand All @@ -61,8 +82,48 @@ private void ProcessMessage(Message<string, byte[]> message)
try
{
var order = OrderResult.Parser.ParseFrom(message.Value);

Log.OrderReceivedMessage(_logger, order);

if (_dbContext == null)
{
return;
}

var orderEntity = new OrderEntity
{
Id = order.OrderId
};
_dbContext.Add(orderEntity);
foreach (var item in order.Items)
{
var orderItem = new OrderItemEntity
{
ItemCostCurrencyCode = item.Cost.CurrencyCode,
ItemCostUnits = item.Cost.Units,
ItemCostNanos = item.Cost.Nanos,
ProductId = item.Item.ProductId,
Quantity = item.Item.Quantity,
OrderId = order.OrderId
};

_dbContext.Add(orderItem);
}

var shipping = new ShippingEntity
{
ShippingTrackingId = order.ShippingTrackingId,
ShippingCostCurrencyCode = order.ShippingCost.CurrencyCode,
ShippingCostUnits = order.ShippingCost.Units,
ShippingCostNanos = order.ShippingCost.Nanos,
StreetAddress = order.ShippingAddress.StreetAddress,
City = order.ShippingAddress.City,
State = order.ShippingAddress.State,
Country = order.ShippingAddress.Country,
ZipCode = order.ShippingAddress.ZipCode,
OrderId = order.OrderId
};
_dbContext.Add(shipping);
_dbContext.SaveChanges();
}
catch (Exception ex)
{
Expand Down
59 changes: 59 additions & 0 deletions src/accounting/Entities.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations.Schema;

namespace Accounting;

[Table("shipping")]
[PrimaryKey(nameof(ShippingTrackingId))]
internal class ShippingEntity
{

public required string ShippingTrackingId { get; set; }

public required string ShippingCostCurrencyCode { get; set; }

public required long ShippingCostUnits { get; set; }

public required int ShippingCostNanos { get; set; }

public required string StreetAddress { get; set; }

public required string City { get; set; }

public required string State { get; set; }

public required string Country { get; set; }

public required string ZipCode { get; set; }

public required string OrderId { get; set; }
}

[Table("orderitem")]
[PrimaryKey(nameof(ProductId), nameof(OrderId))]
internal class OrderItemEntity
{
public required string ItemCostCurrencyCode { get; set; }

public required long ItemCostUnits { get; set; }

public required int ItemCostNanos { get; set; }

public required string ProductId { get; set; }

public required int Quantity { get; set; }

public required string OrderId { get; set; }
}

[Table("order")]
[PrimaryKey(nameof(Id))]
internal class OrderEntity
{
[Column("order_id")]
public required string Id { get; set; }

}
8 changes: 8 additions & 0 deletions src/accounting/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@
using Accounting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using OpenTelemetry;
using OpenTelemetry.Trace;

Console.WriteLine("Accounting service started");

Environment.GetEnvironmentVariables()
.FilterRelevant()
.OutputInOrder();

var tracerProvider = Sdk.CreateTracerProviderBuilder()
.AddEntityFrameworkCoreInstrumentation()
.AddConsoleExporter()
.AddSource("Accounting.Consumer")
.Build();

var host = Host.CreateDefaultBuilder(args)
.ConfigureServices(services =>
{
Expand Down
3 changes: 2 additions & 1 deletion src/accounting/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ This service consumes new orders from a Kafka topic.
To build the service binary, run:

```sh
cp pb/demo.proto src/accouting/proto/demo.proto # root context
mkdir -p src/accounting/proto/ # root context
cp pb/demo.proto src/accounting/proto/demo.proto # root context
dotnet build # accounting service context
```

Expand Down
37 changes: 37 additions & 0 deletions src/postgres/init.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
-- Copyright The OpenTelemetry Authors
-- SPDX-License-Identifier: Apache-2.0

CREATE USER otelu WITH PASSWORD 'otelp';


-- Create a table
CREATE TABLE "order" (
order_id TEXT PRIMARY KEY
);

CREATE TABLE shipping (
shipping_tracking_id TEXT PRIMARY KEY,
shipping_cost_currency_code TEXT NOT NULL,
shipping_cost_units BIGINT NOT NULL,
shipping_cost_nanos INT NOT NULL,
street_address TEXT,
city TEXT,
state TEXT,
country TEXT,
zip_code TEXT,
order_id TEXT NOT NULL,
FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE
);

CREATE TABLE orderitem (
item_cost_currency_code TEXT NOT NULL,
item_cost_units BIGINT NOT NULL,
item_cost_nanos INT NOT NULL,
product_id TEXT NOT NULL,
quantity INT NOT NULL,
order_id TEXT NOT NULL,
PRIMARY KEY (order_id, product_id),
FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE
);

GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO otelu;