Skip to content

Commit baf7af6

Browse files
markkuhnmarkkuhn
authored
Move buildspecs to S3 bucket (#36)
* rm buildspecs * style improvements
1 parent bf228d0 commit baf7af6

File tree

15 files changed

+76
-129
lines changed

15 files changed

+76
-129
lines changed

‎buildspecs/buildspec.canary.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎buildspecs/buildspec.release.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎buildspecs/buildspec.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/Amazon.CloudWatch.EMF.Web/ApplicationBuilderExtensions.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ public static class ApplicationBuilderExtensions
1313
{
1414
public static void UseEmfMiddleware(this IApplicationBuilder app)
1515
{
16-
app.UseEmfMiddleware((context, logger) => {
16+
app.UseEmfMiddleware((context, logger) =>
17+
{
1718
var dimensions = new Model.DimensionSet();
1819
var dimensionsWithStatusCode = new Model.DimensionSet();
1920

2021
var endpoint = context.GetEndpoint();
21-
if (endpoint != null) {
22+
if (endpoint != null)
23+
{
2224
var actionDescriptor = endpoint.Metadata.GetMetadata<ControllerActionDescriptor>();
2325

2426
dimensions.AddDimension("Controller", actionDescriptor.ControllerName);
@@ -34,7 +36,8 @@ public static void UseEmfMiddleware(this IApplicationBuilder app)
3436
// Include the X-Ray trace id if it is set
3537
// https://docs.aws.amazon.com/xray/latest/devguide/xray-concepts.html#xray-concepts-tracingheader
3638
var xRayTraceId = context.Request.Headers["X-Amzn-Trace-Id"];
37-
if (!String.IsNullOrEmpty(xRayTraceId) && xRayTraceId.Count > 0) {
39+
if (!String.IsNullOrEmpty(xRayTraceId) && xRayTraceId.Count > 0)
40+
{
3841
logger.PutProperty("XRayTraceId", xRayTraceId[0]);
3942
}
4043

@@ -44,7 +47,8 @@ public static void UseEmfMiddleware(this IApplicationBuilder app)
4447
// https://www.w3.org/TR/trace-context/#traceparent-header
4548
logger.PutProperty("TraceId", Activity.Current?.Id ?? context?.TraceIdentifier);
4649

47-
if (!String.IsNullOrEmpty(Activity.Current?.TraceStateString)) {
50+
if (!String.IsNullOrEmpty(Activity.Current?.TraceStateString))
51+
{
4852
logger.PutProperty("TraceState", Activity.Current.TraceStateString);
4953
}
5054

@@ -63,7 +67,8 @@ public static void UseEmfMiddleware(this IApplicationBuilder app, Func<HttpConte
6367
var config = context.RequestServices.GetRequiredService<EMF.Config.IConfiguration>();
6468
var logger = context.RequestServices.GetRequiredService<IMetricsLogger>();
6569

66-
if (!String.IsNullOrEmpty(config.ServiceName)) {
70+
if (!String.IsNullOrEmpty(config.ServiceName))
71+
{
6772
logger.SetNamespace(config.ServiceName);
6873
}
6974

‎src/Amazon.CloudWatch.EMF/Config/Configuration.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using Amazon.CloudWatch.EMF.Environment;
1+
using Amazon.CloudWatch.EMF.Environment;
32

43
namespace Amazon.CloudWatch.EMF.Config
54
{

‎src/Amazon.CloudWatch.EMF/Environment/IResourceFetcher.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Net.Http;
43

54
namespace Amazon.CloudWatch.EMF.Environment
65
{

‎src/Amazon.CloudWatch.EMF/Sink/SocketClientFactory.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ public class SocketClientFactory : ISocketClientFactory
99
{
1010
public ISocketClient GetClient(Endpoint endpoint)
1111
{
12-
if (endpoint.CurrentProtocol == Protocol.UDP)
13-
{
14-
return new UDPClient(endpoint);
15-
}
12+
if (endpoint.CurrentProtocol == Protocol.UDP)
13+
{
14+
return new UDPClient(endpoint);
15+
}
1616

17-
return new TCPClient(endpoint);
17+
return new TCPClient(endpoint);
1818
}
1919
}
2020
}

‎tests/Amazon.CloudWatch.EMF.Canary/Program.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static void Main(string[] args)
3535

3636
while (true)
3737
{
38-
using (var logger = new MetricsLogger(loggerFactory))
38+
using (var logger = new MetricsLogger(loggerFactory))
3939
{
4040
logger.SetNamespace("Canary");
4141

@@ -54,7 +54,8 @@ static void Main(string[] args)
5454

5555
logger.PutMetric("Invoke", 1, Unit.NONE);
5656

57-
if (init) {
57+
if (init)
58+
{
5859
init = false;
5960
logger.PutMetric("Init", 1, Unit.NONE);
6061
}
@@ -65,9 +66,12 @@ static void Main(string[] args)
6566
}
6667
}
6768

68-
private static String GetPackageVersion() {
69-
foreach (var a in Assembly.GetExecutingAssembly().GetReferencedAssemblies()) {
70-
if (a.Name.Equals("Amazon.CloudWatch.EMF")) {
69+
private static String GetPackageVersion()
70+
{
71+
foreach (var a in Assembly.GetExecutingAssembly().GetReferencedAssemblies())
72+
{
73+
if (a.Name.Equals("Amazon.CloudWatch.EMF"))
74+
{
7175
return a.Version?.ToString() ?? "Unknown";
7276
}
7377
}

‎tests/Amazon.CloudWatch.EMF.Tests/Model/DimensionSetTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public void AddDimension_Limit_Exceeded_Error()
3636
}
3737

3838
[Fact]
39-
public void AddRange_Limit_Exceeded_Error() {
39+
public void AddRange_Limit_Exceeded_Error()
40+
{
4041
Assert.Throws<DimensionSetExceededException>(() =>
4142
{
4243
const int dimensionSetSize = 28;

‎tests/Amazon.CloudWatch.EMF.Tests/Model/MetricDefinitionTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void MetricDefinition_WithoutUnit_Returns_ValidJson()
1717
Assert.Equal("{\"Name\":\"Time\",\"Unit\":\"None\"}", metricString);
1818
Assert.Empty(metricDefinition.Values);
1919
}
20-
20+
2121
[Fact]
2222
public void MetricDefinition_WithValue_Returns_ValidJson()
2323
{
@@ -26,30 +26,30 @@ public void MetricDefinition_WithValue_Returns_ValidJson()
2626
string metricString = JsonConvert.SerializeObject(metricDefinition);
2727

2828
Assert.Equal("{\"Name\":\"Time\",\"Unit\":\"None\"}", metricString);
29-
Assert.Equal(new List<double>(){20}, metricDefinition.Values);
29+
Assert.Equal(new List<double>() { 20 }, metricDefinition.Values);
3030
}
31-
31+
3232
[Fact]
3333
public void MetricDefinition_WithUnitAndValue_Returns_ValidJson()
3434
{
3535
MetricDefinition metricDefinition = new MetricDefinition("Time", Unit.MILLISECONDS, 10);
3636

3737
string metricString = JsonConvert.SerializeObject(metricDefinition);
3838

39-
Assert.Equal( "{\"Name\":\"Time\",\"Unit\":\"Milliseconds\"}", metricString);
40-
Assert.Equal(new List<double>(){10}, metricDefinition.Values);
39+
Assert.Equal("{\"Name\":\"Time\",\"Unit\":\"Milliseconds\"}", metricString);
40+
Assert.Equal(new List<double>() { 10 }, metricDefinition.Values);
4141
}
42-
42+
4343
[Fact]
4444
public void MetricDefinition_AddValue_Returns_ValidValues()
4545
{
4646
MetricDefinition metricDefinition = new MetricDefinition("Time", Unit.MILLISECONDS, 10);
47-
48-
Assert.Equal(new List<double>(){10}, metricDefinition.Values);
47+
48+
Assert.Equal(new List<double>() { 10 }, metricDefinition.Values);
4949

5050
metricDefinition.AddValue(20);
51-
52-
Assert.Equal(new List<double>(){10,20}, metricDefinition.Values);
51+
52+
Assert.Equal(new List<double>() { 10, 20 }, metricDefinition.Values);
5353
}
5454
}
5555
}

‎tests/Amazon.CloudWatch.EMF.Tests/Model/MetricDirectiveTests.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,82 +13,82 @@ public void MetricDirective_DefaultNameSpace_Returns_ValidJson()
1313
MetricDirective metricDirective = new MetricDirective();
1414

1515
string jsonString = JsonConvert.SerializeObject(metricDirective);
16-
16+
1717
Assert.Equal("{\"Namespace\":\"aws-embedded-metrics\",\"Metrics\":[],\"Dimensions\":[[]]}", jsonString);
18-
18+
1919
}
20-
20+
2121
[Fact]
2222
public void MetricDirective_SetNameSpace_Returns_ValidJson()
2323
{
2424
MetricDirective metricDirective = new MetricDirective();
2525
metricDirective.Namespace = "test-lambda-metrics";
2626

2727
string jsonString = JsonConvert.SerializeObject(metricDirective);
28-
28+
2929
Assert.Equal("{\"Namespace\":\"test-lambda-metrics\",\"Metrics\":[],\"Dimensions\":[[]]}", jsonString);
30-
30+
3131
}
32-
33-
32+
33+
3434
[Fact]
3535
public void MetricDirective_PutMetric_Returns_ValidJson()
3636
{
3737
MetricDirective metricDirective = new MetricDirective();
3838
metricDirective.PutMetric("Time", 10);
3939

4040
string jsonString = JsonConvert.SerializeObject(metricDirective);
41-
41+
4242
Assert.Equal("{\"Namespace\":\"aws-embedded-metrics\",\"Metrics\":[{\"Name\":\"Time\",\"Unit\":\"None\"}],\"Dimensions\":[[]]}", jsonString);
43-
43+
4444
}
45-
45+
4646
[Fact]
4747
public void MetricDirective_PutSameMetricMultipleTimes_Returns_ValidValues()
4848
{
4949
MetricDirective metricDirective = new MetricDirective();
5050
metricDirective.PutMetric("Time", 10);
5151
metricDirective.PutMetric("Time", 20);
52-
52+
5353
Assert.Single(metricDirective.Metrics);
54-
Assert.Equal(new List<double>(){10,20},metricDirective.Metrics[0].Values);
54+
Assert.Equal(new List<double>() { 10, 20 }, metricDirective.Metrics[0].Values);
5555
}
56-
56+
5757
[Fact]
5858
public void MetricDirective_AddDimensions_Returns_ValidJson()
5959
{
6060
MetricDirective metricDirective = new MetricDirective();
6161
DimensionSet ds = new DimensionSet("Region", "US-West-2");
6262
ds.AddDimension("Instance", "instance-1");
6363
metricDirective.CustomDimensionSets.Add(ds);
64-
64+
6565
string jsonString = JsonConvert.SerializeObject(metricDirective);
66-
66+
6767
Assert.Equal("{\"Namespace\":\"aws-embedded-metrics\",\"Metrics\":[],\"Dimensions\":[[\"Region\",\"Instance\"]]}", jsonString);
6868
}
69-
69+
7070
[Fact]
7171
public void MetricDirective_AddDimensions_AddRange_Returns_ValidJson()
7272
{
7373
MetricDirective metricDirective = new MetricDirective();
7474
DimensionSet ds = new DimensionSet("Region", "US-West-2");
7575
ds.AddRange(new DimensionSet("Instance", "instance-1"));
7676
metricDirective.CustomDimensionSets.Add(ds);
77-
77+
7878
string jsonString = JsonConvert.SerializeObject(metricDirective);
79-
79+
8080
Assert.Equal("{\"Namespace\":\"aws-embedded-metrics\",\"Metrics\":[],\"Dimensions\":[[\"Region\",\"Instance\"]]}", jsonString);
8181
}
82-
82+
8383
[Fact]
8484
public void MetricDirective_PutMultipleDimensions_Returns_ValidJson()
8585
{
8686
MetricDirective metricDirective = new MetricDirective();
8787
metricDirective.CustomDimensionSets.Add(new DimensionSet("Region", "US-West-2"));
8888
metricDirective.CustomDimensionSets.Add(new DimensionSet("Instance", "instance-1"));
89-
89+
9090
string jsonString = JsonConvert.SerializeObject(metricDirective);
91-
91+
9292
Assert.Equal("{\"Namespace\":\"aws-embedded-metrics\",\"Metrics\":[],\"Dimensions\":[[\"Region\",\"Instance\"]]}", jsonString);
9393
}
9494
}

‎tests/Amazon.CloudWatch.EMF.Tests/Model/RootNodeTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void PutProperty_SavesKeyValue()
1313
RootNode rootNode = new RootNode();
1414
rootNode.PutProperty("Property", "Value");
1515

16-
Assert.Equal( "Value",rootNode.GetProperties()["Property"]);
16+
Assert.Equal("Value", rootNode.GetProperties()["Property"]);
1717
}
1818

1919
[Fact]
@@ -28,14 +28,14 @@ public void Serialize_Returns_ValidValues()
2828
mc.Namespace = "test-namespace";
2929

3030
List<string> emfLogs = mc.Serialize();
31-
31+
3232
var emfMap = JsonConvert.DeserializeObject<Dictionary<string, object>>(emfLogs[0]);
3333

34-
Assert.Equal( "DefaultDimValue", emfMap["DefaultDim"]);
35-
Assert.Equal( "us-east-1", emfMap["Region"]);
34+
Assert.Equal("DefaultDimValue", emfMap["DefaultDim"]);
35+
Assert.Equal("us-east-1", emfMap["Region"]);
3636

37-
Assert.Equal( 10.0, emfMap["Count"]);
38-
Assert.Equal( "PropertyValue", emfMap["Property"]);
37+
Assert.Equal(10.0, emfMap["Count"]);
38+
Assert.Equal("PropertyValue", emfMap["Property"]);
3939
var metadata = JsonConvert.DeserializeObject<Dictionary<string, object>>(emfMap["_aws"].ToString());
4040
Assert.True(metadata.ContainsKey("Timestamp"));
4141
Assert.True(metadata.ContainsKey("CloudWatchMetrics"));

0 commit comments

Comments
 (0)