Replace OTel AutoInstrumentation .NET with Splunk OTel .NET (#129)

* Bump splunk-otel-collector to 0.62.0 * update dependencies for dotnet manual instrumentation * update dependencies for dotnet automatic instrumentation * Replace OTel AutoInstrumentation .NET by Splunk OTel .NET * bump splunk-otel-collector for signalfx .NET
signalfx · Oct 28, 2022 · 1134788 · 1134788
1 parent 80baafc
commit 1134788
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 28 deletions.
diff --git a/opentelemetry-tracing/opentelemetry-dotnet/README.md b/opentelemetry-tracing/opentelemetry-dotnet/README.md
@@ -9,5 +9,5 @@ Manual instrumentation requires adding and initializing the
 [OpenTelemetry .NET SDK](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry/README.md).
 Follow the links below for examples of these two instrumentation modes:
 
-- [Automatic](./automatic/README.md) currently in beta.
+- [Automatic](./automatic/README.md) currently in alpha.
 - [Manual](./manual/README.md) stable.
diff --git a/opentelemetry-tracing/opentelemetry-dotnet/automatic/README.md b/opentelemetry-tracing/opentelemetry-dotnet/automatic/README.md
@@ -1,7 +1,7 @@
-# OpenTelemetry .NET automatic instrumentation examples
+# Splunk Distribution of OpenTelemetry .NET examples
 
 This folder contains sample applications that are instrumented using
-[OpenTelemetry .NET Automatic Instrumentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation#opentelemetry-net-automatic-instrumentation).
+[Splunk Distribution of OpenTelemetry .NET](https://github.com/signalfx/splunk-otel-dotnet).
 
 ## Libraries and Framework Examples
 

diff --git a/...cing/opentelemetry-dotnet/automatic/aspnetcore-and-mongodb/InstrumentContainer/Dockerfile b/...cing/opentelemetry-dotnet/automatic/aspnetcore-and-mongodb/InstrumentContainer/Dockerfile
@@ -1,17 +1,17 @@
 ARG SOURCE_CONTAINER
 FROM ${SOURCE_CONTAINER}
 
-# Add the OpenTelemetry .NET Automatic Instrumentation
-ARG OTEL_DOTNET_AUTO_VERSION=v0.3.0-beta.1
-ADD https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/download/${OTEL_DOTNET_AUTO_VERSION}/opentelemetry-dotnet-instrumentation-linux-glibc.zip ./opentelemetry-dotnet-autoinstrumentation.zip
+# Add the Splunk Distribution of OpenTelemetry .NET
+ARG SPLUNK_OTEL_DOTNET_VERSION=v0.0.1-alpha.2
+ADD https://github.com/signalfx/splunk-otel-dotnet/releases/download/${SPLUNK_OTEL_DOTNET_VERSION}/splunk-opentelemetry-dotnet-linux-glibc.zip ./splunk-otel-dotnet.zip
 
 RUN apt update
 RUN apt -y install zip
 
-ARG INSTALL_DIR=/opt/opentelemetry/dotnet/autoinstrumentation
+ARG INSTALL_DIR=/opt/splunk/otel/dotnet
 RUN mkdir -p ${INSTALL_DIR}
-RUN unzip opentelemetry-dotnet-autoinstrumentation.zip -d ${INSTALL_DIR}
-RUN rm opentelemetry-dotnet-autoinstrumentation.zip
+RUN unzip splunk-otel-dotnet.zip -d ${INSTALL_DIR}
+RUN rm splunk-otel-dotnet.zip
 RUN mkdir -p /var/log/opentelemetry/dotnet
 
 ENV CORECLR_ENABLE_PROFILING=1

diff --git a/...lemetry-tracing/opentelemetry-dotnet/automatic/aspnetcore-and-mongodb/README.md b/...lemetry-tracing/opentelemetry-dotnet/automatic/aspnetcore-and-mongodb/README.md
@@ -1,7 +1,7 @@
 # ASP.NET Core and MongoDB Auto-Instrumentation Example
 
 In this example, distributed traces are produced automatically using the
-[OpenTelemetry .NET Automatic Instrumentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation#opentelemetry-net-automatic-instrumentation).
+[Splunk Distribution of OpenTelemetry .NET](https://github.com/signalfx/splunk-otel-dotnet#splunk-distribution-of-opentelemetry-net).
 Look at the
 [HttpClient](../../../../shared/applications/dotnet/aspnetcore-and-mongodb/src/ClientExample/Program.cs)
 and

diff --git a/...elemetry-tracing/opentelemetry-dotnet/automatic/aspnetcore-and-mongodb/docker-compose.yml b/...elemetry-tracing/opentelemetry-dotnet/automatic/aspnetcore-and-mongodb/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   aspnetcore:
-    image: otel-dotnet-auto-aspnetcore-and-mongodb/server-app
+    image: splunk-otel-dotnet-aspnetcore-and-mongodb/server-app
     build:
       context: InstrumentContainer
       args:
@@ -10,25 +10,23 @@ services:
      - "5000:5000"
     environment:
       - OTEL_SERVICE_NAME=asp.net-core
-      - OTEL_RESOURCE_ATTRIBUTES=deployment.environment=otel-dotnet-auto-tracing-examples,service.version=1.0.0
+      - OTEL_RESOURCE_ATTRIBUTES=deployment.environment=splunk-otel-dotnet-tracing-examples,service.version=1.0.0
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://splunk-otel-collector:4318
-      - OTEL_DOTNET_AUTO_TRACES_ENABLED_INSTRUMENTATIONS=AspNet,HttpClient,MongoDB
     depends_on:
       - client
       - mongo
       - splunk-otel-collector
     user: 'root'
   client:
-    image: otel-dotnet-auto-aspnetcore-and-mongodb/client-app
+    image: splunk-otel-dotnet-aspnetcore-and-mongodb/client-app
     build:
       context: InstrumentContainer
       args:
         - SOURCE_CONTAINER=aspnetcore-and-mongodb-client-app
     environment:
       - OTEL_SERVICE_NAME=example-client
-      - OTEL_RESOURCE_ATTRIBUTES=deployment.environment=otel-dotnet-auto-tracing-examples,service.version=1.0.0
+      - OTEL_RESOURCE_ATTRIBUTES=deployment.environment=splunk-otel-dotnet-tracing-examples,service.version=1.0.0
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://splunk-otel-collector:4318
-      - OTEL_DOTNET_AUTO_TRACES_ENABLED_INSTRUMENTATIONS=HttpClient
     depends_on:
       - splunk-otel-collector
     user: 'root'
@@ -40,7 +38,7 @@ services:
     ports:
       - "27017:27017"
   splunk-otel-collector:
-    image: quay.io/signalfx/splunk-otel-collector:0.52.1
+    image: quay.io/signalfx/splunk-otel-collector:0.62.0
     environment:
       # Provide the values below if you want to submit the data to the APM ingest.
       - SPLUNK_ACCESS_TOKEN

diff --git a/opentelemetry-tracing/opentelemetry-dotnet/manual/aspnetcore-and-mongodb/docker-compose.yml b/opentelemetry-tracing/opentelemetry-dotnet/manual/aspnetcore-and-mongodb/docker-compose.yml
@@ -34,7 +34,7 @@ services:
     ports:
       - "27017:27017"
   splunk-otel-collector:
-    image: quay.io/signalfx/splunk-otel-collector:0.52.1
+    image: quay.io/signalfx/splunk-otel-collector:0.62.0
     environment:
       # Provide the values below if you want to submit the data to the APM ingest.
       - SPLUNK_ACCESS_TOKEN

diff --git a/...metry-dotnet/manual/aspnetcore-and-mongodb/src/AspNetCoreExample/AspNetCoreExample.csproj b/...metry-dotnet/manual/aspnetcore-and-mongodb/src/AspNetCoreExample/AspNetCoreExample.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.9.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
+    <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
     <PackageReference Include="MongoDB.Driver.Core.Extensions.OpenTelemetry" Version="1.0.0" />
-    <PackageReference Include="OpenTelemetry" Version="1.3.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.3.0" />
+    <PackageReference Include="OpenTelemetry" Version="1.3.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.3.1" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.4" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.4" />
   </ItemGroup>

diff --git a/...opentelemetry-dotnet/manual/aspnetcore-and-mongodb/src/ClientExample/ClientExample.csproj b/...opentelemetry-dotnet/manual/aspnetcore-and-mongodb/src/ClientExample/ClientExample.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="OpenTelemetry" Version="1.3.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.3.0" />
+    <PackageReference Include="OpenTelemetry" Version="1.3.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.3.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.4" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
   </ItemGroup>

diff --git a/...applications/dotnet/aspnetcore-and-mongodb/src/AspNetCoreExample/AspNetCoreExample.csproj b/...applications/dotnet/aspnetcore-and-mongodb/src/AspNetCoreExample/AspNetCoreExample.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.9.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
+    <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
   </ItemGroup>
 
 </Project>
diff --git a/shared/applications/dotnet/aspnetcore-and-mongodb/src/ClientExample/ClientExample.csproj b/shared/applications/dotnet/aspnetcore-and-mongodb/src/ClientExample/ClientExample.csproj
@@ -9,7 +9,7 @@
     <!-- Adding "Microsoft.Extensions.Logging.Abstractions" is a workaround to instument the client app -->
     <!-- with the OpenTelelemetry .NET AutoInstrumentation v0.1.0-beta.1 / this should be removed when  -->
     <!-- the auto instrumentation version is updated.                                                   -->
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 

diff --git a/signalfx-tracing/signalfx-dotnet-tracing/aspnetcore-and-mongodb/docker-compose.yml b/signalfx-tracing/signalfx-dotnet-tracing/aspnetcore-and-mongodb/docker-compose.yml
@@ -38,7 +38,7 @@ services:
     ports:
       - "27017:27017"
   splunk-otel-collector:
-    image: quay.io/signalfx/splunk-otel-collector:0.52.1
+    image: quay.io/signalfx/splunk-otel-collector:0.62.0
     environment:
       # Provide the values below if you want to submit the data to the APM ingest.
       - SPLUNK_ACCESS_TOKEN