maint: remove references to archived repos (#1010)

Updating the code to not use archived repos.

---------

Signed-off-by: alex boten <[email protected]>

Author: codeboten

DEVELOPING.md

@@ -98,7 +98,7 @@ For go services, use the go modules file to replace our beeline (and optionally
 ```txt
 module main
 
-go 1.14
+go 1.24
 
 replace github.com/honeycombio/beeline-go => /home/paul/projects/beeline-go
 

README.md

@@ -22,8 +22,8 @@ The idea is to use these to test compatibility between various types of services
 The motivating use case is testing trace context header compatibility between Honeycomb and OpenTelemetry.
 
 **.NET**
-- [frontend](/dotnet/frontend) using [Honeycomb.OpenTelemetry](https://github.com/honeycombio/honeycomb-opentelemetry-dotnet)
-- [message-service](/dotnet/message-service) using [Honeycomb.OpenTelemetry](https://github.com/honeycombio/honeycomb-opentelemetry-dotnet)
+- [frontend](/dotnet/frontend) using [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-dotnet)
+- [message-service](/dotnet/message-service) using [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-dotnet)
 - [name-service](/dotnet/name-service) using [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-dotnet)
 - [year-service](/dotnet/year-service) using [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-dotnet)
 
@@ -37,13 +37,13 @@ The motivating use case is testing trace context header compatibility between Ho
 - [frontend](/golang/frontend) using [opentelemetry-go](https://github.com/open-telemetry/opentelemetry-go)
 - [message-service](/golang/message-service) using [beeline-go](https://github.com/honeycombio/beeline-go)
 - [name-service](/golang/name-service) using [opentelemetry-go](https://github.com/open-telemetry/opentelemetry-go)
-- [year-service](/golang/year-service) using [honeycomb-opentelemetry-go](https://github.com/honeycombio/honeycomb-opentelemetry-go)
+- [year-service](/golang/year-service) using [opentelemetry-go](https://github.com/open-telemetry/opentelemetry-go)
 
 **Java**
 - [frontend](/java/frontend) using [opentelemetry-javaagent](https://github.com/open-telemetry/opentelemetry-java-instrumentation)
-- [message-service](/java/message-service) using [honeycomb-opentelemetry-javaagent](https://github.com/honeycombio/honeycomb-opentelemetry-java)
-- [name-service](/java/name-service) using [honeycomb-opentelemetry-javaagent](https://github.com/honeycombio/honeycomb-opentelemetry-java)
-- [year-service](/java/year-service) using [honeycomb-opentelemetry-skd](https://github.com/honeycombio/honeycomb-opentelemetry-java)
+- [message-service](/java/message-service) using [opentelemetry-javaagent](https://github.com/open-telemetry/opentelemetry-java-instrumentation)
+- [name-service](/java/name-service) using [opentelemetry-javaagent](https://github.com/open-telemetry/opentelemetry-java-instrumentation)
+- [year-service](/java/year-service) using [opentelemetry-javaagent](https://github.com/open-telemetry/opentelemetry-java-instrumentation)
 
 **Node**
 - [frontend](/node/frontend) using [opentelemetry-js](https://github.com/open-telemetry/opentelemetry-js)
@@ -54,7 +54,7 @@ The motivating use case is testing trace context header compatibility between Ho
 **Python**
 - [frontend](/python/frontend) using [beeline-python](https://github.com/honeycombio/beeline-python)
 - [message-service](/python/message-service) using [opentelemetry-python](https://github.com/open-telemetry/opentelemetry-python)
-- [name-service](/python/name-service) using [honeycomb-opentelemetry](https://github.com/honeycombio/honeycomb-opentelemetry-python)
+- [name-service](/python/name-service) using [opentelemetry-python](https://github.com/open-telemetry/opentelemetry-python)
 - [year-service](/python/year-service) using [beeline-python](https://github.com/honeycombio/beeline-python)
 
 **Ruby**

docker-compose.java.yml

@@ -31,7 +31,7 @@ services:
     image: hnyexample/message-java
     environment:
       <<: *common-env
-      SERVICE_NAME: message-java
+      OTEL_SERVICE_NAME: message-java
     ports:
       - 9000:9000
 
@@ -41,7 +41,7 @@ services:
     image: hnyexample/name-java
     environment:
       <<: *common-env
-      SERVICE_NAME: name-java
+      OTEL_SERVICE_NAME: name-java
     ports:
       - 8000:8000
 

dotnet/README.md

@@ -4,9 +4,9 @@ This is a .NET implementation of the example greeting service; 4 microservices t
 
 You'll note that instrumentation is done differently depending on the project:
 
-* `frontend` is a service built with .NET 6 that uses [Honeycomb.OpenTelemetry](https://www.nuget.org/packages/Honeycomb.OpenTelemetry), our distribution of the .NET OpenTelemetry SDK. Configuration is simpler when you use this package.
-* `message-service` is a service built with .NET 5 that uses the Honeycomb.OpenTelemetry distribution.
-* `year-service` is a service built as a minimal .NET 6 API that uses the standard OpenTelemetry libraries to configure instrumentation. It's more lines of code.
+* `frontend` is a service built with .NET 6 that uses the standard OpenTelemetry libraries to configure instrumentation.
+* `message-service` is a service built with .NET 5 that uses the standard OpenTelemetry libraries.
+* `year-service` is a service built as a minimal .NET 6 API that uses the standard OpenTelemetry libraries to configure instrumentation.
 * `name-service` is a service built with .NET 5 that uses the standard OpenTelemetry libraries.
 
 The goal here is to demonstrate that you can configure instrumentation in several ways with .NET but still send data to Honeycomb.

dotnet/frontend/Program.cs

@@ -1,24 +1,45 @@
+using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
+using OpenTelemetry.Logs;
+using OpenTelemetry.Exporter;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 
 builder.Services.AddControllers();
 builder.Services.AddHttpClient();
-var honeycombOptions = builder.Configuration.GetHoneycombOptions();
-builder.Services.AddOpenTelemetry().WithTracing(otelBuilder =>
+const string telemetrySourceName = "honeycomb.examples.frontend-service-dotnet";
+
+var resourceBuilder = ResourceBuilder.CreateDefault()
+    .AddService(builder.Configuration.GetValue<string>("Otlp:ServiceName"))
+    .AddEnvironmentVariableDetector();
+
+var configureOtlpExporter = (OtlpExporterOptions options) =>
 {
-    otelBuilder
-        .AddHoneycomb(honeycombOptions)
-        .AddCommonInstrumentations()
-        .AddAspNetCoreInstrumentationWithBaggage();
-});
-builder.Services.AddSingleton(TracerProvider.Default.GetTracer(honeycombOptions.ServiceName));
+    options.Endpoint = new Uri(builder.Configuration.GetValue<string>("Otlp:Endpoint"));
+    var apiKey = builder.Configuration.GetValue<string>("Otlp:ApiKey");
+    var dataset = builder.Configuration.GetValue<string>("Otlp:Dataset");
+    options.Headers = $"x-honeycomb-team={apiKey},x-honeycomb-dataset={dataset}";
+};
+
+builder.Services.AddOpenTelemetry()
+    .WithTracing(options => options
+        .SetResourceBuilder(resourceBuilder)
+        .AddSource(telemetrySourceName)
+        .AddAspNetCoreInstrumentation()
+        .AddHttpClientInstrumentation()
+        .AddOtlpExporter(configureOtlpExporter));
+
+builder.Logging.AddOpenTelemetry(options => options
+    .SetResourceBuilder(resourceBuilder)
+    .AddOtlpExporter(configureOtlpExporter)
+);
 
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
+builder.Services.AddSingleton(TracerProvider.Default.GetTracer(builder.Configuration.GetValue<string>("Otlp:ServiceName")));
 
 var app = builder.Build();
 

dotnet/frontend/appsettings.json

@@ -7,7 +7,7 @@
     }
   },
   "AllowedHosts": "*",
-  "Honeycomb": {
+  "Otlp": {
     "ServiceName": "frontend-dotnet",
     "Endpoint": "https://api.honeycomb.io",
     "ApiKey": "",

dotnet/frontend/frontend.csproj

@@ -7,10 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Honeycomb.OpenTelemetry" Version="1.3.1" />
-    <PackageReference Include="Honeycomb.OpenTelemetry.CommonInstrumentations" Version="0.27.0-beta" />
-    <PackageReference Include="Honeycomb.OpenTelemetry.Instrumentation.AspNetCore" Version="0.27.0-beta" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs" Version="1.4.0-rc.4" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 

dotnet/message-service/Startup.cs

@@ -1,10 +1,10 @@
-using Honeycomb.OpenTelemetry;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
+using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 using StackExchange.Redis;
 using System;
@@ -13,6 +13,8 @@ namespace message_service
 {
     public class Startup
     {
+        public const string TelemetrySourceName = "honeycomb.examples.message-service-dotnet";
+
         public Startup(IConfiguration configuration)
         {
             Configuration = configuration;
@@ -29,16 +31,24 @@ public void ConfigureServices(IServiceCollection services)
                 c.SwaggerDoc("v1", new OpenApiInfo { Title = "message_service", Version = "v1" });
             });
 
-            HoneycombOptions honeycombOptions = Configuration.GetHoneycombOptions();
-            services.AddOpenTelemetry().WithTracing(otelBuilder =>
-            {
-                otelBuilder
-                    .AddHoneycomb(honeycombOptions)
-                    .AddCommonInstrumentations()
-                    .AddAspNetCoreInstrumentation();
-            });
-            services.AddSingleton(TracerProvider.Default.GetTracer(honeycombOptions.ServiceName));
+            services.AddOpenTelemetry()
+                .WithTracing((builder => builder
+                    .SetResourceBuilder(ResourceBuilder.CreateDefault()
+                        .AddService(this.Configuration.GetValue<string>("Otlp:ServiceName"))
+                        .AddEnvironmentVariableDetector()
+                    )
+                    .AddSource(TelemetrySourceName)
+                    .AddAspNetCoreInstrumentation()
+                    .AddHttpClientInstrumentation()
+                    .AddOtlpExporter(options =>
+                    {
+                        options.Endpoint = new Uri(Configuration.GetValue<string>("Otlp:Endpoint"));
+                        var apiKey = Configuration.GetValue<string>("Otlp:ApiKey");
+                        var dataset = Configuration.GetValue<string>("Otlp:Dataset");
+                        options.Headers = $"x-honeycomb-team={apiKey},x-honeycomb-dataset={dataset}";
+                    })));
 
+            services.AddSingleton(TracerProvider.Default.GetTracer(this.Configuration.GetValue<string>("Otlp:ServiceName")));
             var redisConfigString = Environment.GetEnvironmentVariable("REDIS_URL");
             if (string.IsNullOrWhiteSpace(redisConfigString))
             {

dotnet/message-service/appsettings.json

@@ -7,7 +7,7 @@
     }
   },
   "AllowedHosts": "*",
-  "Honeycomb": {
+  "Otlp": {
     "ServiceName": "message-dotnet",
     "Endpoint": "https://api.honeycomb.io",
     "ApiKey": "",

dotnet/message-service/message-service.csproj

@@ -6,10 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Honeycomb.OpenTelemetry" Version="1.3.1" />
-    <PackageReference Include="Honeycomb.OpenTelemetry.CommonInstrumentations" Version="0.27.0-beta" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.0-alpha.2" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" />
     <PackageReference Include="StackExchange.Redis" Version="2.6.111" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>