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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ the release.

## Unreleased

* [accounting] fix memory leak with dbcontext
([#2876](https://github.com/open-telemetry/opentelemetry-demo/pull/2876))

## 2.2.0

* [feat] add ipv6 support
Expand Down
15 changes: 8 additions & 7 deletions src/accounting/Consumer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ internal class Consumer : IDisposable
private ILogger _logger;
private IConsumer<string, byte[]> _consumer;
private bool _isListening;
private DBContext? _dbContext;
private readonly string? _dbConnectionString;
private static readonly ActivitySource MyActivitySource = new("Accounting.Consumer");

public Consumer(ILogger<Consumer> logger)
Expand All @@ -49,7 +49,7 @@ public Consumer(ILogger<Consumer> logger)
_logger.LogInformation("Connecting to Kafka: {servers}", servers);
}

_dbContext = Environment.GetEnvironmentVariable("DB_CONNECTION_STRING") == null ? null : new DBContext();
_dbConnectionString = Environment.GetEnvironmentVariable("DB_CONNECTION_STRING");
}

public void StartListening()
Expand Down Expand Up @@ -90,16 +90,17 @@ private void ProcessMessage(Message<string, byte[]> message)
var order = OrderResult.Parser.ParseFrom(message.Value);
Log.OrderReceivedMessage(_logger, order);

if (_dbContext == null)
if (_dbConnectionString == null)
{
return;
}

using var dbContext = new DBContext();
var orderEntity = new OrderEntity
{
Id = order.OrderId
};
_dbContext.Add(orderEntity);
dbContext.Add(orderEntity);
foreach (var item in order.Items)
{
var orderItem = new OrderItemEntity
Expand All @@ -112,7 +113,7 @@ private void ProcessMessage(Message<string, byte[]> message)
OrderId = order.OrderId
};

_dbContext.Add(orderItem);
dbContext.Add(orderItem);
}

var shipping = new ShippingEntity
Expand All @@ -128,8 +129,8 @@ private void ProcessMessage(Message<string, byte[]> message)
ZipCode = order.ShippingAddress.ZipCode,
OrderId = order.OrderId
};
_dbContext.Add(shipping);
_dbContext.SaveChanges();
dbContext.Add(shipping);
dbContext.SaveChanges();
}
catch (Exception ex)
{
Expand Down